diff --git a/.agents/skills/ab-testing-implementation/SKILL.md b/.agents/skills/ab-testing-implementation/SKILL.md
new file mode 100644
index 000000000000..a7a0173b8dff
--- /dev/null
+++ b/.agents/skills/ab-testing-implementation/SKILL.md
@@ -0,0 +1,111 @@
+---
+name: ab-testing-implementation
+description: Implement and review MetaMask Extension A/B tests using the canonical repository standard. Use for any task that adds or modifies A/B test flags, variant configs, useABTest usage, analytics payloads, or A/B-test-related tests and docs.
+---
+
+# A/B Testing Implementation
+
+Canonical workflow for implementing and reviewing MetaMask Extension A/B
+tests.
+
+Do not use this skill for general analytics work that does not involve A/B
+test flags, `useABTest`, `active_ab_tests`, or related tests/docs.
+
+## Required Response Sections
+
+1. `Implementation Checklist`
+2. `Files To Modify`
+3. `Analytics Payload Changes`
+4. `Tests To Run`
+5. `Compliance Check Result`
+
+## Agent Execution Standard
+
+For implementation or review tasks, follow this workflow:
+
+1. Run discovery before edits.
+
+```bash
+rg -n "useABTest\\(|active_ab_tests|ab_tests|Abtest|feature-flag-registry|RemoteFeatureFlagController" app shared ui test docs
+rg -n "Experiment Viewed|ExperimentViewed" app shared ui
+```
+
+2. Confirm the intended experiment shape.
+   - Use a threshold-array remote flag value for production defaults.
+   - Keep reused variants or metadata centralized in a config module when
+     multiple files need the same definitions.
+   - Use the same experiment key format as mobile:
+     `{teamName}{ticketId}Abtest{TestName}`.
+3. Implement the assignment logic correctly.
+   - Prefer `useABTest(flagKey, variants)` and keep a `control` variant in
+     the variants object.
+   - Use `variantName` and `isActive` from the hook for business-event
+     instrumentation.
+   - If assignment is missing, invalid, or unresolved, the hook falls back
+     to `control` and `isActive: false`.
+4. Implement analytics correctly.
+   - Rely on `useABTest` for the automatic `Experiment Viewed` exposure
+     event.
+   - Add `active_ab_tests` only to business events, and only when the
+     assignment is active.
+   - Never add new `ab_tests:` payloads. If a legacy touchpoint cannot be
+     migrated in the same change, keep the line annotated with
+     `LEGACY_AB_TEST_ALLOWED` and explain why.
+5. Use the canonical event payload shapes.
+
+```typescript
+const experiment = useABTest('swapsSWAPS4135AbtestNumpadQuickAmounts', {
+  control: { buttons: [25, 50, 75, 'MAX'] },
+  treatment: { buttons: [50, 75, 90, 'MAX'] },
+});
+
+const activeABTests = experiment.isActive
+  ? [
+      {
+        key: 'swapsSWAPS4135AbtestNumpadQuickAmounts',
+        value: experiment.variantName,
+      },
+    ]
+  : undefined;
+```
+
+6. Update tests and fixtures when behavior or flag plumbing changes.
+   - Register every new remote A/B test flag in
+     `test/e2e/feature-flags/feature-flag-registry.ts` with the production
+     default threshold-array JSON value.
+   - Use test overrides such as `manifestFlags.remoteFeatureFlags` or
+     `FixtureBuilder.withRemoteFeatureFlags(...)` when a test needs
+     deterministic assignment.
+   - If the change is copy-only or config-only, you may skip new tests with a brief rationale.
+7. Run the A/B compliance checker using the repository's current supported
+   invocation and report the result.
+   - Checker path:
+     `.agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts`
+
+```bash
+# Current pre-commit / local implementation example
+node --import tsx .agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts --staged
+
+# Current review-mode / explicit file set example
+node --import tsx .agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts --files app/path/to/file.ts,test/path/to/file.spec.ts --base origin/main
+```
+
+## Review Checklist
+
+- Confirm `useABTest` always has a `control` variant.
+- Confirm `Experiment Viewed` is not emitted manually when `useABTest` is in
+  use.
+- Confirm business events use `active_ab_tests` rather than `ab_tests`.
+- Confirm E2E flag registration and local test overrides remain production-accurate.
+- Confirm the compliance checker result is included in the final response.
+
+## Related Files
+
+- `ui/hooks/useABTest.ts`
+- `ui/hooks/useABTest.test.ts`
+- `ui/selectors/remote-feature-flags.ts`
+- `shared/constants/metametrics.ts`
+- `test/e2e/feature-flags/feature-flag-registry.ts`
+
+Use `docs/ab-testing.md` only when you need deeper background, additional
+examples, FAQ answers, or local override guidance beyond this workflow.
diff --git a/.agents/skills/ab-testing-implementation/agents/openai.yaml b/.agents/skills/ab-testing-implementation/agents/openai.yaml
new file mode 100644
index 000000000000..525077c200ea
--- /dev/null
+++ b/.agents/skills/ab-testing-implementation/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "A/B Test Implementation"
+  short_description: "Implement and validate extension A/B tests."
+  default_prompt: "Use $ab-testing-implementation to implement or review an A/B test with the extension's canonical useABTest and active_ab_tests standards."
diff --git a/.agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts b/.agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts
new file mode 100644
index 000000000000..41076e4cda48
--- /dev/null
+++ b/.agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts
@@ -0,0 +1,408 @@
+import { readFileSync } from 'fs';
+import process from 'process';
+import { spawnSync } from 'child_process';
+
+type Mode = 'staged' | 'files';
+
+type CommandResult = {
+  status: number;
+  stdout: string;
+  stderr: string;
+};
+
+const CODE_FILE_REGEX = /\.(ts|tsx|js|jsx)$/u;
+const TEST_FILE_REGEX = /\.(test|spec)\.(ts|tsx|js|jsx)$/u;
+const VALID_FLAG_KEY_REGEX =
+  /^[a-z][A-Za-z0-9]*[A-Z]{2,}[0-9]+Abtest[A-Z][A-Za-z0-9]*$/u;
+const ABTEST_STRING_LITERAL_REGEX = /(['"])([A-Za-z0-9]*Abtest[A-Za-z0-9]*)\1/gu;
+const RISKY_CHANGE_REGEX =
+  /useABTest\(|active_ab_tests\s*:|ab_tests\s*:|trackEvent\(|createEventBuilder\(|MetaMetricsEvents\.|Experiment Viewed|ExperimentViewed/u;
+
+function usage(): string {
+  return `Usage:
+  check-ab-testing-compliance.ts -h | --help
+  check-ab-testing-compliance.ts --staged
+  check-ab-testing-compliance.ts --files <file1,file2,...> [--base <git-ref>]
+
+Checks changed files for A/B testing implementation compliance.
+
+Rules:
+  - Fail: New ab_tests payload additions in checked code diffs
+  - Fail: Malformed literal active_ab_tests objects missing key/value
+  - Fail: Inline useABTest variants object missing control
+  - Warn: Flag key naming mismatch for Abtest keys
+  - Warn: Risky A/B integration changes without test-file updates`;
+}
+
+function failWithUsage(message: string): never {
+  console.error(message);
+  console.error(usage());
+  process.exit(2);
+}
+
+function runCommand(command: string, args: string[]): CommandResult {
+  const result = spawnSync(command, args, {
+    cwd: process.cwd(),
+    encoding: 'utf8',
+  });
+
+  return {
+    status: result.status ?? 1,
+    stdout: result.stdout ?? '',
+    stderr: result.stderr ?? '',
+  };
+}
+
+function runGit(args: string[]): CommandResult {
+  return runCommand('git', args);
+}
+
+function splitUniqueLines(...texts: string[]): string[] {
+  const seen = new Set<string>();
+
+  return texts
+    .flatMap((text) => text.split('\n'))
+    .map((line) => line.trim())
+    .filter((line) => {
+      if (!line || seen.has(line)) {
+        return false;
+      }
+
+      seen.add(line);
+      return true;
+    });
+}
+
+function trim(value: string): string {
+  return value.trim();
+}
+
+function isCodeFile(file: string): boolean {
+  return CODE_FILE_REGEX.test(file);
+}
+
+function isTestFile(file: string): boolean {
+  return TEST_FILE_REGEX.test(file) || file.includes('/__tests__/');
+}
+
+function isValidFlagKey(key: string): boolean {
+  return VALID_FLAG_KEY_REGEX.test(key);
+}
+
+function refExists(ref: string): boolean {
+  return runGit(['rev-parse', '--verify', ref]).status === 0;
+}
+
+function isTracked(file: string): boolean {
+  return runGit(['ls-files', '--error-unmatch', file]).status === 0;
+}
+
+function existsInHead(file: string): boolean {
+  return runGit(['cat-file', '-e', `HEAD:${file}`]).status === 0;
+}
+
+function collectStagedFiles(): string[] {
+  return splitUniqueLines(
+    runGit(['diff', '--cached', '--name-only', '--diff-filter=ACMR']).stdout,
+  );
+}
+
+function collectWorktreeFiles(): string[] {
+  return splitUniqueLines(
+    runGit(['diff', '--name-only', '--diff-filter=ACMR']).stdout,
+    runGit(['ls-files', '--others', '--exclude-standard']).stdout,
+  );
+}
+
+function collectExplicitFiles(filesArg: string): string[] {
+  return splitUniqueLines(...filesArg.split(',').map(trim));
+}
+
+function extractAddedLinesFromDiff(diff: string): string[] {
+  return diff
+    .split('\n')
+    .filter((line) => line.startsWith('+') && !line.startsWith('+++ '))
+    .map((line) => line.slice(1));
+}
+
+function getAddedLines(
+  file: string,
+  mode: Mode,
+  fallbackToWorktree: boolean,
+  baseRef: string,
+): string[] {
+  if (mode === 'staged') {
+    if (fallbackToWorktree) {
+      if (!isTracked(file)) {
+        return readFileSync(file, 'utf8').split('\n');
+      }
+
+      return extractAddedLinesFromDiff(
+        runGit(['diff', '--unified=0', '--', file]).stdout,
+      );
+    }
+
+    return extractAddedLinesFromDiff(
+      runGit(['diff', '--cached', '--unified=0', '--', file]).stdout,
+    );
+  }
+
+  if (!existsInHead(file)) {
+    return readFileSync(file, 'utf8').split('\n');
+  }
+
+  if (baseRef && refExists(baseRef)) {
+    return extractAddedLinesFromDiff(
+      runGit(['diff', '--unified=0', `${baseRef}...HEAD`, '--', file]).stdout,
+    );
+  }
+
+  if (isTracked(file)) {
+    return extractAddedLinesFromDiff(
+      runGit(['diff', '--unified=0', 'HEAD', '--', file]).stdout,
+    );
+  }
+
+  return [];
+}
+
+function countOccurrences(segment: string, char: '(' | ')'): number {
+  return Array.from(segment).filter((current) => current === char).length;
+}
+
+function dedupe(items: string[]): string[] {
+  return Array.from(new Set(items));
+}
+
+function printList(title: string, items: string[]): void {
+  if (items.length === 0) {
+    return;
+  }
+
+  console.log('');
+  console.log(title);
+  for (const item of dedupe(items)) {
+    console.log(`- ${item}`);
+  }
+}
+
+function main(): void {
+  let mode: Mode | null = null;
+  let filesArg = '';
+  let baseRef = '';
+
+  const args = process.argv.slice(2);
+
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+
+    if (arg === '--staged') {
+      if (mode) {
+        failWithUsage('ERROR: Choose exactly one mode: --staged or --files.');
+      }
+      mode = 'staged';
+      continue;
+    }
+
+    if (arg === '--files') {
+      if (mode) {
+        failWithUsage('ERROR: Choose exactly one mode: --staged or --files.');
+      }
+      mode = 'files';
+      filesArg = args[index + 1] ?? '';
+      if (!filesArg) {
+        console.error('ERROR: --files requires a comma-separated value.');
+        process.exit(2);
+      }
+      index += 1;
+      continue;
+    }
+
+    if (arg === '--base') {
+      baseRef = args[index + 1] ?? '';
+      if (!baseRef) {
+        console.error(
+          'ERROR: --base requires a git ref (for example origin/main).',
+        );
+        process.exit(2);
+      }
+      index += 1;
+      continue;
+    }
+
+    if (arg === '--help' || arg === '-h') {
+      console.log(usage());
+      process.exit(0);
+    }
+
+    failWithUsage(`ERROR: Unknown argument: ${arg}`);
+  }
+
+  if (!mode) {
+    failWithUsage('ERROR: Choose exactly one mode: --staged or --files.');
+  }
+
+  if (mode === 'files' && !baseRef) {
+    for (const candidate of ['origin/main', 'main', 'HEAD~1']) {
+      if (refExists(candidate)) {
+        baseRef = candidate;
+        break;
+      }
+    }
+  }
+
+  let fallbackToWorktree = false;
+  let fallbackNote = '';
+
+  let changedFiles =
+    mode === 'staged' ? collectStagedFiles() : collectExplicitFiles(filesArg);
+
+  if (mode === 'staged' && changedFiles.length === 0) {
+    fallbackToWorktree = true;
+    fallbackNote =
+      'Info: no staged files found; falling back to working-tree changed files.';
+    changedFiles = collectWorktreeFiles();
+  }
+
+  if (changedFiles.length === 0) {
+    if (mode === 'staged') {
+      console.log(
+        'A/B compliance check: no staged files and no working-tree changed files to inspect.',
+      );
+    } else {
+      console.log('A/B compliance check: no files to inspect from --files input.');
+    }
+    process.exit(0);
+  }
+
+  const failures: string[] = [];
+  const warnings: string[] = [];
+  const abRiskyChangeFiles = new Set<string>();
+  let testChanged = false;
+
+  for (const file of changedFiles) {
+    if (isTestFile(file)) {
+      testChanged = true;
+      continue;
+    }
+
+    if (!isCodeFile(file)) {
+      continue;
+    }
+
+    const addedLines = getAddedLines(file, mode, fallbackToWorktree, baseRef);
+    if (addedLines.length === 0) {
+      continue;
+    }
+
+    const addedText = addedLines.join('\n');
+
+    if (RISKY_CHANGE_REGEX.test(addedText)) {
+      abRiskyChangeFiles.add(file);
+    }
+
+    for (let index = 0; index < addedLines.length; index += 1) {
+      const line = addedLines[index];
+
+      if (
+        /(^|[^A-Za-z0-9_])ab_tests\s*:/.test(line) &&
+        !line.includes('LEGACY_AB_TEST_ALLOWED')
+      ) {
+        failures.push(
+          `${file}: added 'ab_tests' payload. New ab_tests payloads are forbidden.`,
+        );
+      }
+
+      if (/active_ab_tests\s*:/.test(line)) {
+        if (/active_ab_tests\s*:\s*(\[|\{)/.test(line)) {
+          const window = addedLines.slice(index, index + 9).join('\n');
+          if (!/key\s*:/.test(window) || !/value\s*:/.test(window)) {
+            failures.push(
+              `${file}: malformed literal active_ab_tests object (expected key and value).`,
+            );
+          }
+        }
+      }
+
+      if (/useABTest\s*\(/.test(line)) {
+        const callSegments: string[] = [];
+        let parenDepth = 0;
+
+        for (let segmentIndex = index; segmentIndex < addedLines.length; segmentIndex += 1) {
+          let segment = addedLines[segmentIndex];
+          if (segmentIndex === index) {
+            segment = `useABTest${segment.split('useABTest').slice(1).join('useABTest')}`;
+          }
+
+          callSegments.push(segment);
+          parenDepth += countOccurrences(segment, '(');
+          parenDepth -= countOccurrences(segment, ')');
+
+          if (parenDepth <= 0) {
+            break;
+          }
+        }
+
+        const callWindow = callSegments.join('\n');
+        const normalizedCall = callWindow.replace(/\n/g, ' ');
+        if (
+          /useABTest\s*\([^,]+,\s*\{/.test(normalizedCall) &&
+          !/control\s*:/.test(callWindow)
+        ) {
+          failures.push(
+            `${file}: inline useABTest variants object is missing control.`,
+          );
+        }
+      }
+
+      const useAbTestLiteralKey = line.match(
+        /useABTest\s*\(\s*['"]([^'"]+)['"]/u,
+      )?.[1];
+
+      if (
+        useAbTestLiteralKey &&
+        !isValidFlagKey(useAbTestLiteralKey)
+      ) {
+        warnings.push(
+          `${file}: flag key '${useAbTestLiteralKey}' does not match {team}{TICKET}Abtest{Name}.`,
+        );
+      }
+
+      for (const match of line.matchAll(ABTEST_STRING_LITERAL_REGEX)) {
+        const key = match[2];
+        if (key === useAbTestLiteralKey) {
+          continue;
+        }
+
+        if (!isValidFlagKey(key)) {
+          warnings.push(
+            `${file}: Abtest key '${key}' does not match {team}{TICKET}Abtest{Name}.`,
+          );
+        }
+      }
+    }
+  }
+
+  if (abRiskyChangeFiles.size > 0 && !testChanged) {
+    warnings.push(
+      'Risky A/B integration changes were detected without any test-file updates. For copy/config-only changes, document rationale in your response.',
+    );
+  }
+
+  console.log('A/B compliance check summary');
+  console.log(`Mode: ${mode}`);
+  if (fallbackNote) {
+    console.log(fallbackNote);
+  }
+  if (mode === 'files' && baseRef) {
+    console.log(`Base ref: ${baseRef}`);
+  }
+  console.log(`Files inspected: ${changedFiles.length}`);
+
+  printList('Failures:', failures);
+  printList('Warnings:', warnings);
+
+  process.exit(failures.length > 0 ? 1 : 0);
+}
+
+main();
diff --git a/.browserslistrc b/.browserslistrc
index 37ec9d624480..ace1ad8ca58b 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1 +1 @@
-chrome >= 89, firefox >= 89
+chrome >= 113, firefox >= 115
diff --git a/.claude/skills/ab-testing-implementation/SKILL.md b/.claude/skills/ab-testing-implementation/SKILL.md
new file mode 100644
index 000000000000..a1b08802d938
--- /dev/null
+++ b/.claude/skills/ab-testing-implementation/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: ab-testing-implementation
+summary: Implement or review extension A/B tests using the repository standard.
+---
+
+Follow `.agents/skills/ab-testing-implementation/SKILL.md`.
diff --git a/.cursor/commands/CODEBOT.md b/.cursor/commands/CODEBOT.md
index deecaac6faba..b12c73afbab9 100644
--- a/.cursor/commands/CODEBOT.md
+++ b/.cursor/commands/CODEBOT.md
@@ -473,8 +473,6 @@ Output the analysis in this **concise format**:
 1. What is the reason for the change?
 2. What is the improvement/solution?]
 
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/PR?quickstart=1)
-
 ## **Changelog**
 
 [If user-facing change:]
diff --git a/.cursor/rules/e2e-testing-guidelines/RULE.md b/.cursor/rules/e2e-testing-guidelines/RULE.md
index 0c1ccbc92df4..f177dfc11dc5 100644
--- a/.cursor/rules/e2e-testing-guidelines/RULE.md
+++ b/.cursor/rules/e2e-testing-guidelines/RULE.md
@@ -90,6 +90,8 @@ For new test code, use `FixtureBuilderV2` by default.
 - `withCurrencyController`
 - `withKeyringController`
 - `withMetaMetricsController`
+- `withMultichainAssetsRatesController`
+- `withMultichainRatesController`
 - `withNameController`
 - `withNetworkController`
 - `withNetworkEnablementController`
@@ -106,6 +108,8 @@ For new test code, use `FixtureBuilderV2` by default.
 **Custom convenience methods**:
 
 - `withConversionRateDisabled`
+- `withConversionRates`
+- `withCurrencyRates`
 - `withKeyringControllerAdditionalAccountVault`
 - `withKeyringControllerMultiSRP`
 - `withKeyringControllerOldVault`
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 724003cc8981..0dba5f3d489a 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -85,6 +85,9 @@ ignores:
   - 'react-compiler-webpack' # build tool
   - 'thread-loader' # build tool
   # babel
+  - '@babel/plugin-transform-class-properties'
+  - '@babel/plugin-transform-private-methods'
+  - '@babel/plugin-transform-private-property-in-object'
   - '@babel/plugin-transform-logical-assignment-operators'
   - 'babel-plugin-react-compiler'
   # used in image optimization script
diff --git a/.eslintrc.js b/.eslintrc.js
index 19f6698e303c..608d87dfd037 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -311,6 +311,12 @@ module.exports = {
         },
       },
     },
+    {
+      files: ['.agents/**/*.ts'],
+      rules: {
+        'import-x/no-nodejs-modules': 'off',
+      },
+    },
     /**
      * == Everything else ==
      *
@@ -510,7 +516,7 @@ module.exports = {
         'test/unit-global/*.test.js',
         'ui/**/*.test.js',
         'ui/__mocks__/*.js',
-        'shared/lib/error-utils.test.js',
+        'shared/lib/error-utils.test.ts',
       ],
       extends: ['@metamask/eslint-config-jest'],
       parserOptions: {
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 18dd55dffb75..01c31940e549 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -48,7 +48,7 @@ development/circular-deps.ts         @MetaMask/extension-security-team
 
 # For now, restricting approvals inside the .devcontainer folder to devs
 # who were involved with the Codespaces project.
-.devcontainer/                       @MetaMask/extension-security-team @HowardBraham
+.devcontainer/                       @MetaMask/extension-platform @HowardBraham
 
 # Design System to own code for the component-library folder
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system
@@ -211,8 +211,8 @@ app/scripts/lib/createMainFrameOriginMiddleware.ts                    @MetaMask/
 app/scripts/lib/createTracingMiddleware.ts                            @MetaMask/wallet-integrations
 
 # mUSD
-**/musd/** @MetaMask/metamask-earn
-shared/lib/deep-links/routes/musd.ts @MetaMask/metamask-earn
+**/musd/** @MetaMask/earn
+shared/lib/deep-links/routes/musd.ts @MetaMask/earn
 
 # Extension Platform owns build, development tooling,
 # CI, background process, and platform infrastructure. Changes to
diff --git a/.github/pull-request-template.md b/.github/pull-request-template.md
index d502f8b67a86..ab25a4612c85 100644
--- a/.github/pull-request-template.md
+++ b/.github/pull-request-template.md
@@ -11,8 +11,6 @@ Write a short description of the changes included in this pull request, also inc
 2. What is the improvement/solution?
 -->
 
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/PR?quickstart=1)
-
 ## **Changelog**
 
 <!--
diff --git a/.github/rules/filter-rules.yml b/.github/rules/filter-rules.yml
index 61e3a2a1c243..632a72b3b05a 100644
--- a/.github/rules/filter-rules.yml
+++ b/.github/rules/filter-rules.yml
@@ -57,3 +57,11 @@ all_changes:
 # To inform needs-locales
 locales:
   - 'app/_locales/**'
+
+# To inform just-repository-health-checks
+repository_health_checks_related:
+  - 'CHANGELOG.md'
+
+# To inform just-package-json-version
+package_json:
+  - 'package.json'
diff --git a/.github/scripts/collect-qa-stats.ts b/.github/scripts/collect-qa-stats.ts
index 471f3c030248..3820880648b7 100644
--- a/.github/scripts/collect-qa-stats.ts
+++ b/.github/scripts/collect-qa-stats.ts
@@ -86,7 +86,6 @@ type ScanResult = {
   defined: number;
 };
 
-
 type TestFile = {
   path?: string;
   tests?: number;
@@ -119,7 +118,13 @@ const GITHUB_REPOSITORY =
 // Update these if the repository directory structure or file-naming conventions
 // change — the collectors below rely on them for skip/defined counts.
 // ---------------------------------------------------------------------------
-const SCAN_UNIT_DIRS = ['ui', 'app', 'shared', 'development', 'test/unit-global'];
+const SCAN_UNIT_DIRS = [
+  'ui',
+  'app',
+  'shared',
+  'development',
+  'test/unit-global',
+];
 const SCAN_INTEGRATION_DIR = 'test/integration';
 const SCAN_E2E_DIR = 'test/e2e';
 
@@ -312,8 +317,7 @@ function getStringAttribute(tag: string, name: string): string {
  * @param rawXml - Raw JUnit XML string.
  */
 function parseJUnitXml(rawXml: string): JUnitParseResult {
-  const testcasePattern =
-    /<testcase\b([^>]*)(?:\/>|>([\s\S]*?)<\/testcase>)/gu;
+  const testcasePattern = /<testcase\b([^>]*)(?:\/>|>([\s\S]*?)<\/testcase>)/gu;
   const perFile: Record<string, number> = {};
   let total = 0;
   let skipped = 0;
@@ -355,13 +359,11 @@ function parseJUnitXml(rawXml: string): JUnitParseResult {
  */
 function countDefinedTests(source: string): number {
   return (
-    source.match(
-      /\b(?:it|test)(?:\.(?:each|skip|only|concurrent))?\s*\(/gu,
-    ) ?? []
+    source.match(/\b(?:it|test)(?:\.(?:each|skip|only|concurrent))?\s*\(/gu) ??
+    []
   ).length;
 }
 
-
 /**
  * Scans one or more directories for test files matching `filePattern` and
  * returns aggregate defined + skipped counts in a single filesystem pass.
@@ -432,8 +434,7 @@ function getFeatureFolder(testFilePath: string): string {
  * @param testFilePath - Absolute or relative test file path.
  */
 function getIntegrationFeatureFolder(testFilePath: string): string {
-  const normalize = (s: string) =>
-    s.toLowerCase().replace(/[^a-z0-9]+/gu, '_');
+  const normalize = (s: string) => s.toLowerCase().replace(/[^a-z0-9]+/gu, '_');
   const p = testFilePath.replace(/\\/gu, '/');
   const match = p.match(/\btest\/integration\/([^/]+)\//u);
   return match ? normalize(match[1]) : 'other';
@@ -499,7 +500,11 @@ async function collectUnitTestCount(
   for (const artifact of shardArtifacts) {
     const destDir = await downloadArtifact(artifact.name);
     const raw = await readFile(join(destDir, 'junit.xml'), 'utf8');
-    const { total: shardTotal, skipped: shardSkipped, perFile } = parseJUnitXml(raw);
+    const {
+      total: shardTotal,
+      skipped: shardSkipped,
+      perFile,
+    } = parseJUnitXml(raw);
     total += shardTotal;
     totalSkipped += shardSkipped;
 
@@ -771,7 +776,10 @@ async function collectE2eTestCount(): Promise<Record<string, number>> {
   }
 
   // --- Static analysis across all of test/e2e/ (for defined count only) ---
-  const { defined } = await scanTestFiles([SCAN_E2E_DIR], PATTERN_E2E_SPEC_FILE);
+  const { defined } = await scanTestFiles(
+    [SCAN_E2E_DIR],
+    PATTERN_E2E_SPEC_FILE,
+  );
   console.log(`[e2e] defined: ${defined}`);
 
   const totalSkipped = await getE2eSkippedFromXml();
@@ -829,7 +837,9 @@ async function collectBenchmarkScenarioCount(): Promise<
   Record<string, number>
 > {
   const constantsFile = 'test/e2e/benchmarks/utils/constants.ts';
-  console.log(`[benchmark] reading preset definitions from ${constantsFile}...`);
+  console.log(
+    `[benchmark] reading preset definitions from ${constantsFile}...`,
+  );
 
   const raw = await readFile(constantsFile, 'utf8');
 
@@ -881,6 +891,43 @@ async function collectMetametricsQaStats(): Promise<Record<string, number | stri
   }
 }
 
+// ---------------------------------------------------------------------------
+// Feature flag coverage collector
+// ---------------------------------------------------------------------------
+
+/**
+ * Runs static analysis of E2E test coverage for feature flags using the
+ * shared report generator in test/e2e/scripts/feature-flag-coverage-report.ts.
+ *
+ * No artifact download required — the analysis reads the feature flag registry
+ * and scans test files on disk (both available in the checked-out repo).
+ */
+async function collectFeatureFlagCoverage(): Promise<Record<string, number>> {
+  console.log('[e2e_feature_flags] running static coverage analysis...');
+
+  const { generateReport } = await import(
+    '../../test/e2e/scripts/feature-flag-coverage-report'
+  );
+
+  const report = generateReport(process.cwd());
+  const { summary } = report;
+
+  console.log(
+    `[e2e_feature_flags] total: ${summary.totalFlags}, active: ${summary.activeFlags}, coverage: ${summary.coveragePercentage}%`,
+  );
+
+  return {
+    total_flags: summary.totalFlags,
+    active_flags: summary.activeFlags,
+    deprecated_flags: summary.deprecatedFlags,
+    in_prod_flags: summary.inProdFlags,
+    full_coverage_flags: summary.fullCoverage,
+    partial_coverage_flags: summary.partialCoverage,
+    default_only_flags: summary.defaultOnlyCoverage,
+    coverage_percentage: summary.coveragePercentage,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Main
 // ---------------------------------------------------------------------------
@@ -894,6 +941,7 @@ async function main(): Promise<void> {
     { namespace: 'e2e', collect: collectE2eTestCount },
     { namespace: 'benchmark', collect: collectBenchmarkScenarioCount },
     { namespace: 'metametrics', collect: collectMetametricsQaStats },
+    { namespace: 'e2e_feature_flags', collect: collectFeatureFlagCoverage },
   ];
 
   for (const { namespace, collect } of collectors) {
diff --git a/.github/scripts/get-stable-released-version.sh b/.github/scripts/get-stable-released-version.sh
new file mode 100755
index 000000000000..1e9010a4e881
--- /dev/null
+++ b/.github/scripts/get-stable-released-version.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Resolves the semver for Stable Branch Sync PRs. Uses the version at the tip
+# of `stable` (from package.json), i.e. the release that was just merged — not
+# the "next" release derived from remote release/* branches (see
+# get-next-semver-version.sh for that).
+
+set -euo pipefail
+
+if [ -z "${GITHUB_OUTPUT:-}" ]; then
+  echo "GITHUB_OUTPUT is not set; this script is only meant to run in GitHub Actions." >&2
+  exit 1
+fi
+
+ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+PACKAGE_JSON="${ROOT}/package.json"
+
+if [ ! -f "$PACKAGE_JSON" ]; then
+  echo "Expected package.json at ${PACKAGE_JSON}" >&2
+  exit 1
+fi
+
+VERSION=$(jq -r '.version | select(type == "string")' "$PACKAGE_JSON")
+
+if [ -z "$VERSION" ] || [ "$VERSION" = "null" ]; then
+  echo "Could not read .version from ${PACKAGE_JSON}" >&2
+  exit 1
+fi
+
+# Same rule as .github/scripts/shared/utils.ts isValidVersionFormat (stable-sync branch names expect x.y.z).
+if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Invalid version in ${PACKAGE_JSON}: ${VERSION} (expected numeric x.y.z)" >&2
+  exit 1
+fi
+
+echo "stable_version=${VERSION}" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/check-feature-flag-registry-drift.yml b/.github/workflows/check-feature-flag-registry-drift.yml
index c5e8c59f61f1..56d128b6f967 100644
--- a/.github/workflows/check-feature-flag-registry-drift.yml
+++ b/.github/workflows/check-feature-flag-registry-drift.yml
@@ -70,6 +70,8 @@ jobs:
       registry-artifact-name: updated-registry
       report-artifact-name: drift-report
       workflow-run-url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      pr-title-prefix: 'test: Sync Feature Flag Registry'
+      pr-label: 'team-qa,no-changelog'
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/codespaces-update-badge.yml b/.github/workflows/codespaces-update-badge.yml
deleted file mode 100644
index 169b829b7495..000000000000
--- a/.github/workflows/codespaces-update-badge.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Codespaces
-
-on:
-  pull_request_target:
-    types:
-      - edited
-      - opened
-      - reopened
-
-jobs:
-  codespaces-update-badge:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    permissions:
-      pull-requests: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-
-      # This use of an ENV variable is necessary to avoid an injection attack, see:
-      # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions
-      BODY: ${{ github.event.pull_request.body }}
-
-    steps:
-      - name: Replace the text in the Codespaces badge with the PR number
-        run: |
-          #!/bin/bash
-
-          # Bash replace syntax
-          NEW_BODY="${BODY/PR?quickstart=1/$PR_NUMBER?quickstart=1}"
-
-          # If the body has changed as a result of the replace, use the GitHub API to update the PR
-          if [ "$NEW_BODY" != "$BODY" ]; then
-            gh api /repos/MetaMask/metamask-extension/pulls/${{github.event.pull_request.number}} -f body="$NEW_BODY"
-          fi
diff --git a/.github/workflows/e2e-chrome.yml b/.github/workflows/e2e-chrome.yml
index 60afa2e0ed74..62ab315bb777 100644
--- a/.github/workflows/e2e-chrome.yml
+++ b/.github/workflows/e2e-chrome.yml
@@ -101,7 +101,6 @@ jobs:
 
   test-e2e-chrome-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     secrets:
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
     strategy:
@@ -118,7 +117,6 @@ jobs:
 
   test-e2e-chrome-multiple-providers-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     with:
       test-suite-name: test-e2e-chrome-multiple-providers-webpack
       build-artifact: build-test-webpack
@@ -128,7 +126,6 @@ jobs:
 
   test-e2e-chrome-rpc-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     with:
       test-suite-name: test-e2e-chrome-rpc-webpack
       build-artifact: build-test-webpack
@@ -138,9 +135,8 @@ jobs:
 
   test-e2e-chrome-flask-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix: ${{ fromJson(inputs.use-matrix)['test-e2e-chrome-flask-webpack'] }}
     with:
       test-suite-name: test-e2e-chrome-flask-webpack
@@ -152,7 +148,8 @@ jobs:
       matrix-total: ${{ strategy.job-total }}
 
   test-e2e-chrome-dist-webpack:
-    if: ${{ github.event_name != 'merge_group' && !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
+    # This if statement is equivalent to !IS_FORK
+    if: ${{ !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
     uses: ./.github/workflows/run-e2e.yml
     with:
       test-suite-name: test-e2e-chrome-dist-webpack
@@ -162,7 +159,6 @@ jobs:
 
   test-e2e-chrome-api-specs-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     with:
       test-suite-name: test-e2e-chrome-api-specs-webpack
       build-artifact: build-test-webpack
@@ -173,7 +169,6 @@ jobs:
 
   test-e2e-chrome-api-specs-multichain-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     with:
       test-suite-name: test-e2e-chrome-api-specs-multichain-webpack
       build-artifact: build-test-flask-webpack
diff --git a/.github/workflows/e2e-firefox.yml b/.github/workflows/e2e-firefox.yml
index d911b1d071ec..656a1a779753 100644
--- a/.github/workflows/e2e-firefox.yml
+++ b/.github/workflows/e2e-firefox.yml
@@ -61,7 +61,6 @@ jobs:
 
   test-e2e-firefox-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     secrets:
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
     strategy:
@@ -78,9 +77,8 @@ jobs:
 
   test-e2e-firefox-flask-webpack:
     uses: ./.github/workflows/run-e2e.yml
-    if: ${{ github.event_name != 'merge_group' }}
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix: ${{ fromJson(inputs.use-matrix)['test-e2e-firefox-flask-webpack'] }}
     with:
       test-suite-name: test-e2e-firefox-flask-webpack
@@ -92,7 +90,8 @@ jobs:
       matrix-total: ${{ strategy.job-total }}
 
   test-e2e-firefox-dist-webpack:
-    if: ${{ github.event_name != 'merge_group' && !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
+    # This if statement is equivalent to !IS_FORK
+    if: ${{ !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
     uses: ./.github/workflows/run-e2e.yml
     with:
       test-suite-name: test-e2e-firefox-dist-webpack
diff --git a/.github/workflows/get-requirements.yml b/.github/workflows/get-requirements.yml
index 7fac3f59ecd6..641e0be692ea 100644
--- a/.github/workflows/get-requirements.yml
+++ b/.github/workflows/get-requirements.yml
@@ -27,6 +27,9 @@ on:
       needs-e2e:
         description: Whether E2E tests are needed
         value: ${{ jobs.detect-changes.outputs.needs-e2e }}
+      just-repository-health-checks:
+        description: Whether repository health checks are needed
+        value: ${{ jobs.detect-changes.outputs.just-repository-health-checks }}
 
 env:
   # For a `pull_request` event, the head commit hash is `github.event.pull_request.head.sha`.
@@ -37,6 +40,8 @@ env:
   RUN_ID: ${{ github.run_id }}
   IS_FORK: ${{ github.event.pull_request.head.repo.fork || github.event.repository.fork }}
   EVENT_NAME: ${{ github.event_name }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+  GH_TOKEN: ${{ github.token }}
 
 jobs:
   detect-changes:
@@ -52,6 +57,7 @@ jobs:
       needs-releases: ${{ steps.set-needs-releases.outputs.needs-releases || 'false'}}
       needs-benchmarks: ${{ steps.set-needs-benchmarks.outputs.needs-benchmarks || 'false'}}
       needs-e2e: ${{ steps.set-needs-e2e.outputs.needs-e2e || 'false'}}
+      just-repository-health-checks: ${{ steps.set-just-repository-health-checks.outputs.just-repository-health-checks || 'false'}}
     steps:
       - name: Check pull request merge queue status
         id: check-skip-merge-queue
@@ -116,10 +122,52 @@ jobs:
             echo "needs-locales=false" >> "$GITHUB_OUTPUT"
           fi
 
-      # skip-everything is a shortcut for up-to-date == 'true' || needs-locales == 'true'
+      - name: Compute just-repository-health-checks flag
+        id: set-just-repository-health-checks
+        if: >-
+          ${{
+            steps.check-skip-merge-queue.outputs.up-to-date != 'true' &&
+            steps.filter.outputs.repository_health_checks_related_count != '0' &&
+            steps.filter.outputs.all_changes_count == steps.filter.outputs.repository_health_checks_related_count
+          }}
+        run: echo "just-repository-health-checks=true" >> "$GITHUB_OUTPUT"
+
+      # If the only change is in package.json, and the only line changed is "version", then we can skip everything
+      - name: Compute just-package-json-version flag
+        id: set-just-package-json-version
+        if: >-
+          ${{
+            env.EVENT_NAME == 'pull_request' &&
+            steps.filter.outputs.package_json_count == '1' &&
+            steps.filter.outputs.all_changes_count == '1'
+          }}
+        run: |
+          # At this point we already know the *only* changed file is package.json.
+          # Emit true only if the diff is exactly a single "version" line replacement.
+          export GH_PAGER=cat
+          DIFF="$(gh pr diff "${PR_NUMBER}" || true)"
+          CHANGES="$(printf '%s\n' "$DIFF" | grep -E '^[+-]' | grep -vE '^(\+\+\+|---)' || true)"
+          CHANGES_COUNT="$(printf '%s\n' "$CHANGES" | sed '/^$/d' | wc -l | tr -d ' ')"
+
+          if [[ "$CHANGES_COUNT" == '2' ]] && \
+             printf '%s\n' "$CHANGES" | grep -Eq '^-[[:space:]]*"version"[[:space:]]*:' && \
+             printf '%s\n' "$CHANGES" | grep -Eq '^\+[[:space:]]*"version"[[:space:]]*:'; then
+            echo "The only change is in package.json, and the only line changed is 'version'."
+            echo "just-package-json-version=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      # skip-everything is a shortcut for up-to-date == 'true' || needs-locales == 'true' || just-repository-health-checks = 'true' || just-package-json-version == 'true'
       - name: Compute skip-everything flag
         id: set-skip-everything
-        if: ${{ env.IS_RUN_EVERYTHING_BRANCH == 'false' && (steps.check-skip-merge-queue.outputs.up-to-date == 'true' || steps.set-needs-locales.outputs.needs-locales == 'true') }}
+        if: >-
+          ${{
+            env.IS_RUN_EVERYTHING_BRANCH == 'false' && (
+              steps.check-skip-merge-queue.outputs.up-to-date == 'true' ||
+              steps.set-needs-locales.outputs.needs-locales == 'true' ||
+              steps.set-just-repository-health-checks.outputs.just-repository-health-checks == 'true' ||
+              steps.set-just-package-json-version.outputs.just-package-json-version == 'true'
+            )
+          }}
         run: echo "skip-everything=true" >> "$GITHUB_OUTPUT"
 
       # This is very simple right now (and equivalent to !skip-everything)
@@ -138,14 +186,24 @@ jobs:
       - name: Compute needs-releases flag
         id: set-needs-releases
         # Do not do releases on a fork
-        if: ${{ env.IS_FORK == 'false' && env.EVENT_NAME != 'merge_group' && steps.set-skip-everything.outputs.skip-everything != 'true' }}
+        if: >-
+          ${{
+            env.IS_FORK == 'false' &&
+            env.EVENT_NAME != 'merge_group' &&
+            steps.set-skip-everything.outputs.skip-everything != 'true'
+          }}
         run: echo "needs-releases=true" >> "$GITHUB_OUTPUT"
 
       # This is very simple right now, but is built to have future complexity
       - name: Compute needs-benchmarks flag
         id: set-needs-benchmarks
         # Do not run benchmarks on a fork or in the merge queue
-        if: ${{ env.IS_FORK == 'false' && env.EVENT_NAME != 'merge_group' && steps.set-skip-everything.outputs.skip-everything != 'true' }}
+        if: >-
+          ${{
+            env.IS_FORK == 'false' &&
+            env.EVENT_NAME != 'merge_group' &&
+            steps.set-skip-everything.outputs.skip-everything != 'true'
+          }}
         run: echo "needs-benchmarks=true" >> "$GITHUB_OUTPUT"
 
       - name: Compute needs-e2e flag
diff --git a/.github/workflows/identify-codeowners.yml b/.github/workflows/identify-codeowners.yml
index 64d297229840..398bdd90a6d6 100644
--- a/.github/workflows/identify-codeowners.yml
+++ b/.github/workflows/identify-codeowners.yml
@@ -15,7 +15,14 @@ concurrency:
 jobs:
   identify-codeowners:
     # Avoid running on forks since we need to write a PR comment
-    if: ${{ !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
+    # Avoid running on release branches and bot PRs
+    if: >-
+      ${{
+        !(github.event.pull_request.head.repo.fork || github.event.repository.fork)
+        && !startsWith(github.head_ref, 'release/')
+        && github.event.pull_request.user.login != 'metamaskbot'
+        && github.event.pull_request.user.login != 'runway-github[bot]'
+      }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment: pr-comment
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 31b8e9aed2d8..9908a77c6b69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -125,7 +125,15 @@ jobs:
     needs:
       - get-requirements
       - prep-deps
-    if: ${{ needs.get-requirements.outputs.skip-everything != 'true' }}
+    if: >-
+      ${{
+        !cancelled() &&
+        !contains(needs.*.result, 'failure') &&
+        (
+          needs.get-requirements.outputs.skip-everything != 'true' ||
+          needs.get-requirements.outputs.just-repository-health-checks == 'true'
+        )
+      }}
     permissions:
       contents: read
       issues: write
@@ -265,9 +273,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-dist-webpack
-      build-command: yarn webpack:lavamoat:build
+      build-command: yarn webpack:lavamoat:build --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-dist-mv2-webpack:
@@ -278,9 +285,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-dist-mv2-webpack
-      build-command: yarn webpack:lavamoat:build:mv2
+      build-command: yarn webpack:lavamoat:build:mv2 --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-beta-webpack:
@@ -291,9 +297,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-beta-webpack
-      build-command: yarn webpack:lavamoat:build --type beta
+      build-command: yarn webpack:lavamoat:build --type beta --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-beta-mv2-webpack:
@@ -304,9 +309,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-beta-mv2-webpack
-      build-command: yarn webpack:lavamoat:build:mv2 --type beta
+      build-command: yarn webpack:lavamoat:build:mv2 --type beta --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-flask-webpack:
@@ -317,9 +321,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-flask-webpack
-      build-command: yarn webpack:lavamoat:build --type flask
+      build-command: yarn webpack:lavamoat:build --type flask --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-flask-mv2-webpack:
@@ -330,9 +333,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-flask-mv2-webpack
-      build-command: yarn webpack:lavamoat:build:mv2 --type flask
+      build-command: yarn webpack:lavamoat:build:mv2 --type flask --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-test-webpack:
@@ -343,9 +345,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-test-webpack
-      build-command: yarn build:test:webpack
+      build-command: yarn build:test:webpack --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-test-mv2-webpack:
@@ -356,9 +357,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-test-mv2-webpack
-      build-command: yarn build:test:webpack:mv2
+      build-command: yarn build:test:webpack:mv2 --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-test-flask-webpack:
@@ -369,9 +369,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-test-flask-webpack
-      build-command: yarn build:test:flask:webpack
+      build-command: yarn build:test:flask:webpack --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   build-test-flask-mv2-webpack:
@@ -382,9 +381,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-test-flask-mv2-webpack
-      build-command: yarn build:test:flask:webpack:mv2
+      build-command: yarn build:test:flask:webpack:mv2 --zip
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
-      zip: true
     secrets: inherit
 
   run-benchmarks:
diff --git a/.github/workflows/merge-my-pr.yml b/.github/workflows/merge-my-pr.yml
index 224f628dc71d..b424f744bf2b 100644
--- a/.github/workflows/merge-my-pr.yml
+++ b/.github/workflows/merge-my-pr.yml
@@ -13,12 +13,14 @@ jobs:
   merge-my-pr:
     # Only run if the comment is on a PR and the comment body matches exactly "Merge my PR"
     if: >-
-      github.event.issue.pull_request &&
-      github.event.comment.body == 'Merge my PR' &&
-      (
-        github.event.comment.author_association == 'MEMBER' ||
-        github.event.comment.author_association == 'OWNER'
-      )
+      ${{
+        github.event.issue.pull_request &&
+        github.event.comment.body == 'Merge my PR' &&
+        (
+          github.event.comment.author_association == 'MEMBER' ||
+          github.event.comment.author_association == 'OWNER'
+        )
+      }}
     runs-on: ubuntu-latest
     environment: default-branch
     permissions:
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 33e4afd33280..26940452fe6b 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -48,9 +48,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-dist-webpack
-      build-command: yarn webpack:lavamoat:build
+      build-command: yarn webpack:lavamoat:build --zip
       builds-from-run: ${{ github.run_id }}
-      zip: true
     secrets: inherit
 
   build-dist-mv2-webpack:
@@ -58,9 +57,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-dist-mv2-webpack
-      build-command: yarn webpack:lavamoat:build:mv2
+      build-command: yarn webpack:lavamoat:build:mv2 --zip
       builds-from-run: ${{ github.run_id }}
-      zip: true
     secrets: inherit
 
   build-experimental-webpack:
@@ -68,9 +66,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-experimental-webpack
-      build-command: yarn webpack:lavamoat:build --type experimental
+      build-command: yarn webpack:lavamoat:build --type experimental --zip
       builds-from-run: ${{ github.run_id }}
-      zip: true
     secrets: inherit
 
   build-experimental-mv2-webpack:
@@ -78,9 +75,8 @@ jobs:
     with:
       is-high-risk-environment: false
       build-name: build-experimental-mv2-webpack
-      build-command: yarn webpack:lavamoat:build:mv2 --type experimental
+      build-command: yarn webpack:lavamoat:build:mv2 --type experimental --zip
       builds-from-run: ${{ github.run_id }}
-      zip: true
     secrets: inherit
 
   post-nightly-builds:
diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml
index c36b9dfdccfa..78bc5ab2d8f3 100644
--- a/.github/workflows/publish-prerelease.yml
+++ b/.github/workflows/publish-prerelease.yml
@@ -123,6 +123,7 @@ jobs:
       MERGE_BASE_COMMIT_HASH: '' # placeholder so that we have autocomplete and logs
       CLOUDFRONT_REPO_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}
       HOST_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}/${{ github.run_id }}
+      BENCHMARK_WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id || github.run_id }}
       LAVAMOAT_POLICY_CHANGED: ${{ inputs.lavamoat-policy-changed }}
       POST_NEW_BUILDS: ${{ inputs.post-new-builds }}
       TEST_PLAN_VERSION: ${{ needs.generate-test-plan.outputs.test_plan_version }}
diff --git a/.github/workflows/run-build.yml b/.github/workflows/run-build.yml
index e7897dd92ca3..7af474a9849d 100644
--- a/.github/workflows/run-build.yml
+++ b/.github/workflows/run-build.yml
@@ -19,10 +19,6 @@ on:
         required: true
         type: string
         description: The run ID to get builds from
-      zip:
-        type: boolean
-        default: false
-        description: Whether to zip the build output. Only compatible with webpack builds. This bash-based zipping is more performant than the built-in zip option of webpack.
 
 jobs:
   run-build:
@@ -107,24 +103,6 @@ jobs:
       - name: Run build
         run: ${{ inputs.build-command }}
 
-      - name: Zip build
-        if: ${{ inputs.zip }}
-        run: |
-          mkdir -p builds
-          version_name=$(jq -r '.version' package.json)
-          if [ "${IS_FLASK_BUILD}" = "true" ]; then
-            version_name="${version_name}-flask.0"
-          elif [ "${IS_BETA_BUILD}" = "true" ]; then
-            version_name="${version_name}-beta.0"
-          elif [ "${IS_EXPERIMENTAL_BUILD}" = "true" ]; then
-            version_name="${version_name}-experimental.0"
-          fi
-          for browser in chrome firefox; do
-            if [ -d "dist/${browser}" ]; then
-              (cd "dist/${browser}" && zip -9 -r "../../builds/metamask-${browser}-${version_name}.zip" .)
-            fi
-          done
-
       - name: Validate source maps
         run: ${{ contains(inputs.build-name, 'webpack') && 'yarn validate-source-maps:webpack' || 'yarn validate-source-maps' }}
 
diff --git a/.github/workflows/stable-branch-sync.yml b/.github/workflows/stable-branch-sync.yml
index a10f9dc8e64c..e6dd407dbff3 100644
--- a/.github/workflows/stable-branch-sync.yml
+++ b/.github/workflows/stable-branch-sync.yml
@@ -9,39 +9,35 @@ permissions:
   contents: write
 
 jobs:
-  get-next-version:
-    name: Get next version vX.Y.Z
+  get-stable-version:
+    name: Get stable release version
     runs-on: ubuntu-latest
     timeout-minutes: 30
     outputs:
-      next-version: ${{ env.NEXT_SEMVER_VERSION }}
+      stable-version: ${{ steps.resolve-stable-version.outputs.stable_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Configure Git
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Get the next semver version
-        id: get-next-semver-version
-        env:
-          FORCE_NEXT_SEMVER_VERSION: ${{ vars.FORCE_NEXT_SEMVER_VERSION }}
-        run: ./get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
+      - name: Get stable release version
+        id: resolve-stable-version
+        run: ./get-stable-released-version.sh
         working-directory: '.github/scripts'
 
   run-stable-sync:
     name: Run Stable branch sync
-    needs: get-next-version
+    needs: get-stable-version
     runs-on: ubuntu-latest
     steps:
       - name: Run stable sync
         uses: MetaMask/github-tools/.github/actions/stable-sync@v1
         with:
-          semver-version: ${{ needs.get-next-version.outputs.next-version }}
+          semver-version: ${{ needs['get-stable-version'].outputs['stable-version'] }}
           repo-type: 'extension'
           stable-branch-name: 'stable'
           github-token: ${{ secrets.STABLE_SYNC_TOKEN }}
diff --git a/.github/workflows/update-lavamoat-policies.yml b/.github/workflows/update-lavamoat-policies.yml
index 485ac59d0d41..1a07adfc0886 100644
--- a/.github/workflows/update-lavamoat-policies.yml
+++ b/.github/workflows/update-lavamoat-policies.yml
@@ -398,7 +398,7 @@ jobs:
       - name: Post comment (policies updated)
         if: ${{ env.UPSTREAM_SUCCESS == 'true' && steps.policy-changes.outputs.HAS_CHANGES == 'true' }}
         run: |
-          echo -e 'Policies updated.  \n👀 Please review the diff for suspicious new powers.  \n\n🧠 Learn how: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff \n\n' | cat - does_diff_diff.txt | gh pr comment "${PR_NUMBER}" --body-file -
+          echo -e 'Policies updated.  \n👀 Please review the diff for suspicious new powers.  \n\n> [!TIP]  \n> Follow the policy review process outlined in the [LavaMoat Policy Review Process doc](https://github.com/MetaMask/metamask-extension/blob/main/docs/lavamoat-policy-review-process.md) before expecting an approval from Policy Reviewers.  \n🧠 Learn how to read policy diffs: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff \n\n' | cat - does_diff_diff.txt | gh pr comment "${PR_NUMBER}" --body-file -
 
       - name: Post comment (no policy changes)
         if: ${{ env.UPSTREAM_SUCCESS == 'true' && steps.policy-changes.outputs.HAS_CHANGES == 'false' }}
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index ff1d93be6fd1..b964e1d3635e 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -362,8 +362,8 @@ const state = {
     isInitialized: true,
     isUnlocked: true,
     rpcUrl: 'https://rawtestrpc.metamask.io/',
+    selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
     accountTree: {
-      selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       wallets: {
         'entropy:01JKAF3DSGM3AB87EM9N0K41AJ': {
           id: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ',
@@ -383,6 +383,7 @@ const state = {
                 },
                 hidden: false,
                 pinned: false,
+                lastSelected: 0,
               },
             },
           },
@@ -763,7 +764,6 @@ const state = {
     balances: {},
     conversionRates: {},
     networkConfigurationsByChainId: {},
-    useBlockie: false,
     featureFlags: {},
     slides: [],
     currentLocale: 'en',
diff --git a/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch b/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch
deleted file mode 100644
index 934c3e03223b..000000000000
--- a/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/dist/utils/transaction.cjs b/dist/utils/transaction.cjs
-index 5ba85f2f336d8cf2bda4d71cf625901251bcb6f2..746b9412f93c82513831d476c49925193e31ec9c 100644
---- a/dist/utils/transaction.cjs
-+++ b/dist/utils/transaction.cjs
-@@ -238,7 +238,11 @@ const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, r
-     // Enable 7702 batching when the quote includes gasless 7702 support,
-     // or when the account is already delegated (to avoid the in-flight
-     // transaction limit for delegated accounts)
--    const disable7702 = !skipGasFields && !isDelegatedAccount;
-+    let disable7702 = !skipGasFields && !isDelegatedAccount;
-+    // For gasless transactions with STX/sendBundle we keep disabling 7702.
-+    if (gasIncluded && !gasIncluded7702) {
-+        disable7702 = true;
-+    }
-     const transactions = [];
-     if (resetApproval) {
-         const gasFees = await (0, gas_1.calculateGasFees)(skipGasFields, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
diff --git a/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch b/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch
deleted file mode 100644
index d1d37e628f23..000000000000
--- a/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/dist/utils/transaction.mjs b/dist/utils/transaction.mjs
-index 02b3b37bf2796a9c54f79224c675cd01dfe2831f..12b1ed6f99ef3983cd63316d4724951f66c05057 100644
---- a/dist/utils/transaction.mjs
-+++ b/dist/utils/transaction.mjs
-@@ -225,7 +225,11 @@ export const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, appr
-     // Enable 7702 batching when the quote includes gasless 7702 support,
-     // or when the account is already delegated (to avoid the in-flight
-     // transaction limit for delegated accounts)
--    const disable7702 = !skipGasFields && !isDelegatedAccount;
-+    let disable7702 = !skipGasFields && !isDelegatedAccount;
-+    // For gasless transactions with STX/sendBundle we keep disabling 7702.
-+    if (gasIncluded && !gasIncluded7702) {
-+        disable7702 = true;
-+    }
-     const transactions = [];
-     if (resetApproval) {
-         const gasFees = await calculateGasFees(skipGasFields, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
diff --git a/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch b/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch
deleted file mode 100644
index 17272fe8a68f..000000000000
--- a/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/dist/providers/SnapAccountProvider.cjs b/dist/providers/SnapAccountProvider.cjs
-index 796cff7ff4a15d2a685c896509d9b1af891123d2..8846eaef0e761235e63d40b4dabff7f9485472ca 100644
---- a/dist/providers/SnapAccountProvider.cjs
-+++ b/dist/providers/SnapAccountProvider.cjs
-@@ -80,24 +80,8 @@ class SnapAccountProvider extends BaseBip44AccountProvider_1.BaseBip44AccountPro
-             // NOTE: This should never happen, but if it does, we recover by deleting the
-             // extra accounts from the Snap to bring it back in sync with MetaMask.
-             if (localSnapAccounts.length < snapAccounts.size) {
--                // Build a set of local account IDs for quick lookup
--                const localAccountIds = new Set(localSnapAccounts.map((account) => account.id));
--                // Find and delete accounts that exist in Snap but not in MetaMask
--                await Promise.all([...snapAccounts].map(async (snapAccountId) => {
--                    try {
--                        if (!localAccountIds.has(snapAccountId)) {
--                            // This account exists in the Snap but not in MetaMask, delete it from
--                            // the Snap.
--                            await __classPrivateFieldGet(this, _SnapAccountProvider_client, "f").deleteAccount(snapAccountId);
--                            // Update the local Set so subsequent checks use the correct size
--                            snapAccounts.delete(snapAccountId);
--                        }
--                    }
--                    catch (error) {
--                        const sentryError = (0, utils_1.createSentryError)(`Unable to delete de-synced Snap account: ${this.snapId}`, error, { provider: this.getName(), snapAccountId });
--                        this.messenger.captureException?.(sentryError);
--                    }
--                }));
-+                console.warn(`Snap "${this.snapId}" has de-synced accounts, Snap has more accounts than MetaMask! (${localSnapAccounts.length} < ${snapAccounts.size})`);
-+                return;
-             }
-             // We want this part to be fast, so we only check for sizes, but we might need
-             // to make a real "diff" between the 2 states to not miss any de-sync.
diff --git a/.yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch b/.yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch
similarity index 64%
rename from .yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch
rename to .yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch
index 0870ec316d13..cf86c1e9c8e3 100644
--- a/.yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch
+++ b/.yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch
@@ -1,44 +1,43 @@
-diff --git a/_PATCH.txt b/_PATCH.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..94d9729bdc09c57a213683e048f1edb9b0d8fe42
---- /dev/null
-+++ b/_PATCH.txt
-@@ -0,0 +1,2 @@
 +This patch fixes a bug in Lodash when it's run in a contentscript on Firefox.
 +See here for details: https://github.com/lodash/lodash/issues/5934
 diff --git a/_freeGlobal.js b/_freeGlobal.js
-index bbec998fc8cbaaeec1f848017aa8e232d4d419eb..37addf20c9846f1729b83c67746714e6bcc6565d 100644
+index bbec998fc8cbaaeec1f848017aa8e232d4d419eb..c0c1cf770949db4c0b3e4fbb4d22f90930349307 100644
 --- a/_freeGlobal.js
 +++ b/_freeGlobal.js
 @@ -1,4 +1,4 @@
- /** Detect free variable `global` from Node.js. */
+-/** Detect free variable `global` from Node.js. */
 -var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
++/** Detect free variable `globalThis` from Node.js. */
 +var freeGlobal = typeof globalThis == 'object' && globalThis && globalThis.Object === Object && globalThis;
- 
+
  module.exports = freeGlobal;
 diff --git a/core.js b/core.js
-index caf078f6987f2b47ef6485938ea51cd244f03ef2..534712292249b2272e367afd6753668afaf1408a 100644
+index 694ed51dd5fef287e802f01d39f4d0511a6239c2..c7b6165c87050578a799a43fd4eba1002b9c7ae0 100644
 --- a/core.js
 +++ b/core.js
-@@ -62,7 +62,7 @@
+@@ -61,8 +61,8 @@
+     "'": '&#39;'
    };
- 
-   /** Detect free variable `global` from Node.js. */
+
+-  /** Detect free variable `global` from Node.js. */
 -  var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
++  /** Detect free variable `globalThis` from Node.js. */
 +  var freeGlobal = typeof globalThis == 'object' && globalThis && globalThis.Object === Object && globalThis;
- 
+
    /** Detect free variable `self`. */
    var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
 diff --git a/lodash.js b/lodash.js
-index ba61bcba083afe38d65e1a05f714b9be8f3b2ed3..b8d7b4fc8c145edfa9f2106acd06d689a3be65a2 100644
+index 8634cab16747f81f9336d1a231dc501af460179d..b187288c6811d0d1cc431cec4a0dc0965e23495a 100644
 --- a/lodash.js
 +++ b/lodash.js
-@@ -427,7 +427,7 @@
+@@ -427,8 +427,8 @@
+   var freeParseFloat = parseFloat,
        freeParseInt = parseInt;
- 
-   /** Detect free variable `global` from Node.js. */
+
+-  /** Detect free variable `global` from Node.js. */
 -  var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
++  /** Detect free variable `globalThis` from Node.js. */
 +  var freeGlobal = typeof globalThis == 'object' && globalThis && globalThis.Object === Object && globalThis;
- 
+
    /** Detect free variable `self`. */
    var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
diff --git a/.yarnrc.yml b/.yarnrc.yml
index c6ca6c590164..e3878a277052 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -51,10 +51,6 @@ npmAuditIgnoreAdvisories:
   # New package name format for new versions: @ethereumjs/wallet.
   - 'ethereumjs-wallet (deprecation)'
 
-  # Deprecated package still used by older versions of our packages, to be eliminated soon as we
-  # update.
-  - '@metamask/error-reporting-service (deprecation)'
-
   # Deprecated transitive dependency of better-sqlite3. No maintained alternative available yet.
   - 'prebuild-install (deprecation)'
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index edefc3d6a543..1d581a688b9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.25.0]
+
+### Added
+
+- Recent Activity on the Perps tab and related UI improvements (#41174)
+- Default address shown by default with a hoverable network group (optional default address) below each account name on the account list (#41138)
+- Perps watchlist (#40991)
+- Deep links for Perps: open the Perps tab, a specific market, or the market list with a pre-selected filter (#41143)
+- Search in Settings V2 (#41080)
+- Logos for Stable network and its native token (#40879)
+- Bridging from EVM chains to other wallet addresses (#40990)
+- Perps live stream hooks in the UI (#40779)
+- "Paid by MetaMask" on the Activity "Total gas fee" row when the transaction was a gas-sponsored swap (#40757)
+
+### Changed
+
+- mUSD conversion education and confirmation copy: clearer bonus layout, Relay attribution in the header, wider info popover, accessible bonus tooltip labels, aligned home mUSD CTA with the asset overview CTA, and removed unused `musdEarnBonusPercentage` locale keys (#41233)
+- Migrated stock and market closure components to the design-system-react library and adjusted styling to design guidelines (#41059)
+- Migrated to historical prices v3 (#41112)
+- Multichain network avatars remain visible when default address mode is enabled (#41238)
+- Reverted the asset verified badge in the swaps asset picker (#41163)
+- mUSD education splash screen no longer shows extra empty space at the bottom on shorter screens (#41077)
+
+### Fixed
+
+- Activity tab error state (#41266)
+- NFT detail page in fullscreen (#41210)
+- Gas editor from cancel or speed-up flow aligned with the main transaction confirmation flow (#40734)
+- Order exposure increase bug (#41028)
+- Perps positions and balance not updating when switching between accounts (#41168)
+- Order entry header visuals and persisted order values (#41025)
+- Canceling Solana transactions no longer leaves the wallet loading indefinitely (#41055)
+- Translation error on the Reveal Secret Recovery Phrase page that could crash the extension for the Irish (ga) locale (#41047)
+
 ## [13.24.0]
 
 ### Added
@@ -1983,7 +2017,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.24.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.25.0...HEAD
+[13.25.0]: https://github.com/MetaMask/metamask-extension/compare/v13.24.0...v13.25.0
 [13.24.0]: https://github.com/MetaMask/metamask-extension/compare/v13.23.0...v13.24.0
 [13.23.0]: https://github.com/MetaMask/metamask-extension/compare/v13.22.0...v13.23.0
 [13.22.0]: https://github.com/MetaMask/metamask-extension/compare/v13.21.0...v13.22.0
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 33e2d3981afd..c63122522125 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Erweitert"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Wenn Ihre Transaktion in den Block aufgenommen wird, wird die Differenz zwischen Ihrer maximalen Grundgebühr und der tatsächlichen Grundgebühr erstattet. Der Gesamtbetrag wird berechnet als maximale Grundgebühr (in GWEI) * Gaslimit."
-  },
   "advancedDetailsDataDesc": {
     "message": "Daten"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Erweiterte Netzwerkgebühr"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Speichern Sie diese Werte als Standard für das $1-Netzwerk.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Erweiterte Netzwerkgebühr"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "Erweiterte Genehmigungen"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Prioritätsgebühr (alias „Miner Tip“) geht direkt an Miner und veranlasst sie, Ihre Transaktion zu priorisieren."
-  },
   "airDropPatternDescription": {
     "message": "Der On-Chain-Verlauf des Tokens zeigt frühere Fälle von verdächtigen Airdrop-Aktivitäten."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Stornieren"
   },
-  "cancelPopoverTitle": {
-    "message": "Transaktion stornieren"
-  },
   "cancelTransactionDescription": {
     "message": "Diese Transaktion wird storniert und diese Netzwerkgebühr ersetzt die ursprüngliche Gebühr."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Frage $1 von 2"
   },
-  "currentTitle": {
-    "message": "Aktuell:"
-  },
   "currentlyUnavailable": {
     "message": "Nicht verfügbar in diesem Netzwerk"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Website vorgeschlagen"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Seite (hoch)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Seite"
-  },
   "dappSwapAdvantage": {
     "message": "Sparen und verdienen Sie mit MetaMask-Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Nicht mehr anzeigen"
   },
-  "downArrow": {
-    "message": "Abwärtspfeil"
-  },
   "download": {
     "message": "Herunterladen"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Gas-Limit muss mindestens $1 betragen"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Gas-Limit muss größer als $1 und kleiner als $2 sein",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Gas-Limit ist die maximale Gas-Einheit die Sie zu verwenden bereit sind. Gas-Einheiten sind ein Multiplikator der „Max. Prioritätsgebühr“ und der „Max. Gebühr“."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Die maximale Grundgebühr darf nicht niedriger sein als die Prioritätsgebühr."
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Die maximale Grundgebühr ist höher als erforderlich."
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Die maximale Grundgebühr ist für aktuelle Netzwerkkonditionen niedrig."
-  },
   "editGasMaxFeeHigh": {
     "message": "Die maximale Grundgebühr ist höher als erforderlich."
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Die maximale Prioritätsgebühr muss größer als 0 GWEI sein."
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Die Prioritätsgebühr muss größer als 0 sein."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Die maximale Prioritätsgebühr ist höher als nötig. Sie können mehr zahlen als nötig."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Die maximale Prioritätsgebühr ist höher als nötig. Sie können mehr zahlen als nötig."
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Die maximale Prioritätsgebühr ist niedrig für aktuelle Netzwerkkonditionen."
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Die Prioritätsgebühr ist niedrig für aktuelle Netzwerkkonditionen."
-  },
   "editGasPriceTooLow": {
     "message": "Gas-Preis muss größer als 0 sein"
   },
-  "editGasPriceTooltip": {
-    "message": "Dieses Netzwerk erfordert ein „Gas-Preis“-Feld beim Absenden einer Transaktion. Der Gas-Preis ist der Betrag, den Sie pro Gas-Einheit bezahlen."
-  },
-  "editGasTitle": {
-    "message": "Priorität bearbeiten"
-  },
   "editGasTooLow": {
     "message": "Unbekannte Bearbeitungszeit"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Vorgeschlagene Gas-Gebühr bearbeiten"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Diese Gas-Gebühr wurde von $1 vorgeschlagen. Dies kann ein Problem mit Ihrer Transaktion verursachen. Bei Fragen wenden Sie sich bitte an $1.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Gas-Limit"
   },
-  "gasLimitRecommended": {
-    "message": "Das empfohlene Gas-Limit liegt bei $1. Wenn Ihr Gas-Limit unter diesem liegt, könnte die Transaktion fehlschlagen."
-  },
   "gasLimitTooLow": {
     "message": "Gas-Limit muss mindestens 21.000 betragen"
   },
-  "gasLimitV2": {
-    "message": "Gas-Limit"
-  },
   "gasPrice": {
     "message": "Gas-Preis"
   },
@@ -3763,9 +3694,6 @@
     "message": "Das Gerät wurde nicht verbunden. Wenn Sie Ihren Ledger verbinden möchten, klicken Sie bitte erneut auf „Weiter“ und genehmigen Sie die HID-Verbindung",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "Richtungspfeil"
-  },
   "lightTheme": {
     "message": "Leicht"
   },
@@ -5413,9 +5341,6 @@
     "message": "verfügbar",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Verfügbares Guthaben"
-  },
   "perpsAvailableToClose": {
     "message": "Zum Schließen verfügbar"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Märkte"
   },
-  "perpsMax": {
-    "message": "Max."
-  },
-  "perpsMaxRemovable": {
-    "message": "Maximal entfernbar"
-  },
   "perpsMid": {
     "message": "Mittelkurs"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Position"
   },
-  "perpsPositionSize": {
-    "message": "Positionsgröße"
-  },
   "perpsPositions": {
     "message": "Positionen"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Diese Stornierung beschleunigen"
   },
-  "speedUpExplanation": {
-    "message": "Wir haben die Gas-Gebühr auf der Grundlage der aktuellen Netzbedingungen aktualisiert und um mindestens 10 % erhöht (erforderlich durch das Netzwerk)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Transaktion beschleunigen"
-  },
-  "speedUpTooltipText": {
-    "message": "Neue Gas-Gebühr"
-  },
   "speedUpTransactionDescription": {
     "message": "Diese Netzwerkgebühr ersetzt die ursprüngliche Gebühr."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Liquiditätsquelle"
   },
-  "swapSuggested": {
-    "message": "Swap vorgeschlagen"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Swaps sind komplexe und zeitkritische Transaktionen. Wir empfehlen diese Gas-Gebühr für ein gutes Gleichgewicht zwischen Kosten und Vertrauen in einen erfolgreichen Swap."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Tokens in der Sammlung"
   },
-  "tooltipSatusConnected": {
-    "message": "verbunden"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Verbinden"
   },
-  "tooltipSatusNotConnected": {
-    "message": "nicht verbunden"
-  },
   "total": {
     "message": "Gesamt"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12 Std:"
-  },
   "txAlertTitle": {
     "message": "Diese Transaktion wird rückgängig gemacht"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Unbeständiger Token-Preis"
   },
-  "upArrow": {
-    "message": "Pfeil nach oben"
-  },
   "update": {
     "message": "Update"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 13a0205ab7a6..5687d4bf9292 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Για προχωρημένους"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Όταν η συναλλαγή σας συμπεριληφθεί στο μπλοκ, οποιαδήποτε διαφορά μεταξύ της μέγιστης βασικής χρέωσής σας και της πραγματικής βασικής χρέωσής θα επιστραφεί. Το συνολικό ποσό υπολογίζεται ως μέγιστο βασικό τέλος (σε GWEI) * όριο τελών συναλλαγής."
-  },
   "advancedDetailsDataDesc": {
     "message": "Δεδομένα"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Τέλη δικτύου για προχωρημένους"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Αποθηκεύστε αυτές τις τιμές ως προεπιλεγμένες για το δίκτυο $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Τέλη δικτύου για προχωρημένους"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "προηγμένες άδειες"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Το τέλος προτεραιότητας (γνωστό και ως “miner tip”) πηγαίνει άμεσα στους miner και τους ενθαρρύνει να δώσουν προτεραιότητα στη συναλλαγή σας."
-  },
   "airDropPatternDescription": {
     "message": "Το ιστορικό του token στην αλυσίδα αποκαλύπτει προηγούμενες ύποπτες τακτικές airdrop."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Άκυρο"
   },
-  "cancelPopoverTitle": {
-    "message": "Ακύρωση συναλλαγής"
-  },
   "cancelTransactionDescription": {
     "message": "Αυτή η συναλλαγή θα ακυρωθεί και αυτά τα τέλη δικτύου θα αντικαταστήσουν τα αρχικά."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Ερώτηση $1 από 2"
   },
-  "currentTitle": {
-    "message": "Τρέχουσα:"
-  },
   "currentlyUnavailable": {
     "message": "Μη διαθέσιμο σε αυτό το δίκτυο"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Υπόδειξη ιστότοπου"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Ιστότοπος (υψηλό)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Ιστότοπος"
-  },
   "dappSwapAdvantage": {
     "message": "Εξοικονομήστε και κερδίστε με το MetaMask Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Να μην εμφανιστεί ξανά"
   },
-  "downArrow": {
-    "message": "κάτω βέλος"
-  },
   "download": {
     "message": "Λήψη"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Το όριο τέλους συναλλαγής πρέπει να είναι τουλάχιστον $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Το όριο τελών συναλλαγής πρέπει να είναι μεγαλύτερο από $1 και μικρότερο από $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Το όριο τελών συναλλαγής είναι οι μέγιστες μονάδες τελών συναλλαγής που είστε διατεθειμένοι να χρησιμοποιήσετε. Οι μονάδες των τελών συναλλαγής είναι ένας πολλαπλασιαστής στο \"Μέγιστο τέλος προτεραιότητας\" και το \"Μέγιστο τέλος\"."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Η μέγιστη βασική χρέωση δεν μπορεί να είναι χαμηλότερη από το τέλος προτεραιότητας"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Η μέγιστη βασική χρέωση είναι υψηλότερη από ό,τι χρειάζεται"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Η μέγιστη βασική χρέωση τελών είναι χαμηλή για τις τρέχουσες συνθήκες του δικτύου"
-  },
   "editGasMaxFeeHigh": {
     "message": "Η μέγιστη χρέωση είναι υψηλότερη από ό,τι χρειάζεται"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Το μέγιστο τέλος προτεραιότητας πρέπει να είναι μεγαλύτερο από 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Το τέλος προτεραιότητας πρέπει να είναι μεγαλύτερο από 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Το μέγιστο τέλος προτεραιότητας είναι υψηλότερο από ό,τι χρειάζεται. Μπορείτε να πληρώσετε περισσότερα από ό,τι χρειάζεται."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Το τέλος προτεραιότητας είναι υψηλότερο από ό,τι χρειάζεται. Μπορείτε να πληρώσετε περισσότερα από ό,τι χρειάζεται"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Το μέγιστο τέλος προτεραιότητας είναι χαμηλό για τις τρέχουσες συνθήκες του δικτύου"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Το τέλος προτεραιότητας είναι χαμηλό για τις τρέχουσες συνθήκες του δικτύου"
-  },
   "editGasPriceTooLow": {
     "message": "Η τιμή τέλους συναλλαγής πρέπει να είναι μεγαλύτερη από 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Αυτό το δίκτυο απαιτεί ένα πεδίο \"Τέλος συναλλαγής\" κατά την υποβολή μιας συναλλαγής. Η τιμή τέλους συναλλαγής είναι το ποσό που θα πληρώσετε ανά μονάδα τέλους συναλλαγής."
-  },
-  "editGasTitle": {
-    "message": "Επεξεργασία προτεραιότητας"
-  },
   "editGasTooLow": {
     "message": "Άγνωστος χρόνος επεξεργασίας"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Τέλος συναλλαγής"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Επεξεργασία προτεινόμενου τέλους συναλλαγής"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Αυτό το τέλος συναλλαγής έχει προταθεί από το $1. Εάν το παραβλέψετε ίσως προκληθεί πρόβλημα με την συναλλαγή σας. Παρακαλούμε απευθυνθείτε στο $1 εάν έχετε ερωτήσεις.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Όριο τέλους συναλλαγής"
   },
-  "gasLimitRecommended": {
-    "message": "Το συνιστώμενο όριο τέλους συναλλαγής είναι $1. Εάν το όριο τέλους συναλλαγής είναι μικρότερο από αυτό, η συναλλαγή ενδέχεται να αποτύχει."
-  },
   "gasLimitTooLow": {
     "message": "Το όριο τέλους συναλλαγής πρέπει να είναι τουλάχιστον 21000"
   },
-  "gasLimitV2": {
-    "message": "Όριο τέλους συναλλαγής"
-  },
   "gasPrice": {
     "message": "Τέλη συναλλαγών"
   },
@@ -3763,9 +3694,6 @@
     "message": "Η συσκευή Ledger δεν συνδέθηκε. Εάν επιθυμείτε να συνδέσετε το Ledger σας, κάντε ξανά κλικ στο 'Συνέχεια' και εγκρίνετε τη σύνδεση HID.",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "βέλος επιπέδου"
-  },
   "lightTheme": {
     "message": "Ανοιχτόχρωμο"
   },
@@ -5413,9 +5341,6 @@
     "message": "διαθέσιμο",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Διαθέσιμο υπόλοιπο"
-  },
   "perpsAvailableToClose": {
     "message": "Διαθέσιμο ποσό για κλείσιμο"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Αγορές"
   },
-  "perpsMax": {
-    "message": "Μεγ"
-  },
-  "perpsMaxRemovable": {
-    "message": "Μέγιστο που μπορεί να αφαιρεθεί"
-  },
   "perpsMid": {
     "message": "Ενδιάμεσα"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Θέση"
   },
-  "perpsPositionSize": {
-    "message": "Μέγεθος θέσης"
-  },
   "perpsPositions": {
     "message": "Θέσεις"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Επιτάχυνση αυτής της ακύρωσης"
   },
-  "speedUpExplanation": {
-    "message": "Ενημερώσαμε το τέλος συναλλαγής με βάση τις τρέχουσες συνθήκες του δικτύου και το αυξήσαμε κατά τουλάχιστον 10% (απαιτείται από το δίκτυο)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Επιτάχυνση συναλλαγής"
-  },
-  "speedUpTooltipText": {
-    "message": "Νέο τέλος συναλλαγής"
-  },
   "speedUpTransactionDescription": {
     "message": "Αυτά τα τέλη δικτύου θα αντικαταστήσουν τα αρχικά."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Πηγή ρευστότητας"
   },
-  "swapSuggested": {
-    "message": "Προτεινόμενη ανταλλαγή"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Οι ανταλλαγές είναι πολύπλοκες και με επείγοντα χαρακτήρα συναλλαγές. Συνιστούμε αυτό το τέλος συναλλαγής για μια καλή ισορροπία μεταξύ κόστους και εμπιστοσύνης σε μια επιτυχημένη Ανταλλαγή."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Token στη συλλογή"
   },
-  "tooltipSatusConnected": {
-    "message": "συνδεδεμένο"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Συνδεδεμένο"
   },
-  "tooltipSatusNotConnected": {
-    "message": "μη συνδεδεμένο"
-  },
   "total": {
     "message": "Σύνολο"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Εκμάθηση"
   },
-  "twelveHrTitle": {
-    "message": "12ώρες:"
-  },
   "txAlertTitle": {
     "message": "Αυτή η συναλλαγή θα ακυρωθεί"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Ασταθής τιμή token"
   },
-  "upArrow": {
-    "message": "πάνω βέλος"
-  },
   "update": {
     "message": "Ενημέρωση"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index d39df60c9227..73ad24b772b8 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -69,6 +69,9 @@
   "about": {
     "message": "About"
   },
+  "aboutMetaMask": {
+    "message": "About MetaMask"
+  },
   "accept": {
     "message": "Accept"
   },
@@ -398,9 +401,6 @@
   "advanced": {
     "message": "Advanced"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "When your transaction gets included in the block, any difference between your max base fee and the actual base fee will be refunded. Total amount is calculated as max base fee (in GWEI) * gas limit."
-  },
   "advancedDetailsDataDesc": {
     "message": "Data"
   },
@@ -416,10 +416,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Advanced network fee"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Save these values as my default for the $1 network.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Advanced network fee"
   },
@@ -432,9 +428,6 @@
   "advancedPermissionsSmallCase": {
     "message": "advanced permissions"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Priority fee (aka “miner tip”) goes directly to miners and incentivizes them to prioritize your transaction."
-  },
   "airDropPatternDescription": {
     "message": "The token's on-chain history reveals prior instances of suspicious airdrop activities."
   },
@@ -1354,9 +1347,6 @@
   "cancel": {
     "message": "Cancel"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancel transaction"
-  },
   "cancelTransactionDescription": {
     "message": "This transaction will be canceled and this network fee will replace the original."
   },
@@ -1433,7 +1423,7 @@
     "message": "Clear activity tab data"
   },
   "clearActivityDescription": {
-    "message": "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."
+    "message": "Resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."
   },
   "clearFilters": {
     "message": "Clear filters"
@@ -2008,9 +1998,6 @@
   "currentQuestion": {
     "message": "Question $1 of 2"
   },
-  "currentTitle": {
-    "message": "Current:"
-  },
   "currentlyUnavailable": {
     "message": "Unavailable on this network"
   },
@@ -2054,6 +2041,12 @@
   "dappConnections": {
     "message": "Dapp Connections"
   },
+  "dappScanMaliciousTitle": {
+    "message": "Malicious website detected"
+  },
+  "dappScanMaliciousWarning": {
+    "message": "This website is flagged as potentially dangerous. If you reveal your Secret Recovery Phrase, you could put your funds at risk."
+  },
   "dappSuggested": {
     "message": "Site suggested"
   },
@@ -2064,12 +2057,6 @@
   "dappSuggestedHigh": {
     "message": "Site suggested"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (high)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "Save and earn with MetaMask Swaps"
   },
@@ -2121,6 +2108,9 @@
   "debitCreditPurchaseOptions": {
     "message": "Debit or credit card purchase options"
   },
+  "debug": {
+    "message": "Debug"
+  },
   "decimal": {
     "message": "Token decimal"
   },
@@ -2279,6 +2269,9 @@
   "delete": {
     "message": "Delete"
   },
+  "deleteActivityAndNonceData": {
+    "message": "Delete activity and nonce data"
+  },
   "deleteMetaMetricsData": {
     "message": "Delete MetaMetrics data"
   },
@@ -2360,6 +2353,9 @@
   "developerOptions": {
     "message": "Developer options"
   },
+  "developerTools": {
+    "message": "Developer tools"
+  },
   "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"
@@ -2440,9 +2436,6 @@
   "dontShowThisAgain": {
     "message": "Don't show this again"
   },
-  "downArrow": {
-    "message": "down arrow"
-  },
   "download": {
     "message": "Download"
   },
@@ -2535,22 +2528,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Gas limit must be at least $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Gas limit must be greater than $1 and less than $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Gas limit is the maximum units of gas you are willing to use. Units of gas are a multiplier to “Max priority fee” and “Max fee”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Max base fee cannot be lower than priority fee"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Max base fee is higher than necessary"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Max base fee is low for current network conditions"
-  },
   "editGasMaxFeeHigh": {
     "message": "Max fee is higher than necessary"
   },
@@ -2563,30 +2540,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Max priority fee must be greater than 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Priority fee must be greater than 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Max priority fee is higher than necessary. You may pay more than needed."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Priority fee is higher than necessary. You may pay more than needed"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Max priority fee is low for current network conditions"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Priority fee is low for current network conditions"
-  },
   "editGasPriceTooLow": {
     "message": "Gas price must be greater than 0"
   },
-  "editGasPriceTooltip": {
-    "message": "This network requires a “Gas price” field when submitting a transaction. Gas price is the amount you will pay pay per unit of gas."
-  },
-  "editGasTitle": {
-    "message": "Edit priority"
-  },
   "editGasTooLow": {
     "message": "Unknown processing time"
   },
@@ -2999,25 +2961,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Edit suggested gas fee"
-  },
-  "gasDisplayDappWarning": {
-    "message": "This gas fee has been suggested by $1. Overriding this may cause a problem with your transaction. Please reach out to $1 if you have questions.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Gas limit"
   },
-  "gasLimitRecommended": {
-    "message": "Recommended gas limit is $1. If the gas limit is less than that, it may fail."
-  },
   "gasLimitTooLow": {
     "message": "Gas limit must be at least 21000"
   },
-  "gasLimitV2": {
-    "message": "Gas limit"
-  },
   "gasPrice": {
     "message": "Gas price"
   },
@@ -3234,6 +3183,10 @@
     "message": "(legacy)",
     "description": "Text representing the MEW path"
   },
+  "hardwareWalletLookingForDevice": {
+    "message": "Looking for your $1...",
+    "description": "$1 is the hardware wallet type"
+  },
   "hardwareWalletSubmissionWarningStep1": {
     "message": "Be sure your $1 is plugged in and to select the Ethereum app."
   },
@@ -3778,9 +3731,6 @@
     "message": "The ledger device was not connected. If you wish to connect your Ledger, please click 'Continue' again and approve HID connection",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "level arrow"
-  },
   "lightTheme": {
     "message": "Light"
   },
@@ -4077,6 +4027,9 @@
     "message": "+ $1 more accounts",
     "description": "$1 is the number of accounts"
   },
+  "moreCapital": {
+    "message": "More"
+  },
   "moreNetworks": {
     "message": "+ $1 more networks",
     "description": "$1 is the number of networks"
@@ -4215,6 +4168,10 @@
     "message": "Convert and get $1%",
     "description": "$1 is the bonus percentage (e.g., 3)"
   },
+  "musdEarnBonusPercentage": {
+    "message": "Earn a $1% bonus",
+    "description": "$1 is the bonus percentage (e.g., 3). Subtitle on the home token list mUSD Buy/Get CTA."
+  },
   "musdEducationGetStarted": {
     "message": "Get started"
   },
@@ -4232,6 +4189,10 @@
   "musdGetMusd": {
     "message": "Get mUSD"
   },
+  "musdMetaMaskUsd": {
+    "message": "MetaMask USD",
+    "description": "Product name shown as the title line on the home token list mUSD Buy/Get CTA"
+  },
   "musdTermsApply": {
     "message": "Terms apply."
   },
@@ -5455,11 +5416,17 @@
     "description": "is the available balance amount"
   },
   "perpsAvailableBalance": {
-    "message": "Available balance"
+    "message": "Available Perps balance: "
+  },
+  "perpsAvailableToAdd": {
+    "message": "Available to add"
   },
   "perpsAvailableToClose": {
     "message": "Available to close"
   },
+  "perpsAvailableToSubtract": {
+    "message": "Available to subtract"
+  },
   "perpsAvailableToTrade": {
     "message": "Available to trade",
     "description": "Label for the available balance that can be used for trading"
@@ -5476,6 +5443,9 @@
   "perpsCloseLong": {
     "message": "Close Long"
   },
+  "perpsClosePartialMinNotional": {
+    "message": "Partial closes must be at least $1 in USD value. Increase the close amount or set the slider to 100%."
+  },
   "perpsClosePosition": {
     "message": "Close position"
   },
@@ -5527,6 +5497,14 @@
   "perpsEstSize": {
     "message": "Est. size"
   },
+  "perpsEstimatedPnlAtStopLoss": {
+    "message": "Est. P&L at stop loss",
+    "description": "Label for estimated profit or loss when stop loss is hit"
+  },
+  "perpsEstimatedPnlAtTakeProfit": {
+    "message": "Est. P&L at take profit",
+    "description": "Label for estimated profit or loss when take profit is hit"
+  },
   "perpsExploreMarkets": {
     "message": "Explore markets"
   },
@@ -5590,8 +5568,17 @@
   "perpsLimitPrice": {
     "message": "Limit Price"
   },
+  "perpsLimitPriceAboveCurrentPrice": {
+    "message": "Limit price is above current price"
+  },
+  "perpsLimitPriceBelowCurrentPrice": {
+    "message": "Limit price is below current price"
+  },
+  "perpsLimitPriceNearLiquidation": {
+    "message": "Current price is near the estimated liquidation price"
+  },
   "perpsLiquidationDistance": {
-    "message": "Liq. distance"
+    "message": "Liquidation distance"
   },
   "perpsLiquidationPrice": {
     "message": "Liquidation price"
@@ -5618,12 +5605,6 @@
   "perpsMarkets": {
     "message": "Markets"
   },
-  "perpsMax": {
-    "message": "Max"
-  },
-  "perpsMaxRemovable": {
-    "message": "Max removable"
-  },
   "perpsMid": {
     "message": "Mid"
   },
@@ -5668,6 +5649,10 @@
   "perpsOraclePriceTooltip": {
     "message": "The median of external prices reported by validators, used for computing funding rate"
   },
+  "perpsOrderValidationInsufficientBalance": {
+    "message": "Insufficient balance: need $1, have $2",
+    "description": "$1 is the required margin amount and $2 is the available balance amount"
+  },
   "perpsOrders": {
     "message": "Orders"
   },
@@ -5677,9 +5662,6 @@
   "perpsPosition": {
     "message": "Position"
   },
-  "perpsPositionSize": {
-    "message": "Position Size"
-  },
   "perpsPositions": {
     "message": "Positions"
   },
@@ -5867,6 +5849,51 @@
   "perpsWithdraw": {
     "message": "Withdraw"
   },
+  "perpsWithdrawEstimatedTime": {
+    "message": "Estimated time"
+  },
+  "perpsWithdrawFailed": {
+    "message": "Withdrawal could not be completed. Try again."
+  },
+  "perpsWithdrawFee": {
+    "message": "Provider Fee"
+  },
+  "perpsWithdrawInsufficient": {
+    "message": "Amount exceeds your available Perps balance."
+  },
+  "perpsWithdrawInvalidAmount": {
+    "message": "Enter a valid amount."
+  },
+  "perpsWithdrawMinNotice": {
+    "message": "Minimum withdrawal: $1 USDC",
+    "description": "$1 is the minimum amount (e.g. 1.01)"
+  },
+  "perpsWithdrawMinutesApprox": {
+    "message": "~$1 min",
+    "description": "$1 is the estimated number of minutes"
+  },
+  "perpsWithdrawNoAccount": {
+    "message": "No account selected. Select an account and try again."
+  },
+  "perpsWithdrawReceive": {
+    "message": "Receive"
+  },
+  "perpsWithdrawRoutesError": {
+    "message": "Could not load withdrawal limits. Try again later."
+  },
+  "perpsWithdrawToastErrorTitle": {
+    "message": "Withdrawal failed"
+  },
+  "perpsWithdrawToastSuccessDescription": {
+    "message": "We are processing $1. Funds typically arrive within a few minutes.",
+    "description": "$1 is the formatted withdrawal amount"
+  },
+  "perpsWithdrawToastSuccessTitle": {
+    "message": "Withdrawal submitted"
+  },
+  "perpsYouReceive": {
+    "message": "You receive"
+  },
   "perpsYouWillReceive": {
     "message": "You'll receive"
   },
@@ -6671,7 +6698,7 @@
     "message": "Security and password"
   },
   "securityAndPrivacy": {
-    "message": "Security & privacy"
+    "message": "Security and privacy"
   },
   "securityChangePassword": {
     "message": "Change password"
@@ -7970,15 +7997,6 @@
   "speedUpCancellation": {
     "message": "Speed up this cancellation"
   },
-  "speedUpExplanation": {
-    "message": "We’ve updated the gas fee based on current network conditions and have increased it by at least 10% (required by the network)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Speed up transaction"
-  },
-  "speedUpTooltipText": {
-    "message": "New gas fee"
-  },
   "speedUpTransactionDescription": {
     "message": "This network fee will replace the original."
   },
@@ -8587,9 +8605,6 @@
   "swapSource": {
     "message": "Liquidity source"
   },
-  "swapSuggested": {
-    "message": "Swap suggested"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Swaps are complex and time sensitive transactions. We recommend this gas fee for a good balance between cost and confidence of a successful Swap."
   },
@@ -8818,15 +8833,9 @@
   "tokensInCollection": {
     "message": "Tokens in collection"
   },
-  "tooltipSatusConnected": {
-    "message": "connected"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Connected"
   },
-  "tooltipSatusNotConnected": {
-    "message": "not connected"
-  },
   "total": {
     "message": "Total"
   },
@@ -8836,6 +8845,9 @@
   "transaction": {
     "message": "transaction"
   },
+  "transactionConfirmed": {
+    "message": "Transaction confirmed"
+  },
   "transactionDataFunction": {
     "message": "Function"
   },
@@ -8848,6 +8860,9 @@
   "transactionErrorNoContract": {
     "message": "Trying to call a function on a non-contract address."
   },
+  "transactionFailed": {
+    "message": "Transaction failed"
+  },
   "transactionFee": {
     "message": "Transaction fee"
   },
@@ -8888,6 +8903,9 @@
   "transactionShield": {
     "message": "Transaction Shield"
   },
+  "transactionSubmitted": {
+    "message": "Transaction submitted"
+  },
   "transactionTotalGasFee": {
     "message": "Total gas fee",
     "description": "Label for the total gas fee incurred in the transaction."
@@ -8895,6 +8913,9 @@
   "transactions": {
     "message": "Transactions"
   },
+  "transactionsAndAssets": {
+    "message": "Transactions and assets"
+  },
   "transfer": {
     "message": "Transfer"
   },
@@ -9015,9 +9036,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12hr:"
-  },
   "txAlertTitle": {
     "message": "This transaction will be reverted"
   },
@@ -9104,9 +9122,6 @@
   "unstableTokenPriceTitle": {
     "message": "Unstable token price"
   },
-  "upArrow": {
-    "message": "up arrow"
-  },
   "update": {
     "message": "Update"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index d39df60c9227..73ad24b772b8 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -69,6 +69,9 @@
   "about": {
     "message": "About"
   },
+  "aboutMetaMask": {
+    "message": "About MetaMask"
+  },
   "accept": {
     "message": "Accept"
   },
@@ -398,9 +401,6 @@
   "advanced": {
     "message": "Advanced"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "When your transaction gets included in the block, any difference between your max base fee and the actual base fee will be refunded. Total amount is calculated as max base fee (in GWEI) * gas limit."
-  },
   "advancedDetailsDataDesc": {
     "message": "Data"
   },
@@ -416,10 +416,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Advanced network fee"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Save these values as my default for the $1 network.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Advanced network fee"
   },
@@ -432,9 +428,6 @@
   "advancedPermissionsSmallCase": {
     "message": "advanced permissions"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Priority fee (aka “miner tip”) goes directly to miners and incentivizes them to prioritize your transaction."
-  },
   "airDropPatternDescription": {
     "message": "The token's on-chain history reveals prior instances of suspicious airdrop activities."
   },
@@ -1354,9 +1347,6 @@
   "cancel": {
     "message": "Cancel"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancel transaction"
-  },
   "cancelTransactionDescription": {
     "message": "This transaction will be canceled and this network fee will replace the original."
   },
@@ -1433,7 +1423,7 @@
     "message": "Clear activity tab data"
   },
   "clearActivityDescription": {
-    "message": "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."
+    "message": "Resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."
   },
   "clearFilters": {
     "message": "Clear filters"
@@ -2008,9 +1998,6 @@
   "currentQuestion": {
     "message": "Question $1 of 2"
   },
-  "currentTitle": {
-    "message": "Current:"
-  },
   "currentlyUnavailable": {
     "message": "Unavailable on this network"
   },
@@ -2054,6 +2041,12 @@
   "dappConnections": {
     "message": "Dapp Connections"
   },
+  "dappScanMaliciousTitle": {
+    "message": "Malicious website detected"
+  },
+  "dappScanMaliciousWarning": {
+    "message": "This website is flagged as potentially dangerous. If you reveal your Secret Recovery Phrase, you could put your funds at risk."
+  },
   "dappSuggested": {
     "message": "Site suggested"
   },
@@ -2064,12 +2057,6 @@
   "dappSuggestedHigh": {
     "message": "Site suggested"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (high)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "Save and earn with MetaMask Swaps"
   },
@@ -2121,6 +2108,9 @@
   "debitCreditPurchaseOptions": {
     "message": "Debit or credit card purchase options"
   },
+  "debug": {
+    "message": "Debug"
+  },
   "decimal": {
     "message": "Token decimal"
   },
@@ -2279,6 +2269,9 @@
   "delete": {
     "message": "Delete"
   },
+  "deleteActivityAndNonceData": {
+    "message": "Delete activity and nonce data"
+  },
   "deleteMetaMetricsData": {
     "message": "Delete MetaMetrics data"
   },
@@ -2360,6 +2353,9 @@
   "developerOptions": {
     "message": "Developer options"
   },
+  "developerTools": {
+    "message": "Developer tools"
+  },
   "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"
@@ -2440,9 +2436,6 @@
   "dontShowThisAgain": {
     "message": "Don't show this again"
   },
-  "downArrow": {
-    "message": "down arrow"
-  },
   "download": {
     "message": "Download"
   },
@@ -2535,22 +2528,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Gas limit must be at least $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Gas limit must be greater than $1 and less than $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Gas limit is the maximum units of gas you are willing to use. Units of gas are a multiplier to “Max priority fee” and “Max fee”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Max base fee cannot be lower than priority fee"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Max base fee is higher than necessary"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Max base fee is low for current network conditions"
-  },
   "editGasMaxFeeHigh": {
     "message": "Max fee is higher than necessary"
   },
@@ -2563,30 +2540,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Max priority fee must be greater than 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Priority fee must be greater than 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Max priority fee is higher than necessary. You may pay more than needed."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Priority fee is higher than necessary. You may pay more than needed"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Max priority fee is low for current network conditions"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Priority fee is low for current network conditions"
-  },
   "editGasPriceTooLow": {
     "message": "Gas price must be greater than 0"
   },
-  "editGasPriceTooltip": {
-    "message": "This network requires a “Gas price” field when submitting a transaction. Gas price is the amount you will pay pay per unit of gas."
-  },
-  "editGasTitle": {
-    "message": "Edit priority"
-  },
   "editGasTooLow": {
     "message": "Unknown processing time"
   },
@@ -2999,25 +2961,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Edit suggested gas fee"
-  },
-  "gasDisplayDappWarning": {
-    "message": "This gas fee has been suggested by $1. Overriding this may cause a problem with your transaction. Please reach out to $1 if you have questions.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Gas limit"
   },
-  "gasLimitRecommended": {
-    "message": "Recommended gas limit is $1. If the gas limit is less than that, it may fail."
-  },
   "gasLimitTooLow": {
     "message": "Gas limit must be at least 21000"
   },
-  "gasLimitV2": {
-    "message": "Gas limit"
-  },
   "gasPrice": {
     "message": "Gas price"
   },
@@ -3234,6 +3183,10 @@
     "message": "(legacy)",
     "description": "Text representing the MEW path"
   },
+  "hardwareWalletLookingForDevice": {
+    "message": "Looking for your $1...",
+    "description": "$1 is the hardware wallet type"
+  },
   "hardwareWalletSubmissionWarningStep1": {
     "message": "Be sure your $1 is plugged in and to select the Ethereum app."
   },
@@ -3778,9 +3731,6 @@
     "message": "The ledger device was not connected. If you wish to connect your Ledger, please click 'Continue' again and approve HID connection",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "level arrow"
-  },
   "lightTheme": {
     "message": "Light"
   },
@@ -4077,6 +4027,9 @@
     "message": "+ $1 more accounts",
     "description": "$1 is the number of accounts"
   },
+  "moreCapital": {
+    "message": "More"
+  },
   "moreNetworks": {
     "message": "+ $1 more networks",
     "description": "$1 is the number of networks"
@@ -4215,6 +4168,10 @@
     "message": "Convert and get $1%",
     "description": "$1 is the bonus percentage (e.g., 3)"
   },
+  "musdEarnBonusPercentage": {
+    "message": "Earn a $1% bonus",
+    "description": "$1 is the bonus percentage (e.g., 3). Subtitle on the home token list mUSD Buy/Get CTA."
+  },
   "musdEducationGetStarted": {
     "message": "Get started"
   },
@@ -4232,6 +4189,10 @@
   "musdGetMusd": {
     "message": "Get mUSD"
   },
+  "musdMetaMaskUsd": {
+    "message": "MetaMask USD",
+    "description": "Product name shown as the title line on the home token list mUSD Buy/Get CTA"
+  },
   "musdTermsApply": {
     "message": "Terms apply."
   },
@@ -5455,11 +5416,17 @@
     "description": "is the available balance amount"
   },
   "perpsAvailableBalance": {
-    "message": "Available balance"
+    "message": "Available Perps balance: "
+  },
+  "perpsAvailableToAdd": {
+    "message": "Available to add"
   },
   "perpsAvailableToClose": {
     "message": "Available to close"
   },
+  "perpsAvailableToSubtract": {
+    "message": "Available to subtract"
+  },
   "perpsAvailableToTrade": {
     "message": "Available to trade",
     "description": "Label for the available balance that can be used for trading"
@@ -5476,6 +5443,9 @@
   "perpsCloseLong": {
     "message": "Close Long"
   },
+  "perpsClosePartialMinNotional": {
+    "message": "Partial closes must be at least $1 in USD value. Increase the close amount or set the slider to 100%."
+  },
   "perpsClosePosition": {
     "message": "Close position"
   },
@@ -5527,6 +5497,14 @@
   "perpsEstSize": {
     "message": "Est. size"
   },
+  "perpsEstimatedPnlAtStopLoss": {
+    "message": "Est. P&L at stop loss",
+    "description": "Label for estimated profit or loss when stop loss is hit"
+  },
+  "perpsEstimatedPnlAtTakeProfit": {
+    "message": "Est. P&L at take profit",
+    "description": "Label for estimated profit or loss when take profit is hit"
+  },
   "perpsExploreMarkets": {
     "message": "Explore markets"
   },
@@ -5590,8 +5568,17 @@
   "perpsLimitPrice": {
     "message": "Limit Price"
   },
+  "perpsLimitPriceAboveCurrentPrice": {
+    "message": "Limit price is above current price"
+  },
+  "perpsLimitPriceBelowCurrentPrice": {
+    "message": "Limit price is below current price"
+  },
+  "perpsLimitPriceNearLiquidation": {
+    "message": "Current price is near the estimated liquidation price"
+  },
   "perpsLiquidationDistance": {
-    "message": "Liq. distance"
+    "message": "Liquidation distance"
   },
   "perpsLiquidationPrice": {
     "message": "Liquidation price"
@@ -5618,12 +5605,6 @@
   "perpsMarkets": {
     "message": "Markets"
   },
-  "perpsMax": {
-    "message": "Max"
-  },
-  "perpsMaxRemovable": {
-    "message": "Max removable"
-  },
   "perpsMid": {
     "message": "Mid"
   },
@@ -5668,6 +5649,10 @@
   "perpsOraclePriceTooltip": {
     "message": "The median of external prices reported by validators, used for computing funding rate"
   },
+  "perpsOrderValidationInsufficientBalance": {
+    "message": "Insufficient balance: need $1, have $2",
+    "description": "$1 is the required margin amount and $2 is the available balance amount"
+  },
   "perpsOrders": {
     "message": "Orders"
   },
@@ -5677,9 +5662,6 @@
   "perpsPosition": {
     "message": "Position"
   },
-  "perpsPositionSize": {
-    "message": "Position Size"
-  },
   "perpsPositions": {
     "message": "Positions"
   },
@@ -5867,6 +5849,51 @@
   "perpsWithdraw": {
     "message": "Withdraw"
   },
+  "perpsWithdrawEstimatedTime": {
+    "message": "Estimated time"
+  },
+  "perpsWithdrawFailed": {
+    "message": "Withdrawal could not be completed. Try again."
+  },
+  "perpsWithdrawFee": {
+    "message": "Provider Fee"
+  },
+  "perpsWithdrawInsufficient": {
+    "message": "Amount exceeds your available Perps balance."
+  },
+  "perpsWithdrawInvalidAmount": {
+    "message": "Enter a valid amount."
+  },
+  "perpsWithdrawMinNotice": {
+    "message": "Minimum withdrawal: $1 USDC",
+    "description": "$1 is the minimum amount (e.g. 1.01)"
+  },
+  "perpsWithdrawMinutesApprox": {
+    "message": "~$1 min",
+    "description": "$1 is the estimated number of minutes"
+  },
+  "perpsWithdrawNoAccount": {
+    "message": "No account selected. Select an account and try again."
+  },
+  "perpsWithdrawReceive": {
+    "message": "Receive"
+  },
+  "perpsWithdrawRoutesError": {
+    "message": "Could not load withdrawal limits. Try again later."
+  },
+  "perpsWithdrawToastErrorTitle": {
+    "message": "Withdrawal failed"
+  },
+  "perpsWithdrawToastSuccessDescription": {
+    "message": "We are processing $1. Funds typically arrive within a few minutes.",
+    "description": "$1 is the formatted withdrawal amount"
+  },
+  "perpsWithdrawToastSuccessTitle": {
+    "message": "Withdrawal submitted"
+  },
+  "perpsYouReceive": {
+    "message": "You receive"
+  },
   "perpsYouWillReceive": {
     "message": "You'll receive"
   },
@@ -6671,7 +6698,7 @@
     "message": "Security and password"
   },
   "securityAndPrivacy": {
-    "message": "Security & privacy"
+    "message": "Security and privacy"
   },
   "securityChangePassword": {
     "message": "Change password"
@@ -7970,15 +7997,6 @@
   "speedUpCancellation": {
     "message": "Speed up this cancellation"
   },
-  "speedUpExplanation": {
-    "message": "We’ve updated the gas fee based on current network conditions and have increased it by at least 10% (required by the network)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Speed up transaction"
-  },
-  "speedUpTooltipText": {
-    "message": "New gas fee"
-  },
   "speedUpTransactionDescription": {
     "message": "This network fee will replace the original."
   },
@@ -8587,9 +8605,6 @@
   "swapSource": {
     "message": "Liquidity source"
   },
-  "swapSuggested": {
-    "message": "Swap suggested"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Swaps are complex and time sensitive transactions. We recommend this gas fee for a good balance between cost and confidence of a successful Swap."
   },
@@ -8818,15 +8833,9 @@
   "tokensInCollection": {
     "message": "Tokens in collection"
   },
-  "tooltipSatusConnected": {
-    "message": "connected"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Connected"
   },
-  "tooltipSatusNotConnected": {
-    "message": "not connected"
-  },
   "total": {
     "message": "Total"
   },
@@ -8836,6 +8845,9 @@
   "transaction": {
     "message": "transaction"
   },
+  "transactionConfirmed": {
+    "message": "Transaction confirmed"
+  },
   "transactionDataFunction": {
     "message": "Function"
   },
@@ -8848,6 +8860,9 @@
   "transactionErrorNoContract": {
     "message": "Trying to call a function on a non-contract address."
   },
+  "transactionFailed": {
+    "message": "Transaction failed"
+  },
   "transactionFee": {
     "message": "Transaction fee"
   },
@@ -8888,6 +8903,9 @@
   "transactionShield": {
     "message": "Transaction Shield"
   },
+  "transactionSubmitted": {
+    "message": "Transaction submitted"
+  },
   "transactionTotalGasFee": {
     "message": "Total gas fee",
     "description": "Label for the total gas fee incurred in the transaction."
@@ -8895,6 +8913,9 @@
   "transactions": {
     "message": "Transactions"
   },
+  "transactionsAndAssets": {
+    "message": "Transactions and assets"
+  },
   "transfer": {
     "message": "Transfer"
   },
@@ -9015,9 +9036,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12hr:"
-  },
   "txAlertTitle": {
     "message": "This transaction will be reverted"
   },
@@ -9104,9 +9122,6 @@
   "unstableTokenPriceTitle": {
     "message": "Unstable token price"
   },
-  "upArrow": {
-    "message": "up arrow"
-  },
   "update": {
     "message": "Update"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 46a8f785d144..889684cf4ae6 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Avanzado"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Cuando su transacción se incluya en el bloque, se reembolsará cualquier diferencia entre su tarifa base máxima y la tarifa base real. El importe total se calcula como tarifa base máxima (en GWEI) * límite de gas."
-  },
   "advancedDetailsDataDesc": {
     "message": "Datos"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Tarifa de red avanzada"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Guarde estos valores como mis valores por defecto para la red de $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Tarifa de red avanzada"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "permisos avanzados"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "La tarifa de prioridad (también llamada “propina del minero”) va directamente a los mineros para incentivarlos a priorizar su transacción."
-  },
   "airDropPatternDescription": {
     "message": "El historial en cadena del token revela instancias anteriores de actividades sospechosas de airdrop."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Cancelar"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancelar transacción"
-  },
   "cancelTransactionDescription": {
     "message": "Esta transacción se cancelará y esta tarifa de red sustituirá a la original."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Pregunta $1 de 2"
   },
-  "currentTitle": {
-    "message": "Actual:"
-  },
   "currentlyUnavailable": {
     "message": "No disponible en esta red"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Sitio sugerido"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Sitio (alto)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Sitio"
-  },
   "dappSwapAdvantage": {
     "message": "Ahorra y gana con MetaMask Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "No volver a mostrar"
   },
-  "downArrow": {
-    "message": "flecha hacia abajo"
-  },
   "download": {
     "message": "Descargar"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "El límite de gas debe ser al menos $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "El límite de gas debe ser superior a $1 e inferior a $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "El límite de gas es el máximo de unidades de gas que está dispuesto a utilizar. Las unidades de gas son un multiplicador de la \"Tarifa de prioridad máxima\" y de la \"Tarifa máxima\"."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "La tarifa base máxima no puede ser inferior a la tarifa de prioridad"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "La tarifa base máxima es más alta de lo necesario"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "La tarifa base máxima es baja para las condiciones actuales de la red"
-  },
   "editGasMaxFeeHigh": {
     "message": "La tarifa base máxima es más alta de lo necesario"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "La tarifa de prioridad máxima debe ser superior a 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "La tarifa de prioridad debe ser superior a 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "La tarifa de prioridad máxima es más alta de lo necesario. Es posible que pague más de lo necesario."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "La tarifa de prioridad es más alta de lo necesario. Es posible que pague más de lo necesario"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "La tarifa de prioridad máxima es baja para las condiciones actuales de la red"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "La tarifa de prioridad es baja para las condiciones actuales de la red"
-  },
   "editGasPriceTooLow": {
     "message": "El precio del gas debe ser superior a 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Esta red requiere un campo \"Precio del gas\" cuando se envía una transacción. El precio del gas es la cantidad que se pagará por unidad de gas."
-  },
-  "editGasTitle": {
-    "message": "Editar prioridad"
-  },
   "editGasTooLow": {
     "message": "Tiempo de procesamiento desconocido"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Editar tarifa de gas sugerida"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Esta tarifa de gas ha sido sugerida por $1. Anularla puede causar un problema con su transacción. Comuníquese con $1 si tiene preguntas.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Límite de gas"
   },
-  "gasLimitRecommended": {
-    "message": "El límite de gas recomendado es de $1. Si el límite de gas está por debajo de ese nivel, puede fallar."
-  },
   "gasLimitTooLow": {
     "message": "El límite de gas debe ser al menos 21 000"
   },
-  "gasLimitV2": {
-    "message": "Límite de gas"
-  },
   "gasPrice": {
     "message": "Precio del gas"
   },
@@ -3763,9 +3694,6 @@
     "message": "El dispositivo Ledger no se ha conectado. Si desea conectar su Ledger, haga clic de nuevo en 'Continuar' y apruebe la conexión HID",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "flecha de nivel"
-  },
   "lightTheme": {
     "message": "Claro"
   },
@@ -5413,9 +5341,6 @@
     "message": "disponible",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Saldo disponible"
-  },
   "perpsAvailableToClose": {
     "message": "Disponible para cerrar"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Mercados"
   },
-  "perpsMax": {
-    "message": "Máx."
-  },
-  "perpsMaxRemovable": {
-    "message": "Máx. eliminable"
-  },
   "perpsMid": {
     "message": "Medio"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Posición"
   },
-  "perpsPositionSize": {
-    "message": "Tamaño de la posición"
-  },
   "perpsPositions": {
     "message": "Posiciones"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Acelerar esta cancelación"
   },
-  "speedUpExplanation": {
-    "message": "Hemos actualizado la tarifa de gas en función de las condiciones actuales de la red y la hemos aumentado al menos un 10 % (exigido por la red)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Acelerar la transacción"
-  },
-  "speedUpTooltipText": {
-    "message": "Nueva tarifa de gas"
-  },
   "speedUpTransactionDescription": {
     "message": "Esta tarifa de red sustituirá a la original."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Fuente de liquidez"
   },
-  "swapSuggested": {
-    "message": "Intercambio sugerido"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Los intercambios son transacciones complejas y urgentes. Recomendamos esta tarifa de gas para lograr un buen equilibrio entre el costo y la garantía de un intercambio exitoso."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Tokens en la colección"
   },
-  "tooltipSatusConnected": {
-    "message": "conectado"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Conectado"
   },
-  "tooltipSatusNotConnected": {
-    "message": "no conectado"
-  },
   "total": {
     "message": "Total"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12 horas:"
-  },
   "txAlertTitle": {
     "message": "Esta transacción se revertirá"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Precio inestable del token"
   },
-  "upArrow": {
-    "message": "flecha ascendente"
-  },
   "update": {
     "message": "Actualizar"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 6516f129c48c..c1fec8f5bbac 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -118,15 +118,9 @@
   "advanced": {
     "message": "Avanzado"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Cuando su transacción se incluya en el bloque, se reembolsará cualquier diferencia entre su tarifa base máxima y la tarifa base real. El importe total se calcula como tarifa base máxima (en GWEI) * límite de gas."
-  },
   "advancedGasPriceTitle": {
     "message": "Precio del gas"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "La tarifa de prioridad (también llamada “propina del minero”) va directamente a los mineros para incentivarlos a priorizar su transacción."
-  },
   "alertDisableTooltip": {
     "message": "Esto se puede modificar en \"Configuración > Alertas\""
   },
@@ -249,9 +243,6 @@
   "cancel": {
     "message": "Cancelar"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancelar transacción"
-  },
   "cancelled": {
     "message": "Cancelado"
   },
@@ -400,9 +391,6 @@
   "currentLanguage": {
     "message": "Idioma actual"
   },
-  "currentTitle": {
-    "message": "Actual:"
-  },
   "currentlyUnavailable": {
     "message": "No disponible en esta red"
   },
@@ -419,9 +407,6 @@
     "message": "$1 ha sugerido este precio.",
     "description": "$1 is url for the dapp that has suggested gas settings"
   },
-  "dappSuggestedShortLabel": {
-    "message": "Sitio"
-  },
   "data": {
     "message": "Datos"
   },
@@ -524,22 +509,6 @@
   "editGasLimitOutOfBounds": {
     "message": "El límite de gas debe ser al menos $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "El límite de gas debe ser superior a $1 e inferior a $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "El límite de gas es el máximo de unidades de gas que está dispuesto a utilizar. Las unidades de gas son un multiplicador de la \"Tarifa de prioridad máxima\" y de la \"Tarifa máxima\"."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "La tarifa base máxima no puede ser inferior a la tarifa de prioridad"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "La tarifa base máxima es más alta de lo necesario"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "La tarifa base máxima es baja para las condiciones actuales de la red"
-  },
   "editGasMaxFeeHigh": {
     "message": "La tarifa base máxima es más alta de lo necesario"
   },
@@ -552,30 +521,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "La tarifa máxima de prioridad debe ser superior a 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "La tarifa de prioridad debe ser superior a 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "La tarifa máxima de prioridad es más alta de lo necesario. Es posible que pague más de lo necesario."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "La tarifa de prioridad es más alta de lo necesario. Es posible que pague más de lo necesario"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "La tarifa de prioridad máxima es baja para las condiciones actuales de la red"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "La tarifa de prioridad es baja para las condiciones actuales de la red"
-  },
   "editGasPriceTooLow": {
     "message": "El precio del gas debe ser superior a 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Esta red requiere un campo \"Precio del gas\" cuando se envía una transacción. El precio del gas es la cantidad que se pagará por unidad de gas."
-  },
-  "editGasTitle": {
-    "message": "Editar prioridad"
-  },
   "editGasTooLow": {
     "message": "Tiempo de procesamiento desconocido"
   },
@@ -698,22 +652,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Editar tarifa de gas sugerida"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Esta tarifa de gas ha sido sugerida por $1. Anularla puede causar un problema con su transacción. Comuníquese con $1 si tiene preguntas.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Límite de gas"
   },
   "gasLimitTooLow": {
     "message": "El límite de gas debe ser al menos 21 000"
   },
-  "gasLimitV2": {
-    "message": "Límite de gas"
-  },
   "gasPriceExcessive": {
     "message": "Su tarifa de gas es demasiado alta. Considere reducir el importe."
   },
@@ -1398,15 +1342,6 @@
   "speedUpCancellation": {
     "message": "Acelerar esta cancelación"
   },
-  "speedUpExplanation": {
-    "message": "Hemos actualizado la tarifa de gas en función de las condiciones actuales de la red y la hemos aumentado al menos un 10% (exigido por la red)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Acelerar la transacción"
-  },
-  "speedUpTooltipText": {
-    "message": "Nueva tarifa de gas"
-  },
   "stable": {
     "message": "Estable"
   },
@@ -1616,9 +1551,6 @@
   "swapSource": {
     "message": "Fuente de liquidez"
   },
-  "swapSuggested": {
-    "message": "Swap sugerido"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Los swaps son transacciones complejas y urgentes. Recomendamos esta tarifa de gas para lograr un buen equilibrio entre el costo y la garantía de un swap exitoso."
   },
@@ -1757,9 +1689,6 @@
   "turnOnTokenDetection": {
     "message": "Activar la detección mejorada de tokens"
   },
-  "twelveHrTitle": {
-    "message": "12 horas:"
-  },
   "u2f": {
     "message": "U2F",
     "description": "A name on an API for the browser to interact with devices that support the U2F protocol. On some browsers we use it to connect MetaMask to Ledger devices."
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 354fb31bacd4..256e181ab9ca 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Avancés"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Lorsque votre transaction est intégrée au bloc, toute différence entre vos frais de base maximaux et les frais de base réels vous sera remboursée. Le montant total est calculé comme suit : frais de base maximaux (en GWEI) × limite de carburant."
-  },
   "advancedDetailsDataDesc": {
     "message": "Données"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Frais de réseau avancés"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Enregistrer ces valeurs comme valeurs par défaut pour le réseau $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Frais de réseau avancés"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "autorisations avancées"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Les frais de priorité (aussi appelés « pourboire du mineur ») vont directement aux mineurs et les incitent à accorder la priorité à votre transaction."
-  },
   "airDropPatternDescription": {
     "message": "L’historique du jeton sur la chaîne révèle des cas antérieurs d’activités d’airdrop suspectes."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Annuler"
   },
-  "cancelPopoverTitle": {
-    "message": "Annuler la transaction"
-  },
   "cancelTransactionDescription": {
     "message": "Cette transaction sera annulée et ces frais de réseau remplaceront les frais initiaux."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Question $1 sur 2"
   },
-  "currentTitle": {
-    "message": "Actuel:"
-  },
   "currentlyUnavailable": {
     "message": "Indisponible sur ce réseau"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Suggéré par le site"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (élevé)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "Économisez et gagnez avec MetaMask Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Ne plus afficher ceci"
   },
-  "downArrow": {
-    "message": "flèche vers le bas"
-  },
   "download": {
     "message": "Télécharger"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "La limite de carburant doit être d’au moins $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "La limite de carburant doit être supérieure à $1 et inférieure à $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "La limite de carburant correspond au maximum d’unités de carburant que vous consentez à utiliser. Celles-ci servent de multiplicateur aux « Frais de priorité maximaux » et aux « Frais maximaux »."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Les frais de base maximaux ne peuvent pas être inférieurs aux frais de priorité"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Les frais de base maximaux sont plus élevés que nécessaire"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Les frais de base maximaux sont faibles par rapport aux conditions actuelles du réseau"
-  },
   "editGasMaxFeeHigh": {
     "message": "Les frais maximaux sont plus élevés que nécessaire"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Les frais de priorité maximaux doivent être supérieurs à 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Les frais de priorité doivent être supérieurs à 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Les frais de priorité maximaux sont plus élevés que nécessaire. Vous risquez de payer plus que prévu."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Les frais de priorité maximaux sont plus élevés que nécessaire. Vous risquez de payer plus que prévu"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Les frais de priorité maximaux sont faibles par rapport aux conditions actuelles du réseau"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Les frais de priorité sont faibles par rapport aux conditions actuelles du réseau"
-  },
   "editGasPriceTooLow": {
     "message": "Les frais de carburant doivent être supérieurs à 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Ce réseau exige un champ « Prix du carburant » lors de la soumission d’une transaction. Le prix du carburant correspond au montant que vous paierez par unité de carburant."
-  },
-  "editGasTitle": {
-    "message": "Modifier la priorité"
-  },
   "editGasTooLow": {
     "message": "Délai de traitement inconnu"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Carburant"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Modifier les frais de gaz suggérés"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Ces frais de gaz ont été suggérés par $1. Si vous n’en tenez pas compte, vous risquez de rencontrer des difficultés lors de votre transaction. Veuillez contacter $1 pour toute question.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Limite de gaz"
   },
-  "gasLimitRecommended": {
-    "message": "La limite de gaz recommandée est $1. Si la limite de gaz est inférieure à cette valeur, un échec peut en résulter."
-  },
   "gasLimitTooLow": {
     "message": "La limite de carburant doit être d’au moins 21000"
   },
-  "gasLimitV2": {
-    "message": "Montant maximal des frais de transaction"
-  },
   "gasPrice": {
     "message": "Prix du gaz (GWEI)"
   },
@@ -3763,9 +3694,6 @@
     "message": "Le dispositif Ledger n’est pas connecté. Si vous souhaitez le connecter, veuillez cliquer à nouveau sur « Continuer » et approuver la connexion au HID",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "flèche de niveau"
-  },
   "lightTheme": {
     "message": "Clair"
   },
@@ -5413,9 +5341,6 @@
     "message": "disponible",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Solde disponible"
-  },
   "perpsAvailableToClose": {
     "message": "Disponible pour clôturer"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Marchés"
   },
-  "perpsMax": {
-    "message": "Maximum"
-  },
-  "perpsMaxRemovable": {
-    "message": "Montant maximal pouvant être retiré"
-  },
   "perpsMid": {
     "message": "Moyen"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Position"
   },
-  "perpsPositionSize": {
-    "message": "Taille de la position"
-  },
   "perpsPositions": {
     "message": "Positions"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Accélérer cette annulation"
   },
-  "speedUpExplanation": {
-    "message": "Nous avons mis à jour le prix du carburant selon les conditions actuelles du réseau et l’avons augmenté d’au moins 10 % (requis par le réseau)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Accélérer la transaction"
-  },
-  "speedUpTooltipText": {
-    "message": "Nouveaux frais de gaz"
-  },
   "speedUpTransactionDescription": {
     "message": "Ces frais de réseau remplaceront les frais initiaux."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Source de liquidité"
   },
-  "swapSuggested": {
-    "message": "Swap proposé"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Les swaps sont des transactions complexes et soumises à une contrainte de temps. Nous recommandons ce prix de carburant pour assurer un bon équilibre entre le coût et la garantie d’un swap réussi."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Jetons dans la collection"
   },
-  "tooltipSatusConnected": {
-    "message": "connecté"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Connecté"
   },
-  "tooltipSatusNotConnected": {
-    "message": "non connecté"
-  },
   "total": {
     "message": "Total"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Tutoriel"
   },
-  "twelveHrTitle": {
-    "message": "12 h :"
-  },
   "txAlertTitle": {
     "message": "Cette transaction sera annulée"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Prix du jeton instable"
   },
-  "upArrow": {
-    "message": "flèche vers le haut"
-  },
   "update": {
     "message": "Mise à jour"
   },
diff --git a/app/_locales/ga/messages.json b/app/_locales/ga/messages.json
index 316da53abcad..37c47c0a7288 100644
--- a/app/_locales/ga/messages.json
+++ b/app/_locales/ga/messages.json
@@ -362,9 +362,6 @@
   "advanced": {
     "message": "Ardleibhéil"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Nuair a chuirtear d’idirbheart san áireamh sa bhloc, aisíocfar aon difríocht idir do tháille bhunáite uasta agus an táille bhunáite iarbhír. Ríomhtar an méid iomlán mar an táille bhunáite uasta (i GWEI) * teorainn gáis."
-  },
   "advancedDetailsDataDesc": {
     "message": "Sonraí"
   },
@@ -377,16 +374,9 @@
   "advancedDetailsNonceTooltip": {
     "message": "Seo uimhir idirbhirt cuntais. Is é 0 an uimhir neamh-uaire don chéad idirbheart agus méadaíonn sé in ord seicheamhach."
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Sábháil na luachanna seo mar mo luachanna réamhshocraithe don líonra $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceTitle": {
     "message": "Praghas gáis"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Téann táille tosaíochta (ar a dtugtar “leid mianadóirí” freisin) go díreach chuig na mianadóirí agus tugann sé dreasacht dóibh tosaíocht a thabhairt do d’idirbheart."
-  },
   "airDropPatternDescription": {
     "message": "Nochtann stair ar an slabhra an chomhartha cásanna roimhe seo de ghníomhaíochtaí amhrasacha aerthráchta."
   },
@@ -1062,9 +1052,6 @@
   "cancel": {
     "message": "Cealaigh"
   },
-  "cancelPopoverTitle": {
-    "message": "Cealaigh an t-idirbheart"
-  },
   "cancelled": {
     "message": "Cealaithe"
   },
@@ -1590,9 +1577,6 @@
     "message": "Líonra reatha",
     "description": "Speicifies to token network filter to filter by current Network. Will render when network nickname is not available"
   },
-  "currentTitle": {
-    "message": "Reatha:"
-  },
   "currentlyUnavailable": {
     "message": "Gan a bheith ar fáil ar an líonra seo"
   },
@@ -1643,12 +1627,6 @@
   "dappSuggestedHigh": {
     "message": "Suíomh molta"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Suíomh (ard)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Suíomh"
-  },
   "darkTheme": {
     "message": "Dorcha"
   },
@@ -1936,9 +1914,6 @@
   "dontShowThisAgain": {
     "message": "Ná taispeáin seo arís"
   },
-  "downArrow": {
-    "message": "saighead síos"
-  },
   "downloadAppDescription": {
     "message": "Tabhair MetaMask leat cibé áit a théann tú leis an aip shoghluaiste. Ina theannta sin, cas ar Face ID ionas go mbeidh rochtain agat i gcónaí, fiú má dhéanann tú dearmad ar do phasfhocal."
   },
@@ -2028,22 +2003,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Ní mór teorainn gáis a bheith ar a laghad $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Ní mór teorainn gáis a bheith níos mó ná $1 agus níos lú ná $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Is é an teorainn gáis an líon uasta aonaid gáis atá tú sásta a úsáid. Is iolraitheoir iad na haonaid gháis idir an “Táille tosaíochta uasta” agus an “Táille uasta”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Ní féidir leis an uastáille bhunúsach a bheith níos ísle ná an táille tosaíochta"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Tá an táille bhunúsach uasta níos airde ná mar is gá"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Tá an táille bhunúsach uasta íseal do na coinníollacha líonra reatha"
-  },
   "editGasMaxFeeHigh": {
     "message": "Tá an táille uasta níos airde ná mar is gá"
   },
@@ -2056,30 +2015,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Ní mór don táille tosaíochta uasta a bheith níos mó ná 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Ní mór don táille tosaíochta a bheith níos mó ná 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Tá an táille tosaíochta uasta níos airde ná mar is gá. B’fhéidir go n-íocfaidh tú níos mó ná mar is gá."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Tá an táille tosaíochta níos airde ná mar is gá. B’fhéidir go n-íocfaidh tú níos mó ná mar is gá"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Tá an táille tosaíochta uasta íseal do na coinníollacha líonra reatha"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Tá an táille tosaíochta íseal i bhfianaise choinníollacha reatha an líonra"
-  },
   "editGasPriceTooLow": {
     "message": "Ní mór praghas an gháis a bheith níos mó ná 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Éilíonn an líonra seo réimse “Praghas gáis” agus idirbheart á chur isteach. Is é praghas gáis an méid a íocfaidh tú in aghaidh an aonaid gháis."
-  },
-  "editGasTitle": {
-    "message": "Tosaíocht eagarthóireachta"
-  },
   "editGasTooLow": {
     "message": "Am próiseála anaithnid"
   },
@@ -2463,25 +2407,12 @@
   "gas": {
     "message": "Gás"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Cuir an táille gáis molta in eagar"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Tá an táille gáis seo molta ag $1. Má sháraítear é seo, d’fhéadfadh fadhb a bheith ann le d’idirbheart. Téigh i dteagmháil le $1 má tá ceisteanna agat.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Teorainn gáis"
   },
-  "gasLimitRecommended": {
-    "message": "Is é $1 an teorainn gáis a mholtar. Má tá an teorainn gáis níos lú ná sin, d'fhéadfadh sé teip."
-  },
   "gasLimitTooLow": {
     "message": "Ní mór teorainn gáis a bheith 21000 ar a laghad"
   },
-  "gasLimitV2": {
-    "message": "Teorainn gáis"
-  },
   "gasPriceExcessive": {
     "message": "Tá do tháille gáis socraithe ró-ard. Smaoinigh ar an méid a ísliú."
   },
@@ -3048,9 +2979,6 @@
     "message": "Ní raibh an gléas leabhar mór ceangailte. Más mian leat do Ledger a cheangal, cliceáil 'Lean ar aghaidh' arís agus ceadaigh nasc HID.",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "saighead leibhéal"
-  },
   "lightTheme": {
     "message": "Solas"
   },
@@ -5786,15 +5714,6 @@
   "speedUpCancellation": {
     "message": "Luasaigh an cealú seo"
   },
-  "speedUpExplanation": {
-    "message": "Tá an táille gáis nuashonraithe againn bunaithe ar dhálaí reatha an líonra agus tá méadú 10% ar a laghad déanta againn uirthi (de réir mar a éilíonn an líonra)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Luasaigh an t-idirbheart"
-  },
-  "speedUpTooltipText": {
-    "message": "Táille nua gáis"
-  },
   "spender": {
     "message": "Caiteoir"
   },
@@ -6358,9 +6277,6 @@
   "swapSource": {
     "message": "Foinse leachtachta"
   },
-  "swapSuggested": {
-    "message": "Malartú molta"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Is idirbhearta casta agus íogaire ó thaobh ama de iad malartuithe. Molaimid an táille gáis seo le haghaidh cothromaíocht mhaith idir costas agus muinín as malartú rathúil."
   },
@@ -6550,15 +6466,9 @@
   "tokensInCollection": {
     "message": "Comharthaí sa bhailiúchán"
   },
-  "tooltipSatusConnected": {
-    "message": "ceangailte"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Ceangailte"
   },
-  "tooltipSatusNotConnected": {
-    "message": "gan cheangal"
-  },
   "total": {
     "message": "Iomlán"
   },
@@ -6704,9 +6614,6 @@
   "tutorial": {
     "message": "Rang teagaisc"
   },
-  "twelveHrTitle": {
-    "message": "12 uair an chloig:"
-  },
   "txAlertTitle": {
     "message": "Déanfar an t-idirbheart seo a aisiompú"
   },
@@ -6787,9 +6694,6 @@
   "unstableTokenPriceTitle": {
     "message": "Praghas Comhartha Éagobhsaí"
   },
-  "upArrow": {
-    "message": "saighead suas"
-  },
   "update": {
     "message": "Nuashonrú"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 0d7099cea0cb..f8680a1dfaba 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "एडवांस्ड"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "जब आपका ट्रांसेक्शन ब्लॉक में शामिल हो जाता है, तो आपके अधिकतम बेस फ़ीस और वास्तविक बेस फ़ीस के बीच का कोई भी अंतर वापस कर दिया जाता है। कुल अमाउंट को अधिकतम बेस फ़ीस (GWEI में) * गैस लिमिट के रुप में कैलकुलेट किया जाता है।"
-  },
   "advancedDetailsDataDesc": {
     "message": "डेटा"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "एडवांस्ड नेटवर्क फीस"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "$1 नेटवर्क के लिए इन मूल्यों को मेरे डिफॉल्ट के रूप में सहेजें।",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "एडवांस्ड नेटवर्क फीस"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "एडवांस्डअनुमतियां"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "प्रायोरिटी फ़ीस (उर्फ \"माइनर टिप\") सीधे माइनरों के पास जाती है और उन्हें आपके ट्रांसेक्शन को प्राथमिकता देने के लिए प्रोत्साहित करती है।"
-  },
   "airDropPatternDescription": {
     "message": "टोकन के ऑन-चेन इतिहास से संदिग्ध एयरड्रॉप गतिविधियों के पूर्व उदाहरणों का पता चलता है।"
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "कैंसिल करें"
   },
-  "cancelPopoverTitle": {
-    "message": "ट्रांसेक्शन कैंसिल करें"
-  },
   "cancelTransactionDescription": {
     "message": "यह ट्रांसेक्शन कैंसिल कर दिया जाएगा और यह नेटवर्क फीस ओरिजिनल फीस की जगह लेगी।"
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "2 सवालों में से सवाल $1 ​"
   },
-  "currentTitle": {
-    "message": "मौजूदा:"
-  },
   "currentlyUnavailable": {
     "message": "इस नेटवर्क पर उपलब्ध नहीं है"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "सुझावित साइट"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "साइट (हाई)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "साइट"
-  },
   "dappSwapAdvantage": {
     "message": "MetaMask स्वैप के साथ बचत करें और कमाएँ"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "इसे दोबारा न दिखाएँ"
   },
-  "downArrow": {
-    "message": "डाउन एरो"
-  },
   "download": {
     "message": "डाउनलोड करें"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "गैस लिमिट कम से कम $1 होनी चाहिए"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "गैस लिमिट $1 से अधिक और $2 से कम होनी चाहिए",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "गैस लिमिट, गैस की वो अधिकतम यूनिट है जिसका आप इस्तेमाल करना चाहते हैं। गैस की यूनिटें “अधिकतम प्रायोरिटी फी” और “अधिकतम फ़ीस” का मल्टीप्लायर होती हैं।"
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "अधिकतम बेस फ़ीस प्रायोरिटी फ़ीस से कम नहीं हो सकती है।"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "अधिकतम बेस फ़ीस आवश्यकता से अधिक है"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "मौजूदा नेटवर्क स्थितियों के लिए अधिकतम बेस फ़ीस कम है"
-  },
   "editGasMaxFeeHigh": {
     "message": "अधिकतम फ़ीस आवश्यकता से अधिक है"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "अधिकतम प्रायोरिटी फ़ीस 0 GWEI से अधिक होनी चाहिए"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "प्रायोरिटी फ़ीस 0 से अधिक होनी चाहिए।"
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "अधिकतम प्रायोरिटी फ़ीस आवश्यकता से अधिक है। आप आवश्यकता से अधिक पेमेंट कर सकते हैं।"
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "प्रायोरिटी फ़ीस आवश्यकता से अधिक है। आप आवश्यकता से अधिक पेमेंट कर सकते हैं"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "मौजूदा नेटवर्क स्थितियों के लिए अधिकतम बेस फ़ीस कम है"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "मौजूदा नेटवर्क स्थितियों के लिए प्रायोरिटी फ़ीस कम है"
-  },
   "editGasPriceTooLow": {
     "message": "गैस प्राइस 0 से अधिक होना चाहिए"
   },
-  "editGasPriceTooltip": {
-    "message": "ट्रांसेक्शन सबमिट करते समय इस नेटवर्क को \"गैस प्राइस\" फील्ड की आवश्यकता होती है। गैस प्राइस वह अमाउंट है जो आप प्रति यूनिट गैस के लिए पेमेंट करेंगे।"
-  },
-  "editGasTitle": {
-    "message": "प्राथमिकता बदलें"
-  },
   "editGasTooLow": {
     "message": "अज्ञात संस्करण समय"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "गैस"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "सुझाए गए गैस शुल्क को संपादित करें"
-  },
-  "gasDisplayDappWarning": {
-    "message": "यह गैस शुल्क $1 द्वारा सुझाया गया है। इसे ओवरराइड करने से आपके लेन-देन के साथ समस्या हो सकती है। यदि आपके पास सवाल हैं तो कृपया $1 तक पहुंचें।",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "गैस लिमिट"
   },
-  "gasLimitRecommended": {
-    "message": "अनुशंसित गैस सीमा $1 है। यदि गैस की सीमा इससे कम है, तो यह विफल हो सकता है।"
-  },
   "gasLimitTooLow": {
     "message": "गैस लिमिट कम से कम 21000 होनी चाहिए"
   },
-  "gasLimitV2": {
-    "message": "गैस लिमिट"
-  },
   "gasPrice": {
     "message": "गैस प्राइस"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledger डिवाइस कनेक्ट नहीं था। यदि आप अपना Ledger कनेक्ट करना चाहते हैं, तो कृपया 'जारी रखें' पर फिर से क्लिक करें और HID कनेक्शन को एप्रूव करें",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "लेवल एरो"
-  },
   "lightTheme": {
     "message": "हल्का"
   },
@@ -5413,9 +5341,6 @@
     "message": "उपलब्ध",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "उपलब्ध बैलेंस"
-  },
   "perpsAvailableToClose": {
     "message": "क्लोज़ करने के लिए उपलब्ध है"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "मार्केट"
   },
-  "perpsMax": {
-    "message": "मैक्स"
-  },
-  "perpsMaxRemovable": {
-    "message": "मैक्स रेमूवेबल"
-  },
   "perpsMid": {
     "message": "मिड"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "पोज़िशन"
   },
-  "perpsPositionSize": {
-    "message": "पोज़िशन साइज़"
-  },
   "perpsPositions": {
     "message": "पोजीशन्स"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "इस रद्दीकरण को गति दें"
   },
-  "speedUpExplanation": {
-    "message": "हमने मौजूदा नेटवर्क स्थितियों के आधार पर गैस फ़ीस को अपडेट किया है और इसे कम से कम 10% (नेटवर्क के लिए जरूरी) बढ़ा दिया है।"
-  },
-  "speedUpPopoverTitle": {
-    "message": "लेन-देन की गति बढ़ाएं"
-  },
-  "speedUpTooltipText": {
-    "message": "नया गैस फ़ीस"
-  },
   "speedUpTransactionDescription": {
     "message": "यह नेटवर्क फीस ओरिजिनल फीस की जगह लेगी।"
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "चलनिधि का स्रोत"
   },
-  "swapSuggested": {
-    "message": "विनिमय का सुझाव"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "विनिमय जटिल और समय के प्रति संवेदनशील ट्रांसेक्शन हैं। हम एक सफल विनिमय की लागत और विश्वास के बीच अच्छे संतुलन के लिए इस गैस फ़ीस की अनुशंसा करते हैं।"
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "संग्रह में टोकन"
   },
-  "tooltipSatusConnected": {
-    "message": "जुड़े हुए"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "कनेक्ट किया गया"
   },
-  "tooltipSatusNotConnected": {
-    "message": "जुड़े नहीं हैं"
-  },
   "total": {
     "message": "कुल"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "ट्यूटोरियल"
   },
-  "twelveHrTitle": {
-    "message": "12 घंटे:"
-  },
   "txAlertTitle": {
     "message": "यह ट्रांसेक्शन वापस कर दिया जाएगा"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "टोकन की कीमत अस्थिर"
   },
-  "upArrow": {
-    "message": "अप एरो"
-  },
   "update": {
     "message": "अपडेट करें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 9181400213f9..8d3bc6c1d6ad 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Lanjutan"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Saat transaksi Anda dimasukkan ke dalam blok, selisih antara biaya dasar maks dan biaya dasar aktual akan dikembalikan. Jumlah total dihitung sebagai biaya dasar maks (dalam GWEI) * batas gas."
-  },
   "advancedDetailsDataDesc": {
     "message": "Data"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Biaya jaringan lanjutan"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Simpan nilai ini sebagai default saya untuk jaringan $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Biaya jaringan lanjutan"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "izin lanjutan"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Biaya prioritas (alias “tip penambang”) langsung masuk ke penambang dan memberi insentif kepada mereka untuk memprioritaskan transaksi Anda."
-  },
   "airDropPatternDescription": {
     "message": "Riwayat token on-chain menampilkan kejadian sebelumnya mengenai aktivitas airdrop yang mencurigakan."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Batal"
   },
-  "cancelPopoverTitle": {
-    "message": "Batalkan transaksi"
-  },
   "cancelTransactionDescription": {
     "message": "Transaksi ini akan dibatalkan dan biaya jaringan ini akan menggantikan biaya awal."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Pertanyaan $1 dari 2"
   },
-  "currentTitle": {
-    "message": "Saat ini:"
-  },
   "currentlyUnavailable": {
     "message": "Tidak tersedia di jaringan ini"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Situs yang disarankan"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Situs (tinggi)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Situs"
-  },
   "dappSwapAdvantage": {
     "message": "Hemat dan dapatkan penghasilan dengan MetaMask Swap"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Jangan tampilkan lagi"
   },
-  "downArrow": {
-    "message": "panah turun"
-  },
   "download": {
     "message": "Unduh"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Batas gas minimum adalah $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Batas gas harus lebih besar dari $1 dan kurang dari $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Batas gas merupakan unit maksimum gas yang ingin Anda gunakan. Unit gas adalah pengganda untuk “Biaya prioritas maks” dan “Biaya maks”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Biaya dasar maks tidak boleh lebih rendah dari biaya prioritas"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Biaya dasar maks lebih tinggi dari yang diperlukan"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Biaya dasar maks rendah untuk kondisi jaringan saat ini"
-  },
   "editGasMaxFeeHigh": {
     "message": "Biaya maks lebih tinggi dari yang diperlukan"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Biaya prioritas maks harus lebih besar dari 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Biaya prioritas harus lebih besar dari 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Biaya prioritas maks lebih tinggi dari yang diperlukan. Anda mungkin akan membayar lebih dari yang dibutuhkan."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Biaya prioritas lebih tinggi dari yang diperlukan. Anda mungkin akan membayar lebih dari yang dibutuhkan"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Biaya prioritas maks rendah untuk kondisi jaringan saat ini"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Biaya prioritas rendah untuk kondisi jaringan saat ini"
-  },
   "editGasPriceTooLow": {
     "message": "Harga gas harus lebih besar dari 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Jaringan ini memerlukan kolom “Harga gas” saat mengirimkan transaksi. Harga gas merupakan jumlah yang akan Anda bayar per unit gas."
-  },
-  "editGasTitle": {
-    "message": "Edit prioritas"
-  },
   "editGasTooLow": {
     "message": "Waktu pemrosesan tidak diketahui"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Edit biaya gas yang disarankan"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Biaya gas ini telah disarankan oleh $1. Mengubahnya dapat menyebabkan masalah pada transaksi Anda. Jika ada pertanyaan, hubungi $1.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Batas gas"
   },
-  "gasLimitRecommended": {
-    "message": "Batas gas yang disarankan adalah $1. Jika batas gas kurang dari itu, maka berpotensi gagal."
-  },
   "gasLimitTooLow": {
     "message": "Batas gas minimum adalah 21000"
   },
-  "gasLimitV2": {
-    "message": "Batas gas"
-  },
   "gasPrice": {
     "message": "Harga gas"
   },
@@ -3763,9 +3694,6 @@
     "message": "Perangkat ledger tidak terhubung. Jika ingin menghubungkan Ledger Anda, klik 'Lanjutkan' lagi dan setujui koneksi HID",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "panah tingkat"
-  },
   "lightTheme": {
     "message": "Terang"
   },
@@ -5413,9 +5341,6 @@
     "message": "tersedia",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Saldo tersedia"
-  },
   "perpsAvailableToClose": {
     "message": "Tersedia untuk ditutup"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Pasar"
   },
-  "perpsMax": {
-    "message": "Maks"
-  },
-  "perpsMaxRemovable": {
-    "message": "Maks yang dapat dikurangi"
-  },
   "perpsMid": {
     "message": "Tengah"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Posisi"
   },
-  "perpsPositionSize": {
-    "message": "Ukuran Posisi"
-  },
   "perpsPositions": {
     "message": "Posisi"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Percepat pembatalan ini"
   },
-  "speedUpExplanation": {
-    "message": "Kami telah memperbarui biaya gas berdasarkan kondisi jaringan saat ini dan telah meningkatkannya minimal 10% (diperlukan oleh jaringan)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Percepat transaksi"
-  },
-  "speedUpTooltipText": {
-    "message": "Biaya gas baru"
-  },
   "speedUpTransactionDescription": {
     "message": "Biaya jaringan ini akan menggantikan biaya awal."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Sumber likuiditas"
   },
-  "swapSuggested": {
-    "message": "Pertukaran yang disarankan"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Pertukaran adalah transaksi yang kompleks dan sensitif terhadap waktu. Kami merekomendasikan biaya gas ini untuk keseimbangan yang baik antara biaya dan konfidensi dari keberhasilan Pertukaran."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Token dalam koleksi"
   },
-  "tooltipSatusConnected": {
-    "message": "terhubung"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Terhubung"
   },
-  "tooltipSatusNotConnected": {
-    "message": "tidak terhubung"
-  },
   "total": {
     "message": "Total"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12 j:"
-  },
   "txAlertTitle": {
     "message": "Transaksi ini akan dibatalkan"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Harga token tidak stabil"
   },
-  "upArrow": {
-    "message": "panah naik"
-  },
   "update": {
     "message": "Perbarui"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index e0e82f3650e0..ba4b6e9a17bd 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -118,15 +118,9 @@
   "advanced": {
     "message": "Avanzate"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Quando la tua transazione viene inclusa nel blocco, ogni differenza tra la tua offerta massima di gas e il gas effettivamente utilizzato viene restituita a te. Il totale viene calcolato come offerta massima di gas (in GEWI) * limite di gas."
-  },
   "advancedGasPriceTitle": {
     "message": "Prezzo gas"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "La commissione di priorità avanzata (nota anche come \"suggerimento del minatore\") va direttamente ai minatori e li incentiva a dare la priorità alla tua commissione di transazione."
-  },
   "alertDisableTooltip": {
     "message": "Può essere cambiato in \"Impostazioni > Avvisi\""
   },
@@ -245,9 +239,6 @@
   "cancel": {
     "message": "Annulla"
   },
-  "cancelPopoverTitle": {
-    "message": "Annulla transazione"
-  },
   "cancelled": {
     "message": "Annullata"
   },
@@ -399,9 +390,6 @@
   "currentLanguage": {
     "message": "Lingua Corrente"
   },
-  "currentTitle": {
-    "message": "Corrente:"
-  },
   "currentlyUnavailable": {
     "message": "Non disponibile su questa Rete"
   },
@@ -437,9 +425,6 @@
     "message": "$1 ha suggerito questo prezzo.",
     "description": "$1 is url for the dapp that has suggested gas settings"
   },
-  "dappSuggestedShortLabel": {
-    "message": "Sito"
-  },
   "darkTheme": {
     "message": "Scuro"
   },
@@ -515,9 +500,6 @@
   "dontShowThisAgain": {
     "message": "Non mostrare di nuovo"
   },
-  "downArrow": {
-    "message": "Freccia in giù"
-  },
   "downloadGoogleChrome": {
     "message": "Scarica Google Chrome"
   },
@@ -548,22 +530,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Il limite di gas deve essere almeno $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Il limite del gas deve essere maggiore di $1 e minore di $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Il limite del gas è l'unità massima di gas che sei disposto a utilizzare. Le unità di gas sono un moltiplicatore per “Commissione massima priorità“ e “Commissione massima“."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "La tariffa base massima non può essere inferiore alla tariffa prioritaria"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "La tariffa base massima è superiore al necessario"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "La tariffa base massima è bassa per le condizioni di rete attuali"
-  },
   "encryptionPublicKeyNotice": {
     "message": "$1 vorrebbe la tua chiave di cifratura pubblica. Consentendo, questo sito sarà in grado di comporre messaggi criptati per te.",
     "description": "$1 is the web3 site name"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 638fa31bae0d..24eee96e6a68 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "高度な設定"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "トランザクションがブロックに含まれた場合、最大基本料金と実際の基本料金の差が返金されます。合計金額は、最大基本料金 (Gwei単位) * ガスリミットで計算されます。"
-  },
   "advancedDetailsDataDesc": {
     "message": "データ"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "詳細なネットワーク手数料"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "これらの値を$1ネットワークのデフォルトとして保存する",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "詳細なネットワーク手数料"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "高度なアクセス許可"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "優先手数料 (別名「マイナーチップ」) はマイナーに直接支払われ、トランザクションを優先するインセンティブとなります。"
-  },
   "airDropPatternDescription": {
     "message": "トークンのオンチェーン履歴で、不審なエアドロップアクティビティの以前のインスタンスを確認できます。"
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "キャンセル"
   },
-  "cancelPopoverTitle": {
-    "message": "トランザクションのキャンセル"
-  },
   "cancelTransactionDescription": {
     "message": "このトランザクションはキャンセルされ、このネットワーク手数料が元の手数料に代わって適用されます。"
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "問題 $1 / 2"
   },
-  "currentTitle": {
-    "message": "現在:"
-  },
   "currentlyUnavailable": {
     "message": "このネットワークでは利用できません"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "おすすめのサイト"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "サイト (高)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "サイト"
-  },
   "dappSwapAdvantage": {
     "message": "MetaMaskスワップで貯めて収益化"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "今後表示しない"
   },
-  "downArrow": {
-    "message": "下矢印"
-  },
   "download": {
     "message": "ダウンロード"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "ガスリミットは$1以上にする必要があります"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "ガスリミットは$1より大きく、$2未満でなければなりません",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "ガスリミットは、使用しても構わないガスの最大単位数です。ガスの単位数は、「最大優先手数料」および「最大手数料」の乗数になります。"
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "最大基本料金を優先手数料よりも低くすることはできません"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "最大基本料金が必要以上です"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "現在のネットワーク状況に対して最大基本料金が低いです"
-  },
   "editGasMaxFeeHigh": {
     "message": "最大手数料が必要以上です"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "最大優先手数料は0gweiより高くなければなりません"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "優先手数料は0より高くなければなりません。"
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "最大優先手数料が必要以上です。必要以上の額が支払われる可能性があります。"
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "優先手数料が必要以上です。必要以上の額が支払われる可能性があります。"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "現在のネットワーク状況に対して最大優先手数料が低いです"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "現在のネットワーク状況に対して優先手数料が低いです"
-  },
   "editGasPriceTooLow": {
     "message": "ガス価格は0より高くなければなりません"
   },
-  "editGasPriceTooltip": {
-    "message": "このネットワークは、トランザクションの送信時に「ガス価格」フィールドが必要です。ガス価格は、ガス1単位あたりに支払う金額です。"
-  },
-  "editGasTitle": {
-    "message": "優先度を編集"
-  },
   "editGasTooLow": {
     "message": "処理時間不明"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "ガス"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "推奨ガス代を編集"
-  },
-  "gasDisplayDappWarning": {
-    "message": "このガス代は$1により推奨されています。これを上書きすると、トランザクションに問題が発生する可能性があります。ご質問がございましたら、$1 にお問い合わせください。",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "ガスリミット"
   },
-  "gasLimitRecommended": {
-    "message": "ガス代上限の推奨値は$1です。それ未満の場合は失敗する可能性があります。"
-  },
   "gasLimitTooLow": {
     "message": "ガスリミットは21000以上にする必要があります"
   },
-  "gasLimitV2": {
-    "message": "ガスリミット"
-  },
   "gasPrice": {
     "message": "ガス価格 (gwei)"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledgerデバイスが接続されていません。Ledgerに接続する場合は、もう一度「続行」をクリックして、HID接続を承認してください。",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "水平矢印"
-  },
   "lightTheme": {
     "message": "ライト"
   },
@@ -5413,9 +5341,6 @@
     "message": "使用可能",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "利用可能残高"
-  },
   "perpsAvailableToClose": {
     "message": "クローズに利用可能"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "市場"
   },
-  "perpsMax": {
-    "message": "最大額"
-  },
-  "perpsMaxRemovable": {
-    "message": "減額可能額 (上限)"
-  },
   "perpsMid": {
     "message": "中間値"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "ポジション"
   },
-  "perpsPositionSize": {
-    "message": "ポジションサイズ"
-  },
   "perpsPositions": {
     "message": "ポジション"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "このキャンセルを高速化"
   },
-  "speedUpExplanation": {
-    "message": "現在のネットワーク状況に基づきガス代を更新し、10%以上 (ネットワークによる要件) 増額させました。"
-  },
-  "speedUpPopoverTitle": {
-    "message": "トランザクションを高速化"
-  },
-  "speedUpTooltipText": {
-    "message": "新しいガス代"
-  },
   "speedUpTransactionDescription": {
     "message": "このネットワーク手数料が元の手数料に代わって適用されます。"
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "流動性の供給源"
   },
-  "swapSuggested": {
-    "message": "スワップが提案されました"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "スワップは複雑で急を要するトランザクションです。コストとスワップの確実な成功のバランスが取れたこのガス代をお勧めします。"
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "コレクションのトークン"
   },
-  "tooltipSatusConnected": {
-    "message": "接続済み"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "接続済み"
   },
-  "tooltipSatusNotConnected": {
-    "message": "未接続"
-  },
   "total": {
     "message": "合計"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "チュートリアル"
   },
-  "twelveHrTitle": {
-    "message": "12時間:"
-  },
   "txAlertTitle": {
     "message": "このトランザクションは組み戻しされます"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "トークン価格が不安定です"
   },
-  "upArrow": {
-    "message": "上矢印"
-  },
   "update": {
     "message": "更新"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index dd87bf87fc2f..208920edf7d6 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "고급"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "트랜잭션이 블록에 포함되면 최대 기본 요금과 실제 기본 요금 간의 차액이 환불됩니다. 총 금액은 최대 기본 요금(GWEI 단위) 곱하기 가스 한도로 계산합니다."
-  },
   "advancedDetailsDataDesc": {
     "message": "데이터"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "고급 네트워크 수수료"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "이 수치를 $1 네트워크의 기본값으로 저장합니다.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "고급 네트워크 수수료"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "고급 승인"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "우선 요금(일명 \"채굴자 팁\")이란 내 트랜잭션을 우선 거래한 것에 대한 인센티브로 채굴자에게 직접 전달되는 금액입니다."
-  },
   "airDropPatternDescription": {
     "message": "해당 토큰의 온체인 기록에서 의심스러운 에어드롭 활동이 확인되었습니다."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "취소"
   },
-  "cancelPopoverTitle": {
-    "message": "트랜잭션 취소"
-  },
   "cancelTransactionDescription": {
     "message": "거래는 취소되며 이 네트워크 수수료가 기존 수수료를 대신하게 됩니다."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "2개 중 $1번째 질문"
   },
-  "currentTitle": {
-    "message": "현재:"
-  },
   "currentlyUnavailable": {
     "message": "이 네트워크에서 사용할 수 없음"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "사이트 제안"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "사이트(높음)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "사이트"
-  },
   "dappSwapAdvantage": {
     "message": "MetaMask 스왑으로 비용을 절감하고 수익을 창출하세요"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "다시 표시 안 함"
   },
-  "downArrow": {
-    "message": "하강 화살표"
-  },
   "download": {
     "message": "다운로드"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "가스 한도는 $1 이상이어야 합니다."
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "가스 한도는 $1보다 크고 $2 미만이어야 합니다.",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "가스 한도는 사용하려는 가스의 최대 단위입니다. 가스 단위는 \"최대 우선 요금\" 및 \"최대 요금\"의 승수입니다."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "최대 기본 요금이 우선 요금보다 낮을 수 없습니다."
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "최대 기본 요금이 필요 이상으로 높습니다."
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "최대 기본 요금이 현재 네트워크 조건에 비해 낮습니다."
-  },
   "editGasMaxFeeHigh": {
     "message": "최대 요금이 필요 이상으로 높습니다."
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "최대 우선 요금은 0GWEI보다 커야 합니다."
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "우선 요금은 0보다 커야 합니다."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "최대 우선 요금이 필요 이상으로 높습니다. 필요 이상으로 지급될 수 있습니다."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "우선 요금이 필요 이상으로 높습니다. 필요 이상으로 지급될 수 있습니다"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "최대 우선 요금이 현재 네트워크 조건에 비해 낮습니다."
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "우선 요금이 현재 네트워크 조건에 비해 낮습니다."
-  },
   "editGasPriceTooLow": {
     "message": "가스 가격은 0보다 커야 합니다."
   },
-  "editGasPriceTooltip": {
-    "message": "이 네트워크에서는 트랜잭션을 제출할 때 \"가스 가격\"을 필수 입력해야 합니다. 가스 가격은 가스 단위당 지급할 금액입니다."
-  },
-  "editGasTitle": {
-    "message": "우선 순위 편집"
-  },
   "editGasTooLow": {
     "message": "확인되지 않은 처리 시간"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "가스"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "추천 가스비 편집"
-  },
-  "gasDisplayDappWarning": {
-    "message": "이 가스비는 $1에 의해 제안된 것입니다. 이를 무시하면 트랜잭션에 문제가 생길 수 있습니다. 질문이 있으시면 $1에 문의하세요.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "가스 한도"
   },
-  "gasLimitRecommended": {
-    "message": "권장 가스비 한도는 $1입니다. 가스 한도가 이보다 낮으면 실패할 수 있습니다."
-  },
   "gasLimitTooLow": {
     "message": "가스 한도는 21000 이상이어야 합니다."
   },
-  "gasLimitV2": {
-    "message": "가스 한도"
-  },
   "gasPrice": {
     "message": "가스 가격(GWEI)"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledger 장치가 연결되지 않았습니다. Ledger를 연결하려면 '계속'을 다시 클릭하고 HID 연결을 승인하세요.",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "수평 화살표"
-  },
   "lightTheme": {
     "message": "밝게"
   },
@@ -5413,9 +5341,6 @@
     "message": "사용 가능",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "사용 가능한 잔액"
-  },
   "perpsAvailableToClose": {
     "message": "청산 가능"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "시장"
   },
-  "perpsMax": {
-    "message": "최대"
-  },
-  "perpsMaxRemovable": {
-    "message": "최대 인출 가능"
-  },
   "perpsMid": {
     "message": "중간값"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "포지션"
   },
-  "perpsPositionSize": {
-    "message": "포지션 크기"
-  },
   "perpsPositions": {
     "message": "포지션"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "이 취소 가속화"
   },
-  "speedUpExplanation": {
-    "message": "현재 네트워크 상태를 기반으로 가스비를 업데이트하고 최소 10% 인상했습니다(네트워크에서 요구함)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "트랜잭션 속도 향상"
-  },
-  "speedUpTooltipText": {
-    "message": "신규 가스비"
-  },
   "speedUpTransactionDescription": {
     "message": "이 네트워크 수수료가 기존 수수료를 대체합니다."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "유동성 소스"
   },
-  "swapSuggested": {
-    "message": "제안 스왑"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "스왑은 복잡하고 시간에 민감한 트랜잭션입니다. 성공적인 스왑의 비용과 확신 사이의 적절한 균형을 위해 이 가스비를 권장합니다."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "컬렉션에 보유 중인 토큰"
   },
-  "tooltipSatusConnected": {
-    "message": "연결됨"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "연결됨"
   },
-  "tooltipSatusNotConnected": {
-    "message": "연결되지 않음"
-  },
   "total": {
     "message": "총액"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "튜토리얼"
   },
-  "twelveHrTitle": {
-    "message": "12시간:"
-  },
   "txAlertTitle": {
     "message": "이 트랜잭션은 되돌려집니다"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "불안정한 토큰 가격"
   },
-  "upArrow": {
-    "message": "상승 화살표"
-  },
   "update": {
     "message": "업데이트"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index cc10396a2828..df201fd91d36 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Avançado"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Quando a sua transação for incluída no bloco, qualquer diferença entre a sua taxa-base máxima e a taxa-base real será reembolsada. O cálculo do valor total é feito da seguinte forma: taxa-base máxima (em GWEI) * limite de gás."
-  },
   "advancedDetailsDataDesc": {
     "message": "Dados"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Taxa de rede avançada"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Salvar esses valores como padrão para a rede $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Taxa de rede avançada"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "permissões avançadas"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "A taxa de prioridade (ou seja, \"gorjeta do minerador\") vai diretamente para os mineradores e os incentiva a priorizar a sua transação."
-  },
   "airDropPatternDescription": {
     "message": "O histórico do token na rede revela ocorrências anteriores de atividades de airdrop suspeitas."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Cancelar"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancelar transação"
-  },
   "cancelTransactionDescription": {
     "message": "Esta transação será cancelada e esta taxa de rede substituirá a original."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Pergunta $1 de 2"
   },
-  "currentTitle": {
-    "message": "Atual:"
-  },
   "currentlyUnavailable": {
     "message": "Indisponível nessa rede"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Site sugerido"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (alto)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "Economize e ganhe com swaps da MetaMask"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Não exibir isso novamente"
   },
-  "downArrow": {
-    "message": "seta para baixo"
-  },
   "download": {
     "message": "Baixar"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "O limite de gás deve ser de pelo menos $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "O limite de gás deve ser superior a $1 e inferior a $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "O limite de gás são as unidades máximas de gás que você está disposto a utilizar. Unidades de gás são um multiplicador para “Taxa de prioridade máxima” e “Taxa máxima”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "A taxa-base máxima não pode ser inferior à taxa de prioridade"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "A taxa-base máxima está mais elevada que o necessário"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "A taxa-base máxima está baixa para as condições atuais da rede"
-  },
   "editGasMaxFeeHigh": {
     "message": "A taxa máxima está mais elevada que o necessário"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "A taxa de prioridade máxima deve ser superior a 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "A taxa de prioridade deve ser superior a 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "A taxa de prioridade máxima está mais alta que o necessário. Talvez você pague mais que o necessário."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "A taxa de prioridade está mais alta que o necessário. Talvez você pague mais que o necessário"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "A taxa de prioridade máxima está baixa para as condições atuais da rede"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "A taxa de prioridade está baixa para as condições atuais da rede"
-  },
   "editGasPriceTooLow": {
     "message": "O preço do gás deve ser superior a 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Essa rede requer um campo de \"preço do gás\" ao enviar uma transação. O preço do gás é o valor pago por unidade de gás."
-  },
-  "editGasTitle": {
-    "message": "Editar prioridade"
-  },
   "editGasTooLow": {
     "message": "Tempo de processamento desconhecido"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gás"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Editar taxa de gás sugerida"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Essa taxa de gás foi sugerida por $1. Sua substituição pode causar um problema com a sua transação. Entre em contato com $1 se tiver perguntas.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Limite de gás"
   },
-  "gasLimitRecommended": {
-    "message": "O limite de gás recomendado é de $1. Um limite de gás inferior pode resultar em falha."
-  },
   "gasLimitTooLow": {
     "message": "O limite de gás deve ser de pelo menos 21000"
   },
-  "gasLimitV2": {
-    "message": "Limite de gás"
-  },
   "gasPrice": {
     "message": "Preço do gás (GWEI)"
   },
@@ -3763,9 +3694,6 @@
     "message": "O dispositivo Ledger não foi conectado. Se deseja conectar seu Ledger, clique em \"Continuar\" novamente e aprove a conexão HID",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "seta de nível"
-  },
   "lightTheme": {
     "message": "Claro"
   },
@@ -5413,9 +5341,6 @@
     "message": "disponível",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Saldo disponível"
-  },
   "perpsAvailableToClose": {
     "message": "Disponível para fechar"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Mercados"
   },
-  "perpsMax": {
-    "message": "Máx."
-  },
-  "perpsMaxRemovable": {
-    "message": "Máximo removível"
-  },
   "perpsMid": {
     "message": "Médio"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Posição"
   },
-  "perpsPositionSize": {
-    "message": "Tamanho da posição"
-  },
   "perpsPositions": {
     "message": "Posições"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Acelerar esse cancelamento"
   },
-  "speedUpExplanation": {
-    "message": "Atualizamos a taxa de gás baseada nas condições atuais da rede e a aumentamos em pelo menos 10% (exigido pela rede)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Acelerar a transação"
-  },
-  "speedUpTooltipText": {
-    "message": "Nova taxa de gás"
-  },
   "speedUpTransactionDescription": {
     "message": "Esta taxa de rede substituirá a original."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Fonte de liquidez"
   },
-  "swapSuggested": {
-    "message": "Troca sugerida"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Trocas são transações complexas e urgentes. Recomendamos essa taxa de gás para atingir o equilíbrio ideal entre o custo e a confiança de uma troca bem-sucedida."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Tokens na coleção"
   },
-  "tooltipSatusConnected": {
-    "message": "conectado"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Conectado"
   },
-  "tooltipSatusNotConnected": {
-    "message": "não conectado"
-  },
   "total": {
     "message": "Total"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Tutorial"
   },
-  "twelveHrTitle": {
-    "message": "12 h:"
-  },
   "txAlertTitle": {
     "message": "Esta transação será revertida"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Preço de token instável"
   },
-  "upArrow": {
-    "message": "seta para cima"
-  },
   "update": {
     "message": "Atualizar"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 3da16c60d5f1..37eb9ebe82a8 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -118,15 +118,9 @@
   "advanced": {
     "message": "Avançado"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Quando a sua transação for incluída no bloco, qualquer diferença entre a sua taxa de base máxima e a taxa de base real será reembolsada. O cálculo do valor total é feito da seguinte forma: taxa de base máxima (em GWEI) * limite de gás."
-  },
   "advancedGasPriceTitle": {
     "message": "Preço do gás"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "A taxa de prioridade (ou seja, \"gorjeta do minerador\") vai diretamente para os mineradores e os incentiva a priorizar a sua transação."
-  },
   "alertDisableTooltip": {
     "message": "Isso pode ser alterado em \"Configurações > Alertas\""
   },
@@ -249,9 +243,6 @@
   "cancel": {
     "message": "Cancelar"
   },
-  "cancelPopoverTitle": {
-    "message": "Cancelar transação"
-  },
   "cancelled": {
     "message": "Cancelado"
   },
@@ -400,9 +391,6 @@
   "currentLanguage": {
     "message": "Idioma atual"
   },
-  "currentTitle": {
-    "message": "Atual:"
-  },
   "currentlyUnavailable": {
     "message": "Indisponível nessa rede"
   },
@@ -419,9 +407,6 @@
     "message": "$1 sugeriu esse preço.",
     "description": "$1 is url for the dapp that has suggested gas settings"
   },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "data": {
     "message": "Dados"
   },
@@ -524,22 +509,6 @@
   "editGasLimitOutOfBounds": {
     "message": "O limite de gás deve ser de pelo menos $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "O limite de gás deve ser superior a $1 e inferior a $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "O limite de gás são as unidades máximas de gás que você está disposto a utilizar. Unidades de gás são um multiplicador para “Taxa de prioridade máxima” e “Taxa máxima”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "A taxa de base máxima não pode ser inferior à taxa de prioridade"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "A taxa de base máxima está mais elevada que o necessário"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "A taxa de base máxima está baixa para as condições atuais da rede"
-  },
   "editGasMaxFeeHigh": {
     "message": "A taxa máxima está mais elevada que o necessário"
   },
@@ -552,30 +521,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "A taxa de prioridade máxima deve ser superior a 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "A taxa de prioridade deve ser superior a 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "A taxa de prioridade máxima está mais alta que o necessário. Talvez você pague mais que o necessário."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "A taxa de prioridade está mais alta que o necessário. Talvez você pague mais que o necessário"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "A taxa de prioridade máxima está baixa para as condições atuais da rede"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "A taxa de prioridade está baixa para as condições atuais da rede"
-  },
   "editGasPriceTooLow": {
     "message": "O preço do gás deve ser superior a 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Essa rede requer um campo de \"Preço do gás\" ao enviar uma transação. O preço do gás é o valor pago por unidade de gás."
-  },
-  "editGasTitle": {
-    "message": "Editar prioridade"
-  },
   "editGasTooLow": {
     "message": "Tempo de processamento desconhecido"
   },
@@ -698,22 +652,12 @@
   "gas": {
     "message": "Gás"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Editar taxa de gás sugerida"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Essa taxa de gás foi sugerida por $1. Sua substituição pode causar um problema com a sua transação. Entre em contato com $1 se tiver perguntas.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Limite de gás"
   },
   "gasLimitTooLow": {
     "message": "O limite de gás deve ser de pelo menos 21000"
   },
-  "gasLimitV2": {
-    "message": "Limite de gás"
-  },
   "gasPriceExcessive": {
     "message": "Sua taxa de gás está desnecessariamente alta. Considere reduzir o valor."
   },
@@ -1398,15 +1342,6 @@
   "speedUpCancellation": {
     "message": "Acelerar esse cancelamento"
   },
-  "speedUpExplanation": {
-    "message": "Atualizamos a taxa de gás baseada nas condições atuais da rede e a aumentamos em pelo menos 10% (exigido pela rede)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Acelerar a transação"
-  },
-  "speedUpTooltipText": {
-    "message": "Nova taxa de gás"
-  },
   "stable": {
     "message": "Estável"
   },
@@ -1616,9 +1551,6 @@
   "swapSource": {
     "message": "Fonte de liquidez"
   },
-  "swapSuggested": {
-    "message": "Troca sugerida"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Trocas (swaps) são transações complexas e urgentes. Recomendamos essa taxa de gás para atingir o equilíbrio ideal entre o custo e a confiança de uma troca bem-sucedida."
   },
@@ -1757,9 +1689,6 @@
   "turnOnTokenDetection": {
     "message": "Ativar detecção avançada de token"
   },
-  "twelveHrTitle": {
-    "message": "12 h:"
-  },
   "u2f": {
     "message": "U2F",
     "description": "A name on an API for the browser to interact with devices that support the U2F protocol. On some browsers we use it to connect MetaMask to Ledger devices."
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index cb68f16c0bc8..5c9c9f819bac 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Дополнительные"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "После включения вашей транзакции в блок возмещается любая разница между вашей максимальной базовой комиссией и фактической базовой комиссией. Общая сумма рассчитывается следующим образом: максимальная базовая комиссия (в Гвей) x лимит газа."
-  },
   "advancedDetailsDataDesc": {
     "message": "Данные"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Дополнительная комиссия сети"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Сохраните эти значения как значения по умолчанию для сети $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Дополнительная комиссия сети"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "расширенные разрешения"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Плата за приоритет (также известная как «чаевые» майнеру) направляется непосредственно майнерам, чтобы они уделили приоритетное внимание вашей транзакции."
-  },
   "airDropPatternDescription": {
     "message": "В истории токена в блокчейне уже были случаи подозрительных аирдропов."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Отмена"
   },
-  "cancelPopoverTitle": {
-    "message": "Отменить транзакцию"
-  },
   "cancelTransactionDescription": {
     "message": "Эта транзакция будет отменена, и эта комиссия сети заменит исходную."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Вопрос $1 из 2"
   },
-  "currentTitle": {
-    "message": "Текущая:"
-  },
   "currentlyUnavailable": {
     "message": "Недоступно в этой сети"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Рекомендовано сайтом"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Сайт (высокий)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Сайт"
-  },
   "dappSwapAdvantage": {
     "message": "Экономьте и зарабатывайте с MetaMask Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Не показывать снова"
   },
-  "downArrow": {
-    "message": "стрелка «вниз»"
-  },
   "download": {
     "message": "Скачать"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Лимит газа должен быть не менее $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Лимит газа должен быть больше $1 и меньше $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Лимит газа — это максимальное количество единиц газа, которое вы готовы использовать. Единицы газа являются множителем «Максимальной платы за приоритет» и «Максимальной комиссии»."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Максимальная базовая комиссия не может быть ниже платы за приоритет."
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Максимальная базовая комиссия выше необходимой"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Максимальная базовая комиссия низкая для текущих условий сети"
-  },
   "editGasMaxFeeHigh": {
     "message": "Максимальная комиссия выше, чем необходимо"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Максимальная плата за приоритет должна быть больше 0 Гвей."
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Плата за приоритет должна быть больше 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Максимальная плата за приоритет выше необходимой. Вы можете заплатить больше, чем нужно."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Плата за приоритет выше необходимой. Вы можете заплатить больше, чем нужно"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Максимальная плата за приоритет низкая для текущих условий сети"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Плата за приоритет низкая для текущих условий сети"
-  },
   "editGasPriceTooLow": {
     "message": "Цена газа должна быть больше 0"
   },
-  "editGasPriceTooltip": {
-    "message": "В этой сети необходимо заполнить поле «Цена газа» при отправке транзакции. Цена газа — это сумма, которую вы будете платить за единицу газа."
-  },
-  "editGasTitle": {
-    "message": "Изменить приоритет"
-  },
   "editGasTooLow": {
     "message": "Время обработки неизвестно"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Газ"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Изменить рекомендуемую плату за газ"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Эта плата за газ была предложена $1. Ее изменение может привести к проблемам с вашей транзакцией. При наличии вопросов обратитесь к $1.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Лимит газа"
   },
-  "gasLimitRecommended": {
-    "message": "Рекомендуемый лимит газа — $1. Если лимит газа меньше, успешность транзакции снижается."
-  },
   "gasLimitTooLow": {
     "message": "Лимит газа должен быть не менее 21 000"
   },
-  "gasLimitV2": {
-    "message": "Лимит газа"
-  },
   "gasPrice": {
     "message": "Цена газа (Гвей)"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledger не подключен. Если хотите подключить Ledger, нажмите «Продолжить» еще раз и одобрите HID-подключение",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "стрелка «уровень»"
-  },
   "lightTheme": {
     "message": "Светлая"
   },
@@ -5413,9 +5341,6 @@
     "message": "доступные",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Доступный баланс"
-  },
   "perpsAvailableToClose": {
     "message": "Доступно для закрытия"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Рынки"
   },
-  "perpsMax": {
-    "message": "Максимум"
-  },
-  "perpsMaxRemovable": {
-    "message": "Макс. для снятия"
-  },
   "perpsMid": {
     "message": "Сред."
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Позиция"
   },
-  "perpsPositionSize": {
-    "message": "Размер позиции"
-  },
   "perpsPositions": {
     "message": "Позиции"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Ускорить эту отмену"
   },
-  "speedUpExplanation": {
-    "message": "Мы обновили плату за газ с учетом текущих условий сети и увеличили ее как минимум на 10% (это требование сети)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Ускорить транзакцию"
-  },
-  "speedUpTooltipText": {
-    "message": "Новая плата за газ"
-  },
   "speedUpTransactionDescription": {
     "message": "Эта комиссия сети заменит исходную."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Источник ликвидности"
   },
-  "swapSuggested": {
-    "message": "Рекомендуется своп"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Своп — это сложная транзакция, выполнение которой зависят от имеющегося времени. Мы рекомендуем эту плату за газ для хорошего баланса между стоимостью и уверенностью в успехе свопа."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Токены в коллекции"
   },
-  "tooltipSatusConnected": {
-    "message": "подключен"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Подключено"
   },
-  "tooltipSatusNotConnected": {
-    "message": "не подключено"
-  },
   "total": {
     "message": "Итого"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Руководство"
   },
-  "twelveHrTitle": {
-    "message": "12 ч:"
-  },
   "txAlertTitle": {
     "message": "Эта транзакция будет отменена"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Нестабильная цена токена"
   },
-  "upArrow": {
-    "message": "стрелка «вверх»"
-  },
   "update": {
     "message": "Обновить"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index a90b6fd1477d..d1e5e9f0cffe 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Advanced"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Kapag nakasama ang iyong transaksyon sa block, ire-refund ang anumang difference sa pagitan ng iyong pinakamataas na batayang bayad at ang aktwal na batayang bayad. Ang kabuuang halaga ay kinakalkula bilang pinakamataas na batayang bayad (sa GWEI) * ng limitasyon ng gas."
-  },
   "advancedDetailsDataDesc": {
     "message": "Data"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Advanced na bayad sa network"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "I-save ang mga value na ito bilang default ko para sa $1 network.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Advanced na bayad sa network"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "mga advanced na pahintulot"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Ang bayad sa priyoridad (kilala rin bilang “tip ng minero”) ay direktang napupunta sa mga minero at ginagawang insentibo ang mga ito upang unahin ang iyong mga transaksyon."
-  },
   "airDropPatternDescription": {
     "message": "Isinasaad ng on-chain history ng token na may mga dati nang kahina-hinalang aktibidad ng airdrop."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Kanselahin"
   },
-  "cancelPopoverTitle": {
-    "message": "Kanselahin ang transaksyon"
-  },
   "cancelTransactionDescription": {
     "message": "Makakansela ang transaksyong ito at papalitan ng bayad sa network na ito ang orihinal."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Tanong $1 sa 2"
   },
-  "currentTitle": {
-    "message": "Current:"
-  },
   "currentlyUnavailable": {
     "message": "Hindi available sa network na ito"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Iminungkahing site"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (mataas)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "Makatipid at kumita sa MetaMask Swaps"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Huwag itong ipaklita ulit"
   },
-  "downArrow": {
-    "message": "arrow pababa"
-  },
   "download": {
     "message": "I-download"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Ang limitasyon ng gas ay dapat na hindi bababa sa $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Ang limitasyon ng gas ay dapat na mas mataas sa $1 at hindi bababa sa $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Ang limitasyon ng gas ay ang pinakamataas na yunit ng gas na handa mong gamitin. Ang mga yunit ng gas ay multiplier sa “Pinakamataas na bayad sa priyoridad” at “Pinakamataas na bayad”."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Ang pinakamataas na batayang bayad ay hindi dapat na mas mababa sa bayad sa priyoridad"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Ang pinakamataas na batayang bayad ay mas mataas kaysa kinakailangan"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Ang pinakamataas na batayang bayad ay mababa para sa kasalukuyang mga kundisyon ng network"
-  },
   "editGasMaxFeeHigh": {
     "message": "Ang pinakamataas na bayad ay mas mataas kaysa kinakailangan"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Ang pinakamataas na bayad sa priyoridad ay dapat na mas mataas sa 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Ang bayad sa priyoridad ay dapat na mas mataas sa 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Ang pinakamataas na bayad sa priyoridad ay mas mataas sa kinakailangan. Maaari kang magbayad nang higit sa kinakailangan."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Ang bayad sa priyoridad ay mas mataas sa kinakailangan. Maaari kang magbayad nang higit sa kinakailangan"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Ang pinakamataas na bayad sa priyoridad ay mababa para sa kasalukuyang mga kundisyon ng network"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Ang bayad sa priyoridad ay mababa para sa kasalukuyang mga kundisyon ng network"
-  },
   "editGasPriceTooLow": {
     "message": "Ang presyo ng gas ay dapat na mas mataas sa 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Ang network na ito ay nangangailangan ng field ng “Presyo ng gas” kapag nagsusumite ng transaksyon. Ang presyo ng gas ay ang halaga na babayaran mo kada yunit ng gas."
-  },
-  "editGasTitle": {
-    "message": "I-edit ang priyoridad"
-  },
   "editGasTooLow": {
     "message": "Hindi alam na oras ng pagproseso"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "I-edit ang iminungkahing bayad sa gas"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Ang bayad sa gas na ito ay iminungkahi ng $1. Ang pag-override nito ay maaaring magdulot ng problema sa iyong transaksyon. Mangyaring makipag-ugnayan sa $1 kung mayroon kang mga katanungan.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Gas limit"
   },
-  "gasLimitRecommended": {
-    "message": "Ang inirerekomendang limitasyon ng gas ay $1. Kung mas mababa dito ang limitasyon ng gas, maaaring mabigo."
-  },
   "gasLimitTooLow": {
     "message": "Ang limitasyon ng gas ay dapat na hindi bababa sa 21000"
   },
-  "gasLimitV2": {
-    "message": "Gas limit"
-  },
   "gasPrice": {
     "message": "Presyo ng gas (GWEI)"
   },
@@ -3763,9 +3694,6 @@
     "message": "Hindi nakakonekta ang ledger device. Kung nais mong ikonekta ang iyong Ledger, mangyaring i-click muli ang 'Magpatuloy' at aprubahan ang HID na koneksyon",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "arrow ng level"
-  },
   "lightTheme": {
     "message": "Maliwanag"
   },
@@ -5413,9 +5341,6 @@
     "message": "available",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Available na balanse"
-  },
   "perpsAvailableToClose": {
     "message": "Available para isara"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Market"
   },
-  "perpsMax": {
-    "message": "Pinakamataas"
-  },
-  "perpsMaxRemovable": {
-    "message": "Max na puwedeng alisin"
-  },
   "perpsMid": {
     "message": "Mid"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Posisyon"
   },
-  "perpsPositionSize": {
-    "message": "Laki ng Posisyon"
-  },
   "perpsPositions": {
     "message": "Mga Posisyon"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Pabilisin ang pagkanselang ito"
   },
-  "speedUpExplanation": {
-    "message": "Na-update na namin ang bayad sa gas batay sa kasalukuyang kundisyon ng network at tinaasan namin ito nang hindi bababa sa 10% (hinihingi ng network)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Pabilisin ang transaksyon"
-  },
-  "speedUpTooltipText": {
-    "message": "Bagong bayad sa gas"
-  },
   "speedUpTransactionDescription": {
     "message": "Papalitan ng bayad sa network na ito ang orihinal."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Pinagmumulan ng liquidity"
   },
-  "swapSuggested": {
-    "message": "Iminungkahi ang pag-swap"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Ang mga swap ay kumplikado at sensitibo sa oras na mga transaksyon. Inirerekomenda namin ang bayad sa gas na ito para sa magandang balanse sa pagitan ng halaga at kumpiyansa ng matagumpay na Swap."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Mga token sa koleksyon"
   },
-  "tooltipSatusConnected": {
-    "message": "nakakonekta"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Nakakonekta"
   },
-  "tooltipSatusNotConnected": {
-    "message": "hindi konektado"
-  },
   "total": {
     "message": "Kabuuan"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Pagtuturo"
   },
-  "twelveHrTitle": {
-    "message": "12 oras:"
-  },
   "txAlertTitle": {
     "message": "Ibabalik ang transaksyong ito"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Pabago-bagong presyo ng token"
   },
-  "upArrow": {
-    "message": "arrow pataas"
-  },
   "update": {
     "message": "I-update"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 1d8887e7f54d..cec75788d8a5 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Gelişmiş"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "İşleminiz bloka dahil edildiğinde maks. baz ücretiniz ile gerçek paz ücret arasındaki fark iade edilecektir. Toplam miktar, maks. baz ücret (GWEI'de) * gaz limiti olarak hesaplanacaktır."
-  },
   "advancedDetailsDataDesc": {
     "message": "Veri"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Gelişmiş ağ ücreti"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Bu değerleri $1 ağı için varsayılanım olarak kaydet.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Gelişmiş ağ ücreti"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "gelişmiş izinler"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Maks. öncelik ücreti (başka bir deyişle \"madenci bahşişi\") doğrudan madencilere gider ve işleminizin öncelikli olarak gerçekleştirilmesini teşvik eder."
-  },
   "airDropPatternDescription": {
     "message": "Token'ın zincir içi geçmişi, daha önce şüpheli airdrop faaliyetlerinin olduğu durumları açığa çıkarır."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "İptal"
   },
-  "cancelPopoverTitle": {
-    "message": "İşlemi iptal et"
-  },
   "cancelTransactionDescription": {
     "message": "Bu işlem iptal edilecek ve bu ağ ücreti orijinalinin yerine geçecektir."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Soru $1 / 2"
   },
-  "currentTitle": {
-    "message": "Mevcut:"
-  },
   "currentlyUnavailable": {
     "message": "Bu ağda kullanılamaz"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Önerilen site"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Site (yüksek)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Site"
-  },
   "dappSwapAdvantage": {
     "message": "MetaMask Swaps ile tasarruf et ve kazan"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Tekrar gösterme"
   },
-  "downArrow": {
-    "message": "aşağı ok"
-  },
   "download": {
     "message": "İndir"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Gaz limiti en az $1 olmalıdır"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Gaz limiti en az $1, en fazla $2 olmalıdır",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Gaz limiti, kullanmak istediğiniz maksimum gaz birimidir. Gaz birimleri \"Maks. öncelik ücreti\" ve \"Maks. ücretin\" bir çarpanıdır."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Maks. baz ücret, öncelik ücretinden daha düşük olamaz"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Maks. baz ücret gerekenden daha yüksek"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Maks. baz ücret mevcut ağ koşulları için düşük"
-  },
   "editGasMaxFeeHigh": {
     "message": "Maks. ücret gerekenden daha yüksek"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Maks. öncelik ücreti 0 GWEI üzerinde olmalıdır"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Öncelik ücreti 0'dan fazla olmalıdır."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Maks. öncelik ücreti gerekenden yüksek. Gerekenden fazla ödeme yapabilirsiniz."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Öncelik ücreti gerekenden yüksek. Gerekenden fazla ödeme yapabilirsiniz"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Maks. öncelik ücreti mevcut ağ koşulları için düşük"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Öncelik ücreti mevcut ağ koşulları için düşük"
-  },
   "editGasPriceTooLow": {
     "message": "Gaz fiyatı 0'dan büyük olmalıdır"
   },
-  "editGasPriceTooltip": {
-    "message": "Bu ağ, bir işlem gönderirken bir \"Gaz fiyatı\" alanı gerektirir. Gaz fiyatı, gaz birimi başına ödeyeceğiniz miktardır."
-  },
-  "editGasTitle": {
-    "message": "Önceliği düzenle"
-  },
   "editGasTooLow": {
     "message": "Bilinmeyen işlem süresi"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gaz"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Önerilen gaz ücretini düzenle"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Bu gaz ücreti $1 tarafından önerildi. Bunu geçersiz kılmak işleminizde bir soruna neden olabilir. Sorularınız olursa lütfen $1 adresine ulaşın.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Gaz limiti"
   },
-  "gasLimitRecommended": {
-    "message": "Önerilen gaz limiti $1 kadardır. Gaz limiti bundan daha düşükse işlem başarısız olabilir."
-  },
   "gasLimitTooLow": {
     "message": "Gaz limiti en az 21000 olmalıdır"
   },
-  "gasLimitV2": {
-    "message": "Gaz limiti"
-  },
   "gasPrice": {
     "message": "Gaz fiyatı"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledger cihazı bağlı değil. Kayıt Defterinizi bağlamak istiyorsanız lütfen \"Devam Et\" düğmesine yeniden tıklayın ve HID bağlantısını onaylayın",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "seviye oku"
-  },
   "lightTheme": {
     "message": "Açık"
   },
@@ -5413,9 +5341,6 @@
     "message": "kullanılabilir",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Kullanılabilir bakiye"
-  },
   "perpsAvailableToClose": {
     "message": "Kapatılabilir"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Piyasalar"
   },
-  "perpsMax": {
-    "message": "Maksimum"
-  },
-  "perpsMaxRemovable": {
-    "message": "Maksimum kaldırılabilir"
-  },
   "perpsMid": {
     "message": "Orta"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Pozisyon"
   },
-  "perpsPositionSize": {
-    "message": "Pozisyon Büyüklüğü"
-  },
   "perpsPositions": {
     "message": "Pozisyonlar"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Bu iptal işlemini hızlandır"
   },
-  "speedUpExplanation": {
-    "message": "Mevcut ağ koşullarına göre gaz ücretini güncelledik ve en az %10 artırdık (ağ tarafından gereklidir)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "İşlemi hızlandır"
-  },
-  "speedUpTooltipText": {
-    "message": "Yeni gaz ücreti"
-  },
   "speedUpTransactionDescription": {
     "message": "Bu ağ ücreti orijinalinin yerine geçecektir."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Likidite kaynağı"
   },
-  "swapSuggested": {
-    "message": "Takas önerildi"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Takas işlemleri karmaşık ve zaman hassasiyeti yüksek işlemlerdir. Başarılı bir Takas için maliyet ve güven arasında iyi bir denge için bu gaz ücretini öneririz."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Koleksiyondaki tokenlar"
   },
-  "tooltipSatusConnected": {
-    "message": "bağlandı"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Bağlandı"
   },
-  "tooltipSatusNotConnected": {
-    "message": "bağlanmadı"
-  },
   "total": {
     "message": "Toplam"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Öğretici"
   },
-  "twelveHrTitle": {
-    "message": "12 sa.:"
-  },
   "txAlertTitle": {
     "message": "Bu işlem geri alınacak"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "İstikrarsız token fiyatı"
   },
-  "upArrow": {
-    "message": "yukarı ok"
-  },
   "update": {
     "message": "Güncelle"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 5e0c7d4aac86..510d3d4d6f47 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "Nâng cao"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "Khi các giao dịch của bạn được đưa vào khối, mọi phần chênh lệch giữa phí cơ sở tối đa và phí cơ sở thực tế đều sẽ được hoàn lại. Tổng số tiền sẽ được tính bằng phí cơ sở tối đa (theo GWEI) * hạn mức phí gas."
-  },
   "advancedDetailsDataDesc": {
     "message": "Dữ liệu"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "Phí mạng nâng cao"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "Lưu các giá trị này làm giá trị mặc định cho mạng $1.",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "Phí mạng nâng cao"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "quyền nâng cao"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "Phí ưu tiên (hay còn được gọi là \"tiền thưởng cho thợ đào\") được chuyển trực tiếp cho các thợ đào và khuyến khích họ ưu tiên giao dịch của bạn."
-  },
   "airDropPatternDescription": {
     "message": "Lịch sử trên chuỗi của token cho thấy trước đây đã từng có hoạt động tặng thưởng đáng ngờ."
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "Hủy"
   },
-  "cancelPopoverTitle": {
-    "message": "Hủy giao dịch"
-  },
   "cancelTransactionDescription": {
     "message": "Giao dịch này sẽ bị hủy và phí mạng này sẽ thay thế phí ban đầu."
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "Câu hỏi $1/2"
   },
-  "currentTitle": {
-    "message": "Hiện tại:"
-  },
   "currentlyUnavailable": {
     "message": "Không có sẵn trên mạng này"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "Trang web đề xuất"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "Trang web (cao)"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "Trang web"
-  },
   "dappSwapAdvantage": {
     "message": "Tiết kiệm và kiếm tiền với MetaMask Hoán đổi"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "Không hiển thị lại"
   },
-  "downArrow": {
-    "message": "mũi tên xuống"
-  },
   "download": {
     "message": "Tải xuống"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "Hạn mức phí gas ít nhất phải là $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "Hạn mức phí gas phải lớn hơn $1 và nhỏ hơn $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "Hạn mức phí gas là đơn vị gas tối đa mà bạn sẵn sàng sử dụng. Đơn vị gas là hệ số nhân của \"Phí ưu tiên tối đa\" và \"Phí tối đa\"."
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "Phí cơ sở tối đa không thể thấp hơn phí ưu tiên"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "Phí cơ sở tối đa cao hơn cần thiết"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "Phí cơ sở tối đa thấp so với tình trạng mạng hiện tại"
-  },
   "editGasMaxFeeHigh": {
     "message": "Phí tối đa cao hơn cần thiết"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "Phí ưu tiên tối đa phải lớn hơn 0 GWEI"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "Phí ưu tiên phải lớn hơn 0."
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "Phí ưu tiên tối đa cao hơn cần thiết. Bạn có thể phải trả nhiều hơn mức cần thiết."
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "Phí ưu tiên cao hơn cần thiết. Bạn có thể phải trả nhiều hơn mức cần thiết"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "Phí ưu tiên tối đa thấp so với tình trạng mạng hiện tại"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "Phí ưu tiên thấp so với tình trạng mạng hiện tại"
-  },
   "editGasPriceTooLow": {
     "message": "Giá gas phải lớn hơn 0"
   },
-  "editGasPriceTooltip": {
-    "message": "Mạng này yêu cầu trường \"Giá gas\" khi gửi giao dịch. Giá gas là số tiền bạn sẽ trả cho mỗi đơn vị gas."
-  },
-  "editGasTitle": {
-    "message": "Chỉnh sửa mức ưu tiên"
-  },
   "editGasTooLow": {
     "message": "Thời gian xử lý không xác định"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "Gas"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "Sửa phí gas được đề xuất"
-  },
-  "gasDisplayDappWarning": {
-    "message": "Phí gas này được $1 đề xuất. Việc ghi đè phí gas có thể gây ra sự cố cho giao dịch của bạn. Vui lòng liên hệ $1 nếu bạn có câu hỏi.",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "Hạn mức phí gas"
   },
-  "gasLimitRecommended": {
-    "message": "Giới hạn gas được đề xuất là $1. Có thể dẫn đến kết quả thất bại nếu giới hạn gas thấp hơn."
-  },
   "gasLimitTooLow": {
     "message": "Hạn mức phí gas ít nhất phải là 21000"
   },
-  "gasLimitV2": {
-    "message": "Hạn mức phí gas"
-  },
   "gasPrice": {
     "message": "Giá gas"
   },
@@ -3763,9 +3694,6 @@
     "message": "Thiết bị Ledger chưa được kết nối. Nếu bạn muốn kết nối với Ledger, vui lòng nhấp lại vào \"Tiếp tục\" và chấp thuận kết nối HID",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "mũi tên cấp độ"
-  },
   "lightTheme": {
     "message": "Sáng"
   },
@@ -5413,9 +5341,6 @@
     "message": "khả dụng",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "Số dư khả dụng"
-  },
   "perpsAvailableToClose": {
     "message": "Có sẵn để đóng"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "Thị trường"
   },
-  "perpsMax": {
-    "message": "Tối đa"
-  },
-  "perpsMaxRemovable": {
-    "message": "Mức tối đa có thể rút"
-  },
   "perpsMid": {
     "message": "Giá trung bình"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "Vị thế"
   },
-  "perpsPositionSize": {
-    "message": "Kích thước vị thế"
-  },
   "perpsPositions": {
     "message": "Vị thế"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "Tăng tốc lệnh hủy này"
   },
-  "speedUpExplanation": {
-    "message": "Chúng tôi đã cập nhật phí gas dựa trên tình trạng mạng hiện tại và đã tăng ít nhất 10% (theo yêu cầu của mạng)."
-  },
-  "speedUpPopoverTitle": {
-    "message": "Tăng tốc giao dịch"
-  },
-  "speedUpTooltipText": {
-    "message": "Phí gas mới"
-  },
   "speedUpTransactionDescription": {
     "message": "Phí mạng này sẽ thay thế phí ban đầu."
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "Nguồn thanh khoản"
   },
-  "swapSuggested": {
-    "message": "Hoán đổi gợi ý"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "Hoán đổi là các giao dịch phức tạp và nhạy cảm với thời gian. Chúng tôi đề xuất mức phí gas này để có sự cân bằng tốt giữa chi phí và tỉ lệ Hoán đổi thành công."
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "Token trong bộ sưu tập"
   },
-  "tooltipSatusConnected": {
-    "message": "đã kết nối"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "Đã kết nối"
   },
-  "tooltipSatusNotConnected": {
-    "message": "chưa kết nối"
-  },
   "total": {
     "message": "Tổng cộng"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "Hướng dẫn"
   },
-  "twelveHrTitle": {
-    "message": "12 giờ:"
-  },
   "txAlertTitle": {
     "message": "Giao dịch này sẽ được hoàn tác"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "Giá token không ổn định"
   },
-  "upArrow": {
-    "message": "mũi tên lên"
-  },
   "update": {
     "message": "Cập nhật"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 0c011b70d2d6..7daa17604305 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -389,9 +389,6 @@
   "advanced": {
     "message": "高级"
   },
-  "advancedBaseGasFeeToolTip": {
-    "message": "当您的交易被包含在区块中时，您的最大基础费用与实际基础费用之间的任何差额将被退还。总金额按最大基础费用（以GWEI为单位）*燃料限制计算。"
-  },
   "advancedDetailsDataDesc": {
     "message": "数据"
   },
@@ -407,10 +404,6 @@
   "advancedEIP1559ModalTitle": {
     "message": "高级网络费"
   },
-  "advancedGasFeeDefaultOptIn": {
-    "message": "将这些值保存为 $1 网络的默认值。",
-    "description": "$1 is the current network name."
-  },
   "advancedGasPriceModalTitle": {
     "message": "高级网络费"
   },
@@ -423,9 +416,6 @@
   "advancedPermissionsSmallCase": {
     "message": "高级许可"
   },
-  "advancedPriorityFeeToolTip": {
-    "message": "优先费用（又称“矿工费”）直接向矿工支付，激励他们优先处理您的交易。"
-  },
   "airDropPatternDescription": {
     "message": "该代币的链上历史记录显示，此前存在可疑的空投活动实例。"
   },
@@ -1345,9 +1335,6 @@
   "cancel": {
     "message": "取消"
   },
-  "cancelPopoverTitle": {
-    "message": "取消交易"
-  },
   "cancelTransactionDescription": {
     "message": "这笔交易将被取消，且此网络费用将取代原有费用。"
   },
@@ -1999,9 +1986,6 @@
   "currentQuestion": {
     "message": "问题 $1/2"
   },
-  "currentTitle": {
-    "message": "当前："
-  },
   "currentlyUnavailable": {
     "message": "在此网络上不可用"
   },
@@ -2055,12 +2039,6 @@
   "dappSuggestedHigh": {
     "message": "建议网站"
   },
-  "dappSuggestedHighShortLabel": {
-    "message": "网站（高）"
-  },
-  "dappSuggestedShortLabel": {
-    "message": "网站"
-  },
   "dappSwapAdvantage": {
     "message": "通过 MetaMask Swaps 节省成本并赚取奖励"
   },
@@ -2425,9 +2403,6 @@
   "dontShowThisAgain": {
     "message": "不再显示此内容"
   },
-  "downArrow": {
-    "message": "向下箭头"
-  },
   "download": {
     "message": "下载"
   },
@@ -2520,22 +2495,6 @@
   "editGasLimitOutOfBounds": {
     "message": "燃料上限至少为 $1"
   },
-  "editGasLimitOutOfBoundsV2": {
-    "message": "燃料限制必须大于 $1 且小于 $2",
-    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
-  },
-  "editGasLimitTooltip": {
-    "message": "燃料限制是您愿意使用的最大燃料单位。燃料单位是“最大优先交易费用”和“最大费用”的乘数。"
-  },
-  "editGasMaxBaseFeeGWEIImbalance": {
-    "message": "最大基础费用不能低于优先费用"
-  },
-  "editGasMaxBaseFeeHigh": {
-    "message": "最大基础费用高于必要水平"
-  },
-  "editGasMaxBaseFeeLow": {
-    "message": "对于当前网络条件而言，最大基础费用较低"
-  },
   "editGasMaxFeeHigh": {
     "message": "最大费用高于必要水平"
   },
@@ -2548,30 +2507,15 @@
   "editGasMaxPriorityFeeBelowMinimum": {
     "message": "最大优先费用必须大于0 GWEI。"
   },
-  "editGasMaxPriorityFeeBelowMinimumV2": {
-    "message": "优先费用必须大于0。"
-  },
   "editGasMaxPriorityFeeHigh": {
     "message": "最大优先费用高于必要水平。您可以支付超过所需的费用。"
   },
-  "editGasMaxPriorityFeeHighV2": {
-    "message": "优先费用高于必要水平。您可以支付超过所需的费用"
-  },
   "editGasMaxPriorityFeeLow": {
     "message": "对于当前网络条件而言，最大优先费用较低"
   },
-  "editGasMaxPriorityFeeLowV2": {
-    "message": "对于当前网络条件而言，优先费用较低"
-  },
   "editGasPriceTooLow": {
     "message": "燃料价格必须大于0"
   },
-  "editGasPriceTooltip": {
-    "message": "此网络在提交交易时需要一个“燃料价格”字段。燃料价格是您支付的每单位燃料金额。"
-  },
-  "editGasTitle": {
-    "message": "编辑优先级"
-  },
   "editGasTooLow": {
     "message": "处理时间未知"
   },
@@ -2984,25 +2928,12 @@
   "gas": {
     "message": "燃料"
   },
-  "gasDisplayAcknowledgeDappButtonText": {
-    "message": "编辑建议的燃料费"
-  },
-  "gasDisplayDappWarning": {
-    "message": "这笔燃料费是由 $1 建议的。忽略它可能会导致您的交易出现问题。如果您有疑问，请联系 $1。",
-    "description": "$1 represents the Dapp's origin"
-  },
   "gasLimit": {
     "message": "燃料限额"
   },
-  "gasLimitRecommended": {
-    "message": "建议的燃料限制是$1。如果燃料限制低于此值，则可能会失败。"
-  },
   "gasLimitTooLow": {
     "message": "燃料限制至少为21000"
   },
-  "gasLimitV2": {
-    "message": "燃料上限"
-  },
   "gasPrice": {
     "message": "Gas 价格（GWEI）"
   },
@@ -3763,9 +3694,6 @@
     "message": "Ledger 设备未连接。如果您想要连接您的 Ledger，请再次点击“继续”并批准 HID 连接",
     "description": "An error message shown to the user during the hardware connect flow."
   },
-  "levelArrow": {
-    "message": "水平箭头"
-  },
   "lightTheme": {
     "message": "浅色"
   },
@@ -5413,9 +5341,6 @@
     "message": "可用",
     "description": "is the available balance amount"
   },
-  "perpsAvailableBalance": {
-    "message": "可用余额"
-  },
   "perpsAvailableToClose": {
     "message": "可平仓"
   },
@@ -5577,12 +5502,6 @@
   "perpsMarkets": {
     "message": "市场"
   },
-  "perpsMax": {
-    "message": "最大值"
-  },
-  "perpsMaxRemovable": {
-    "message": "最大可移除金额"
-  },
   "perpsMid": {
     "message": "中间价"
   },
@@ -5636,9 +5555,6 @@
   "perpsPosition": {
     "message": "仓位"
   },
-  "perpsPositionSize": {
-    "message": "仓位规模"
-  },
   "perpsPositions": {
     "message": "头寸"
   },
@@ -7919,15 +7835,6 @@
   "speedUpCancellation": {
     "message": "加速该取消操作"
   },
-  "speedUpExplanation": {
-    "message": "我们根据当前网络条件更新了燃料费用，将其提高了至少10%（网络要求）。"
-  },
-  "speedUpPopoverTitle": {
-    "message": "加速交易"
-  },
-  "speedUpTooltipText": {
-    "message": "新燃料费用"
-  },
   "speedUpTransactionDescription": {
     "message": "此网络费用将取代原有费用。"
   },
@@ -8536,9 +8443,6 @@
   "swapSource": {
     "message": "流动性来源"
   },
-  "swapSuggested": {
-    "message": "建议的交换"
-  },
   "swapSuggestedGasSettingToolTipMessage": {
     "message": "交换是复杂和时间敏感的交易。我们建议使用此燃料费用，以便在成本和成功交换的信心之间保持良好的平衡。"
   },
@@ -8767,15 +8671,9 @@
   "tokensInCollection": {
     "message": "收藏品中的代币"
   },
-  "tooltipSatusConnected": {
-    "message": "已连接"
-  },
   "tooltipSatusConnectedUpperCase": {
     "message": "已连接"
   },
-  "tooltipSatusNotConnected": {
-    "message": "未连接"
-  },
   "total": {
     "message": "共计"
   },
@@ -8964,9 +8862,6 @@
   "tutorial": {
     "message": "教程"
   },
-  "twelveHrTitle": {
-    "message": "12小时："
-  },
   "txAlertTitle": {
     "message": "该交易将撤销"
   },
@@ -9053,9 +8948,6 @@
   "unstableTokenPriceTitle": {
     "message": "代币价格不稳定"
   },
-  "upArrow": {
-    "message": "向上箭头"
-  },
   "update": {
     "message": "更新"
   },
diff --git a/app/images/riv_animations/spinner_loader_with_states.riv b/app/images/riv_animations/spinner_loader_with_states.riv
new file mode 100644
index 000000000000..685d74e13381
Binary files /dev/null and b/app/images/riv_animations/spinner_loader_with_states.riv differ
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 215f4c9cd8b7..267fe4e676ec 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -12,6 +12,7 @@ import { persistenceManager } from './lib/setup-initial-state-hooks';
 // Import this very early, so globalThis.INFURA_PROJECT_ID_FROM_MANIFEST_FLAGS is always defined
 import '../../shared/constants/infura-project-id';
 
+import { lightTheme } from '@metamask/design-tokens';
 import { finished } from 'readable-stream';
 import log from 'loglevel';
 import browser from 'webextension-polyfill';
@@ -113,6 +114,7 @@ const lazyListener =
 
 // eslint-disable-next-line @metamask/design-tokens/color-no-hex
 const BADGE_COLOR_APPROVAL = '#0376C9';
+const BADGE_COLOR_FAILED = lightTheme.colors.error.default;
 const BADGE_MAX_COUNT = 9;
 
 const inTest = process.env.IN_TEST;
@@ -180,6 +182,7 @@ let openPopupCount = 0;
 let notificationIsOpen = false;
 let uiIsTriggering = false;
 let openSidePanelCount = 0;
+let failedTxCount = 0;
 const openMetamaskTabsIDs = {};
 const requestAccountTabIds = {};
 let controller;
@@ -668,7 +671,6 @@ function saveTimestamp() {
  * @property {object} marketData - A map from chain ID -> contract address -> an object containing the token's market data.
  * @property {Array} tokens - Tokens held by the current user, including their balances.
  * @property {object} send - TODO: Document
- * @property {boolean} useBlockie - Indicates preferred user identicon format. True for blockie, false for Jazzicon.
  * @property {object} featureFlags - An object for optional feature flags.
  * @property {boolean} welcomeScreen - True if welcome screen should be shown.
  * @property {string} currentLocale - A locale string matching the user's preferred display language.
@@ -1629,6 +1631,7 @@ export function setupController(
       updateRemoteFeatureFlags(controller);
 
       if (processName === ENVIRONMENT_TYPE_POPUP) {
+        clearFailedTxBadge();
         openPopupCount += 1;
         finished(portStream, () => {
           openPopupCount -= 1;
@@ -1639,6 +1642,7 @@ export function setupController(
       }
 
       if (processName === ENVIRONMENT_TYPE_SIDEPANEL) {
+        clearFailedTxBadge();
         openSidePanelCount += 1;
         // Refresh appActiveTab when sidepanel opens to ensure it has the current tab info
         // This handles the case where user connected to dapp while sidepanel was closed
@@ -1823,6 +1827,53 @@ export function setupController(
     updateBadge,
   );
 
+  controller.controllerMessenger.subscribe(
+    'TransactionController:transactionFailed',
+    onTransactionFailed,
+  );
+
+  controller.controllerMessenger.subscribe(
+    'TransactionController:transactionDropped',
+    onTransactionFailed,
+  );
+
+  function onTransactionFailed() {
+    failedTxCount += 1;
+    const popupFile = isFirefox ? 'popup.html' : 'popup-init.html';
+    try {
+      if (isManifestV3) {
+        browser.action.setPopup({ popup: `${popupFile}?tab=activity` });
+        browser.sidePanel?.setOptions?.({
+          path: 'sidepanel.html?tab=activity',
+        });
+      } else {
+        browser.browserAction.setPopup({ popup: `${popupFile}?tab=activity` });
+      }
+    } catch (e) {
+      console.error('Error setting failed tx badge popup:', e);
+    }
+    updateBadge();
+  }
+
+  function clearFailedTxBadge() {
+    if (!failedTxCount) {
+      return;
+    }
+    failedTxCount = 0;
+    const popupFile = isFirefox ? 'popup.html' : 'popup-init.html';
+    try {
+      if (isManifestV3) {
+        browser.action.setPopup({ popup: popupFile });
+        browser.sidePanel?.setOptions?.({ path: 'sidepanel.html' });
+      } else {
+        browser.browserAction.setPopup({ popup: popupFile });
+      }
+    } catch (e) {
+      console.error('Error clearing failed tx badge popup:', e);
+    }
+    updateBadge();
+  }
+
   /**
    * Formats a count for display as a badge label.
    *
@@ -1842,10 +1893,13 @@ export function setupController(
     const pendingApprovalCount = getPendingApprovalCount();
 
     let label = '';
-    const badgeColor = BADGE_COLOR_APPROVAL;
+    let badgeColor = BADGE_COLOR_APPROVAL;
 
     if (pendingApprovalCount) {
       label = getBadgeLabel(pendingApprovalCount, BADGE_MAX_COUNT);
+    } else if (failedTxCount) {
+      label = getBadgeLabel(failedTxCount, BADGE_MAX_COUNT);
+      badgeColor = BADGE_COLOR_FAILED;
     }
 
     try {
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index ef3dbc2adfa3..76f7ad4623dc 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -1,25 +1,26 @@
-import { AllProperties } from '../../../shared/lib/object.utils';
+import {
+  AllProperties,
+  type ObjectMask,
+} from '../../../shared/lib/object.utils';
 
-type SentryMaskValue =
-  | boolean
-  | { [key: string | symbol]: SentryMaskValue }
-  | SentryMaskValue[];
+/**
+ * Sentry “state” here means **masks** passed to `maskObject` (see
+ * `shared/lib/object.utils.ts`), not typed Redux or controller snapshots.
+ *
+ * Mask semantics match `ObjectMask`: `true` copies the value; `false` or `[]` replaces
+ * leaves with `typeof` strings; nested objects recurse; `[AllProperties]` masks dynamic keys.
+ *
+ * `SENTRY_BACKGROUND_STATE` is one mask per background controller (persisted / pre-init
+ * context in `setup-initial-state-hooks`). `SENTRY_UI_STATE` is the Redux root mask for
+ * the UI bundle; `metamask` merges flattened controller masks (not UI-only despite the name).
+ */
+type SentryBackgroundControllerMasks = Record<string, ObjectMask>;
 
-type StrictSentryMaskObject = {
-  [key: string]: SentryMaskValue;
-  [key: symbol]: never;
+type SentryReduxRootMask = ObjectMask & {
+  metamask: ObjectMask;
 };
 
-type SentryBackgroundStateMask = Record<string, StrictSentryMaskObject>;
-
-type SentryUiStateMask = StrictSentryMaskObject & {
-  metamask: StrictSentryMaskObject;
-};
-
-// This describes the subset of background controller state attached to errors
-// sent to Sentry These properties have some potential to be useful for
-// debugging, and they do not contain any identifiable information.
-export const SENTRY_BACKGROUND_STATE: SentryBackgroundStateMask = {
+export const SENTRY_BACKGROUND_STATE: SentryBackgroundControllerMasks = {
   AccountTreeController: {
     accountTree: false,
   },
@@ -275,7 +276,6 @@ export const SENTRY_BACKGROUND_STATE: SentryBackgroundStateMask = {
     addressSecurityAlertResponses: false,
     use4ByteResolution: true,
     useAddressBarEnsResolution: true,
-    useBlockie: true,
     useCurrencyRateCheck: true,
     useMultiAccountBalanceChecker: true,
     useNftDetection: true,
@@ -333,7 +333,7 @@ export const SENTRY_BACKGROUND_STATE: SentryBackgroundStateMask = {
   SnapInsightsController: {
     insights: false,
   },
-  SnapsRegistry: {
+  SnapRegistryController: {
     database: false,
     lastUpdated: false,
     databaseUnavailable: false,
@@ -388,7 +388,7 @@ export const SENTRY_BACKGROUND_STATE: SentryBackgroundStateMask = {
   },
 };
 
-const flattenedBackgroundStateMask: StrictSentryMaskObject = {};
+const flattenedBackgroundStateMask: ObjectMask = {};
 
 for (const controllerState of Object.values(SENTRY_BACKGROUND_STATE)) {
   // Copy only string keys to avoid leaking symbol-only wildcard masks into
@@ -399,10 +399,7 @@ for (const controllerState of Object.values(SENTRY_BACKGROUND_STATE)) {
   }
 }
 
-// This describes the subset of Redux state attached to errors sent to Sentry
-// These properties have some potential to be useful for debugging, and they do
-// not contain any identifiable information.
-export const SENTRY_UI_STATE: SentryUiStateMask = {
+export const SENTRY_UI_STATE: SentryReduxRootMask = {
   gas: true,
   history: true,
   appState: {
diff --git a/app/scripts/controller-init/bridge-controller-init.test.ts b/app/scripts/controller-init/bridge-controller-init.test.ts
index d3d718ed2e70..6669edda5d42 100644
--- a/app/scripts/controller-init/bridge-controller-init.test.ts
+++ b/app/scripts/controller-init/bridge-controller-init.test.ts
@@ -1,11 +1,13 @@
-import { BridgeController } from '@metamask/bridge-controller';
+import {
+  BridgeController,
+  BridgeControllerMessenger,
+} from '@metamask/bridge-controller';
 import { BRIDGE_API_BASE_URL } from '../../../shared/constants/bridge';
 import { getRootMessenger } from '../lib/messenger';
 import { ControllerInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
 import {
   getBridgeControllerMessenger,
-  BridgeControllerMessenger,
   getBridgeControllerInitMessenger,
   BridgeControllerInitMessenger,
 } from './messengers';
diff --git a/app/scripts/controller-init/bridge-controller-init.ts b/app/scripts/controller-init/bridge-controller-init.ts
index e60792f90914..124b42befa32 100644
--- a/app/scripts/controller-init/bridge-controller-init.ts
+++ b/app/scripts/controller-init/bridge-controller-init.ts
@@ -1,6 +1,7 @@
 import {
   BridgeClientId,
   BridgeController,
+  BridgeControllerMessenger,
   UNIFIED_SWAP_BRIDGE_EVENT_CATEGORY,
 } from '@metamask/bridge-controller';
 import { handleFetch, HttpError } from '@metamask/controller-utils';
@@ -11,10 +12,7 @@ import fetchWithCache from '../../../shared/lib/fetch-with-cache';
 import { MINUTE, SECOND } from '../../../shared/constants/time';
 import { getEnvironmentType } from '../lib/util';
 import { ControllerInitFunction } from './types';
-import {
-  BridgeControllerInitMessenger,
-  BridgeControllerMessenger,
-} from './messengers';
+import { BridgeControllerInitMessenger } from './messengers';
 
 /**
  * Initialize the bridge controller.
diff --git a/app/scripts/controller-init/bridge-status-controller-init.test.ts b/app/scripts/controller-init/bridge-status-controller-init.test.ts
index ba77d63dcfa4..ccb5ee030196 100644
--- a/app/scripts/controller-init/bridge-status-controller-init.test.ts
+++ b/app/scripts/controller-init/bridge-status-controller-init.test.ts
@@ -1,13 +1,13 @@
-import { BridgeStatusController } from '@metamask/bridge-status-controller';
+import {
+  BridgeStatusController,
+  BridgeStatusControllerMessenger,
+} from '@metamask/bridge-status-controller';
 import { TransactionController } from '@metamask/transaction-controller';
 import { BRIDGE_API_BASE_URL } from '../../../shared/constants/bridge';
 import { getRootMessenger } from '../lib/messenger';
 import { ControllerInitRequest, ControllerName } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
-import {
-  getBridgeStatusControllerMessenger,
-  BridgeStatusControllerMessenger,
-} from './messengers';
+import { getBridgeStatusControllerMessenger } from './messengers';
 import { BridgeStatusControllerInit } from './bridge-status-controller-init';
 
 jest.mock('@metamask/bridge-status-controller');
@@ -43,10 +43,7 @@ describe('BridgeStatusControllerInit', () => {
       config: {
         customBridgeApiBaseUrl: BRIDGE_API_BASE_URL,
       },
-      addTransactionFn: expect.any(Function),
       addTransactionBatchFn: expect.any(Function),
-      updateTransactionFn: expect.any(Function),
-      estimateGasFeeFn: expect.any(Function),
       fetchFn: expect.any(Function),
       traceFn: expect.any(Function),
     });
diff --git a/app/scripts/controller-init/bridge-status-controller-init.ts b/app/scripts/controller-init/bridge-status-controller-init.ts
index 873ab3f7fe6f..5b108e44e6c3 100644
--- a/app/scripts/controller-init/bridge-status-controller-init.ts
+++ b/app/scripts/controller-init/bridge-status-controller-init.ts
@@ -1,11 +1,13 @@
-import { BridgeStatusController } from '@metamask/bridge-status-controller';
+import {
+  BridgeStatusController,
+  BridgeStatusControllerMessenger,
+} from '@metamask/bridge-status-controller';
 import { handleFetch } from '@metamask/controller-utils';
 import { BridgeClientId } from '@metamask/bridge-controller';
 import { trace } from '../../../shared/lib/trace';
 import { BRIDGE_API_BASE_URL } from '../../../shared/constants/bridge';
 import { accountSupports7702 } from '../lib/account-supports-7702';
 import { ControllerInitFunction } from './types';
-import { BridgeStatusControllerMessenger } from './messengers';
 
 /**
  * Initialize the bridge status controller.
@@ -33,8 +35,6 @@ export const BridgeStatusControllerInit: ControllerInitFunction<
         ...requestOptions,
       });
     },
-    addTransactionFn: (...args) =>
-      transactionController.addTransaction(...args),
     addTransactionBatchFn: async (request, ...rest) => {
       const supports7702 = await accountSupports7702(
         request.from,
@@ -54,10 +54,6 @@ export const BridgeStatusControllerInit: ControllerInitFunction<
       }
       return transactionController.addTransactionBatch(request, ...rest);
     },
-    estimateGasFeeFn: (...args) =>
-      transactionController.estimateGasFee(...args),
-    updateTransactionFn: (...args) =>
-      transactionController.updateTransaction(...args),
 
     config: {
       customBridgeApiBaseUrl: BRIDGE_API_BASE_URL,
diff --git a/app/scripts/controller-init/controller-list.ts b/app/scripts/controller-init/controller-list.ts
index b2419fd8a324..fdfe39ae80c2 100644
--- a/app/scripts/controller-init/controller-list.ts
+++ b/app/scripts/controller-init/controller-list.ts
@@ -36,11 +36,11 @@ import { MultichainTransactionsController } from '@metamask/multichain-transacti
 import {
   CronjobController,
   ExecutionService,
-  JsonSnapsRegistry,
-  MultichainRouter,
+  MultichainRoutingService,
   SnapController,
   SnapInsightsController,
   SnapInterfaceController,
+  SnapRegistryController,
   WebSocketService,
 } from '@metamask/snaps-controllers';
 import {
@@ -71,7 +71,6 @@ import { PermissionLogController } from '@metamask/permission-log-controller';
 import { AnnouncementController } from '@metamask/announcement-controller';
 import { PhishingController } from '@metamask/phishing-controller';
 import { LoggingController } from '@metamask/logging-controller';
-import { ErrorReportingService } from '@metamask/error-reporting-service';
 import { StorageService } from '@metamask/storage-service';
 import { AddressBookController } from '@metamask/address-book-controller';
 import {
@@ -139,12 +138,10 @@ export type Controller =
   | EncryptionPublicKeyController
   | EncryptionPublicKeyManager
   | EnsController
-  | ErrorReportingService
   | StorageService
   | ExecutionService
   | GasFeeController
   | GatorPermissionsController
-  | JsonSnapsRegistry
   | KeyringController
   | LoggingController
   | MetaMetricsController
@@ -154,7 +151,7 @@ export type Controller =
   | MultichainBalancesController
   | MultichainTransactionsController
   | MultichainNetworkController
-  | MultichainRouter
+  | MultichainRoutingService
   | NameController
   | NetworkController
   | NetworkOrderController
@@ -185,6 +182,7 @@ export type Controller =
   | SnapInterfaceController
   | SnapInsightsController
   | SnapKeyringBuilder
+  | SnapRegistryController
   | SubscriptionController
   | SnapsNameProvider
   | SubjectMetadataController
@@ -241,7 +239,6 @@ export type ControllerFlatState = AccountOrderController['state'] &
   EnsController['state'] &
   GasFeeController['state'] &
   GatorPermissionsController['state'] &
-  JsonSnapsRegistry['state'] &
   KeyringController['state'] &
   LoggingController['state'] &
   MetaMetricsController['state'] &
@@ -275,6 +272,7 @@ export type ControllerFlatState = AccountOrderController['state'] &
   SnapController['state'] &
   SnapInsightsController['state'] &
   SnapInterfaceController['state'] &
+  SnapRegistryController['state'] &
   SubscriptionController['state'] &
   TokenBalancesController['state'] &
   TokenDetectionController['state'] &
diff --git a/app/scripts/controller-init/error-reporting-service-init.test.ts b/app/scripts/controller-init/error-reporting-service-init.test.ts
deleted file mode 100644
index 004b8938cda7..000000000000
--- a/app/scripts/controller-init/error-reporting-service-init.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ErrorReportingService } from '@metamask/error-reporting-service';
-import { getRootMessenger } from '../lib/messenger';
-import { ControllerInitRequest } from './types';
-import { buildControllerInitRequestMock } from './test/utils';
-import {
-  getErrorReportingServiceMessenger,
-  ErrorReportingServiceMessenger,
-} from './messengers';
-import { ErrorReportingServiceInit } from './error-reporting-service-init';
-
-jest.mock('@metamask/error-reporting-service');
-
-function getInitRequestMock(): jest.Mocked<
-  ControllerInitRequest<ErrorReportingServiceMessenger>
-> {
-  const baseMessenger = getRootMessenger<never, never>();
-
-  const requestMock = {
-    ...buildControllerInitRequestMock(),
-    controllerMessenger: getErrorReportingServiceMessenger(baseMessenger),
-    initMessenger: undefined,
-  };
-
-  return requestMock;
-}
-
-describe('ErrorReportingServiceInit', () => {
-  it('initializes the controller', () => {
-    const { controller } = ErrorReportingServiceInit(getInitRequestMock());
-    expect(controller).toBeInstanceOf(ErrorReportingService);
-  });
-
-  it('passes the proper arguments to the controller', () => {
-    ErrorReportingServiceInit(getInitRequestMock());
-
-    const controllerMock = jest.mocked(ErrorReportingService);
-    expect(controllerMock).toHaveBeenCalledWith({
-      messenger: expect.any(Object),
-      captureException: expect.any(Function),
-    });
-  });
-});
diff --git a/app/scripts/controller-init/error-reporting-service-init.ts b/app/scripts/controller-init/error-reporting-service-init.ts
deleted file mode 100644
index b27dfc2dabee..000000000000
--- a/app/scripts/controller-init/error-reporting-service-init.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ErrorReportingService } from '@metamask/error-reporting-service';
-import { captureException } from '../../../shared/lib/sentry';
-import { ControllerInitFunction } from './types';
-import { ErrorReportingServiceMessenger } from './messengers';
-
-/**
- * Initialize the error reporting service.
- *
- * @param request - The request object.
- * @param request.controllerMessenger - The messenger to use for the service.
- * @returns The initialized controller.
- */
-export const ErrorReportingServiceInit: ControllerInitFunction<
-  ErrorReportingService,
-  ErrorReportingServiceMessenger
-> = ({ controllerMessenger }) => {
-  const controller = new ErrorReportingService({
-    messenger: controllerMessenger,
-    captureException,
-  });
-
-  return {
-    persistedStateKey: null,
-    memStateKey: null,
-    controller,
-  };
-};
diff --git a/app/scripts/controller-init/messengers/accounts/account-tree-controller-messenger.ts b/app/scripts/controller-init/messengers/accounts/account-tree-controller-messenger.ts
index e0900a0c6d06..d1fba75ab875 100644
--- a/app/scripts/controller-init/messengers/accounts/account-tree-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/accounts/account-tree-controller-messenger.ts
@@ -1,6 +1,6 @@
 import {
-  AccountsControllerAccountAddedEvent,
-  AccountsControllerAccountRemovedEvent,
+  AccountsControllerAccountsAddedEvent,
+  AccountsControllerAccountsRemovedEvent,
   AccountsControllerGetAccountAction,
   AccountsControllerGetSelectedMultichainAccountAction,
   AccountsControllerListMultichainAccountsAction,
@@ -12,10 +12,11 @@ import {
   AuthenticationController,
   UserStorageController,
 } from '@metamask/profile-sync-controller';
-import { GetSnap as SnapControllerGet } from '@metamask/snaps-controllers';
+import { SnapControllerGetSnapAction } from '@metamask/snaps-controllers';
 import { KeyringControllerGetStateAction } from '@metamask/keyring-controller';
 import {
   MultichainAccountServiceCreateMultichainAccountGroupAction,
+  MultichainAccountServiceCreateMultichainAccountGroupsAction,
   MultichainAccountServiceWalletStatusChangeEvent,
 } from '@metamask/multichain-account-service';
 import type { AccountTreeControllerMessenger as AccountTreeControllerMessengerType } from '@metamask/account-tree-controller';
@@ -28,7 +29,7 @@ type Actions =
   | AccountsControllerGetSelectedMultichainAccountAction
   | AccountsControllerSetSelectedAccountAction
   | AccountsControllerListMultichainAccountsAction
-  | SnapControllerGet
+  | SnapControllerGetSnapAction
   | KeyringControllerGetStateAction
   | UserStorageController.UserStorageControllerGetStateAction
   | UserStorageController.UserStorageControllerPerformGetStorageAction
@@ -36,11 +37,12 @@ type Actions =
   | UserStorageController.UserStorageControllerPerformSetStorageAction
   | UserStorageController.UserStorageControllerPerformBatchSetStorageAction
   | AuthenticationController.AuthenticationControllerGetSessionProfileAction
-  | MultichainAccountServiceCreateMultichainAccountGroupAction;
+  | MultichainAccountServiceCreateMultichainAccountGroupAction
+  | MultichainAccountServiceCreateMultichainAccountGroupsAction;
 
 type Events =
-  | AccountsControllerAccountAddedEvent
-  | AccountsControllerAccountRemovedEvent
+  | AccountsControllerAccountsAddedEvent
+  | AccountsControllerAccountsRemovedEvent
   | AccountsControllerSelectedAccountChangeEvent
   | UserStorageController.UserStorageControllerStateChangeEvent
   | MultichainAccountServiceWalletStatusChangeEvent;
@@ -69,8 +71,8 @@ export function getAccountTreeControllerMessenger(
   messenger.delegate({
     messenger: accountTreeControllerMessenger,
     events: [
-      'AccountsController:accountAdded',
-      'AccountsController:accountRemoved',
+      'AccountsController:accountsAdded',
+      'AccountsController:accountsRemoved',
       'AccountsController:selectedAccountChange',
       'UserStorageController:stateChange',
       'MultichainAccountService:walletStatusChange',
@@ -87,7 +89,8 @@ export function getAccountTreeControllerMessenger(
       'UserStorageController:performBatchSetStorage',
       'AuthenticationController:getSessionProfile',
       'MultichainAccountService:createMultichainAccountGroup',
-      'SnapController:get',
+      'MultichainAccountService:createMultichainAccountGroups',
+      'SnapController:getSnap',
       'KeyringController:getState',
     ],
   });
diff --git a/app/scripts/controller-init/messengers/accounts/institutional-snap-controller-messenger.ts b/app/scripts/controller-init/messengers/accounts/institutional-snap-controller-messenger.ts
index b7796cdb6e37..4ac921093d7d 100644
--- a/app/scripts/controller-init/messengers/accounts/institutional-snap-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/accounts/institutional-snap-controller-messenger.ts
@@ -1,6 +1,6 @@
 import { AccountsControllerGetAccountByAddressAction } from '@metamask/accounts-controller';
 import { Messenger } from '@metamask/messenger';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { TransactionControllerUpdateCustodialTransactionAction } from '@metamask/transaction-controller';
 import { InstitutionalSnapController } from '../../../controllers/institutional-snap/InstitutionalSnapController';
 import { RootMessenger } from '../../../lib/messenger';
@@ -27,7 +27,7 @@ export type InstitutionalSnapRequestSearchParameters = {
 };
 
 type AllowedActions =
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | AccountsControllerGetAccountByAddressAction
   | TransactionControllerUpdateCustodialTransactionAction;
 
diff --git a/app/scripts/controller-init/messengers/accounts/multichain-account-service-messenger.ts b/app/scripts/controller-init/messengers/accounts/multichain-account-service-messenger.ts
index 9c594ded8a35..5880dcc0e0a5 100644
--- a/app/scripts/controller-init/messengers/accounts/multichain-account-service-messenger.ts
+++ b/app/scripts/controller-init/messengers/accounts/multichain-account-service-messenger.ts
@@ -3,13 +3,14 @@ import {
   AccountsControllerAccountAddedEvent,
   AccountsControllerAccountRemovedEvent,
   AccountsControllerGetAccountAction,
+  AccountsControllerGetAccountsAction,
   AccountsControllerGetAccountByAddressAction,
   AccountsControllerListMultichainAccountsAction,
 } from '@metamask/accounts-controller';
 import {
   SnapControllerStateChangeEvent,
   SnapControllerGetStateAction,
-  HandleSnapRequest as SnapControllerHandleRequestAction,
+  SnapControllerHandleRequestAction,
 } from '@metamask/snaps-controllers';
 import {
   KeyringControllerWithKeyringAction,
@@ -37,6 +38,7 @@ import { RootMessenger } from '../../../lib/messenger';
 type Actions =
   | AccountsControllerListMultichainAccountsAction
   | AccountsControllerGetAccountAction
+  | AccountsControllerGetAccountsAction
   | AccountsControllerGetAccountByAddressAction
   | SnapControllerGetStateAction
   | SnapControllerHandleRequestAction
@@ -93,6 +95,7 @@ export function getMultichainAccountServiceMessenger(
       'AccountsController:listMultichainAccounts',
       'AccountsController:getAccountByAddress',
       'AccountsController:getAccount',
+      'AccountsController:getAccounts',
       'SnapController:getState',
       'SnapController:handleRequest',
       'KeyringController:getState',
diff --git a/app/scripts/controller-init/messengers/accounts/snap-keyring-builder-messenger.ts b/app/scripts/controller-init/messengers/accounts/snap-keyring-builder-messenger.ts
index 865e550ee900..06feac1e1157 100644
--- a/app/scripts/controller-init/messengers/accounts/snap-keyring-builder-messenger.ts
+++ b/app/scripts/controller-init/messengers/accounts/snap-keyring-builder-messenger.ts
@@ -46,7 +46,7 @@ export function getSnapKeyringBuilderMessenger(
       'AccountsController:setAccountName',
       'AccountsController:listMultichainAccounts',
       'SnapController:handleRequest',
-      'SnapController:get',
+      'SnapController:getSnap',
       'SnapController:isMinimumPlatformVersion',
       'PreferencesController:getState',
       'RemoteFeatureFlagController:getState',
diff --git a/app/scripts/controller-init/messengers/assets/assets-controller-messenger.ts b/app/scripts/controller-init/messengers/assets/assets-controller-messenger.ts
index 51138a39143d..f27a148c2e79 100644
--- a/app/scripts/controller-init/messengers/assets/assets-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/assets/assets-controller-messenger.ts
@@ -24,8 +24,8 @@ import type {
   PermissionControllerStateChange,
 } from '@metamask/permission-controller';
 import type {
-  GetRunnableSnaps,
-  HandleSnapRequest,
+  SnapControllerGetRunnableSnapsAction,
+  SnapControllerHandleRequestAction,
 } from '@metamask/snaps-controllers';
 import { AuthenticationControllerGetBearerTokenAction } from '@metamask/profile-sync-controller/auth';
 import { RootMessenger } from '../../../lib/messenger';
@@ -141,8 +141,8 @@ type AccountsControllerAccountBalancesUpdatedEvent = {
  * @see SnapDataSource in @metamask/assets-controller
  */
 type SnapDataSourceActions =
-  | GetRunnableSnaps
-  | HandleSnapRequest
+  | SnapControllerGetRunnableSnapsAction
+  | SnapControllerHandleRequestAction
   | GetPermissions;
 
 /**
@@ -262,7 +262,7 @@ type PreferencesControllerGetStateAction = {
  */
 type AllowedInitializationActions =
   | AuthenticationControllerGetBearerTokenAction
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | PreferencesControllerGetStateAction;
 
 /**
diff --git a/app/scripts/controller-init/messengers/bridge-controller-messenger.ts b/app/scripts/controller-init/messengers/bridge-controller-messenger.ts
index b99c44d7512a..c3a3b206bc20 100644
--- a/app/scripts/controller-init/messengers/bridge-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/bridge-controller-messenger.ts
@@ -1,35 +1,12 @@
-import { Messenger } from '@metamask/messenger';
-import type { AccountsControllerGetAccountByAddressAction } from '@metamask/accounts-controller';
-import type {
-  GetCurrencyRateState,
-  MultichainAssetsRatesControllerGetStateAction,
-  TokenRatesControllerGetStateAction,
-} from '@metamask/assets-controllers';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
-import type { AuthenticationControllerGetBearerTokenAction } from '@metamask/profile-sync-controller/auth';
-import type {
-  NetworkControllerFindNetworkClientIdByChainIdAction,
-  NetworkControllerGetNetworkClientByIdAction,
-} from '@metamask/network-controller';
-import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
+import {
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { BridgeControllerMessenger } from '@metamask/bridge-controller';
 import { MetaMetricsControllerTrackEventAction } from '../../controllers/metametrics-controller';
 import { RootMessenger } from '../../lib/messenger';
 
-type AllowedActions =
-  | AccountsControllerGetAccountByAddressAction
-  | GetCurrencyRateState
-  | TokenRatesControllerGetStateAction
-  | MultichainAssetsRatesControllerGetStateAction
-  | HandleSnapRequest
-  | NetworkControllerFindNetworkClientIdByChainIdAction
-  | NetworkControllerGetNetworkClientByIdAction
-  | RemoteFeatureFlagControllerGetStateAction
-  | AuthenticationControllerGetBearerTokenAction;
-
-export type BridgeControllerMessenger = ReturnType<
-  typeof getBridgeControllerMessenger
->;
-
 /**
  * Create a messenger restricted to the allowed actions and events of the
  * bridge controller.
@@ -38,14 +15,12 @@ export type BridgeControllerMessenger = ReturnType<
  * messenger.
  */
 export function getBridgeControllerMessenger(
-  messenger: RootMessenger<AllowedActions, never>,
+  messenger: RootMessenger<
+    MessengerActions<BridgeControllerMessenger>,
+    MessengerEvents<BridgeControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'BridgeController',
-    AllowedActions,
-    never,
-    typeof messenger
-  >({
+  const controllerMessenger: BridgeControllerMessenger = new Messenger({
     namespace: 'BridgeController',
     parent: messenger,
   });
diff --git a/app/scripts/controller-init/messengers/bridge-status-controller-messenger.ts b/app/scripts/controller-init/messengers/bridge-status-controller-messenger.ts
index e59a650b1bb6..328bd70412eb 100644
--- a/app/scripts/controller-init/messengers/bridge-status-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/bridge-status-controller-messenger.ts
@@ -1,50 +1,11 @@
-import { Messenger } from '@metamask/messenger';
-import type { AccountsControllerGetAccountByAddressAction } from '@metamask/accounts-controller';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
-import type { KeyringControllerSignTypedMessageAction } from '@metamask/keyring-controller';
-import type {
-  NetworkControllerFindNetworkClientIdByChainIdAction,
-  NetworkControllerGetNetworkClientByIdAction,
-  NetworkControllerGetStateAction,
-} from '@metamask/network-controller';
-import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
 import {
-  type TransactionControllerGetStateAction,
-  type TransactionControllerIsAtomicBatchSupportedAction,
-  TransactionControllerTransactionConfirmedEvent,
-  TransactionControllerTransactionFailedEvent,
-} from '@metamask/transaction-controller';
-import type {
-  BridgeBackgroundAction,
-  BridgeControllerAction,
-} from '@metamask/bridge-controller';
-import type { GetGasFeeState } from '@metamask/gas-fee-controller';
-import type { AuthenticationControllerGetBearerTokenAction } from '@metamask/profile-sync-controller/auth';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { BridgeStatusControllerMessenger } from '@metamask/bridge-status-controller';
 import { RootMessenger } from '../../lib/messenger';
 
-type AllowedActions =
-  | NetworkControllerFindNetworkClientIdByChainIdAction
-  | NetworkControllerGetStateAction
-  | NetworkControllerGetNetworkClientByIdAction
-  | HandleSnapRequest
-  | TransactionControllerGetStateAction
-  | TransactionControllerIsAtomicBatchSupportedAction
-  | BridgeControllerAction<BridgeBackgroundAction.TRACK_METAMETRICS_EVENT>
-  | BridgeControllerAction<BridgeBackgroundAction.STOP_POLLING_FOR_QUOTES>
-  | GetGasFeeState
-  | AccountsControllerGetAccountByAddressAction
-  | RemoteFeatureFlagControllerGetStateAction
-  | KeyringControllerSignTypedMessageAction
-  | AuthenticationControllerGetBearerTokenAction;
-
-type AllowedEvents =
-  | TransactionControllerTransactionFailedEvent
-  | TransactionControllerTransactionConfirmedEvent;
-
-export type BridgeStatusControllerMessenger = ReturnType<
-  typeof getBridgeStatusControllerMessenger
->;
-
 /**
  * Create a messenger restricted to the allowed actions and events of the
  * bridge status controller.
@@ -53,21 +14,21 @@ export type BridgeStatusControllerMessenger = ReturnType<
  * messenger.
  */
 export function getBridgeStatusControllerMessenger(
-  messenger: RootMessenger<AllowedActions, AllowedEvents>,
+  messenger: RootMessenger<
+    MessengerActions<BridgeStatusControllerMessenger>,
+    MessengerEvents<BridgeStatusControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'BridgeStatusController',
-    AllowedActions,
-    AllowedEvents,
-    typeof messenger
-  >({
+  const controllerMessenger: BridgeStatusControllerMessenger = new Messenger({
     namespace: 'BridgeStatusController',
     parent: messenger,
   });
+
   messenger.delegate({
     messenger: controllerMessenger,
     actions: [
       'AccountsController:getAccountByAddress',
+      'AuthenticationController:getBearerToken',
       'NetworkController:getNetworkClientById',
       'NetworkController:findNetworkClientIdByChainId',
       'NetworkController:getState',
@@ -78,8 +39,9 @@ export function getBridgeStatusControllerMessenger(
       'SnapController:handleRequest',
       'TransactionController:getState',
       'TransactionController:isAtomicBatchSupported',
-      'RemoteFeatureFlagController:getState',
-      'AuthenticationController:getBearerToken',
+      'TransactionController:addTransaction',
+      'TransactionController:estimateGasFee',
+      'TransactionController:updateTransaction',
     ],
     events: [
       'TransactionController:transactionFailed',
diff --git a/app/scripts/controller-init/messengers/error-reporting-service-messenger.test.ts b/app/scripts/controller-init/messengers/error-reporting-service-messenger.test.ts
deleted file mode 100644
index cdcf2fe707a0..000000000000
--- a/app/scripts/controller-init/messengers/error-reporting-service-messenger.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Messenger } from '@metamask/messenger';
-import { getRootMessenger } from '../../lib/messenger';
-import { getErrorReportingServiceMessenger } from './error-reporting-service-messenger';
-
-describe('getErrorReportingServiceMessenger', () => {
-  it('returns a restricted messenger', () => {
-    const messenger = getRootMessenger<never, never>();
-    const errorReportingServiceMessenger =
-      getErrorReportingServiceMessenger(messenger);
-
-    expect(errorReportingServiceMessenger).toBeInstanceOf(Messenger);
-  });
-});
diff --git a/app/scripts/controller-init/messengers/error-reporting-service-messenger.ts b/app/scripts/controller-init/messengers/error-reporting-service-messenger.ts
deleted file mode 100644
index 4408e0543383..000000000000
--- a/app/scripts/controller-init/messengers/error-reporting-service-messenger.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Messenger } from '@metamask/messenger';
-import { RootMessenger } from '../../lib/messenger';
-
-export type ErrorReportingServiceMessenger = ReturnType<
-  typeof getErrorReportingServiceMessenger
->;
-
-/**
- * Create a messenger restricted to the allowed actions and events of the
- * error reporting service.
- *
- * @param messenger - The base messenger used to create the restricted
- * messenger.
- */
-export function getErrorReportingServiceMessenger(
-  messenger: RootMessenger<never, never>,
-) {
-  return new Messenger<'ErrorReportingService', never, never, typeof messenger>(
-    {
-      namespace: 'ErrorReportingService',
-      parent: messenger,
-    },
-  );
-}
diff --git a/app/scripts/controller-init/messengers/gator-permissions/gator-permissions-controller-messenger.ts b/app/scripts/controller-init/messengers/gator-permissions/gator-permissions-controller-messenger.ts
index dfb82b24a951..e80b19e0fa81 100644
--- a/app/scripts/controller-init/messengers/gator-permissions/gator-permissions-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/gator-permissions/gator-permissions-controller-messenger.ts
@@ -1,6 +1,9 @@
 import { Messenger } from '@metamask/messenger';
 import { GatorPermissionsControllerStateChangeEvent } from '@metamask/gator-permissions-controller';
-import { HandleSnapRequest, HasSnap } from '@metamask/snaps-controllers';
+import {
+  SnapControllerHandleRequestAction,
+  SnapControllerHasSnapAction,
+} from '@metamask/snaps-controllers';
 import {
   TransactionControllerTransactionApprovedEvent,
   TransactionControllerTransactionRejectedEvent,
@@ -14,7 +17,10 @@ export type GatorPermissionsControllerMessenger = ReturnType<
   typeof getGatorPermissionsControllerMessenger
 >;
 
-type MessengerActions = HandleSnapRequest | HasSnap;
+type MessengerActions =
+  | SnapControllerHandleRequestAction
+  | SnapControllerHasSnapAction;
+
 type MessengerEvents =
   | GatorPermissionsControllerStateChangeEvent
   | TransactionControllerTransactionApprovedEvent
@@ -44,7 +50,7 @@ export function getGatorPermissionsControllerMessenger(
   });
   messenger.delegate({
     messenger: controllerMessenger,
-    actions: ['SnapController:handleRequest', 'SnapController:has'],
+    actions: ['SnapController:handleRequest', 'SnapController:hasSnap'],
     events: [
       'TransactionController:transactionApproved',
       'TransactionController:transactionRejected',
diff --git a/app/scripts/controller-init/messengers/identity/authentication-controller-messenger.ts b/app/scripts/controller-init/messengers/identity/authentication-controller-messenger.ts
index fe706fbedfca..97002bc3618b 100644
--- a/app/scripts/controller-init/messengers/identity/authentication-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/identity/authentication-controller-messenger.ts
@@ -4,11 +4,13 @@ import {
   KeyringControllerLockEvent,
   KeyringControllerUnlockEvent,
 } from '@metamask/keyring-controller';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { MetaMetricsControllerGetMetaMetricsIdAction } from '../../../controllers/metametrics-controller';
 import { RootMessenger } from '../../../lib/messenger';
 
-type MessengerActions = KeyringControllerGetStateAction | HandleSnapRequest;
+type MessengerActions =
+  | KeyringControllerGetStateAction
+  | SnapControllerHandleRequestAction;
 
 type MessengerEvents =
   | KeyringControllerLockEvent
diff --git a/app/scripts/controller-init/messengers/index.ts b/app/scripts/controller-init/messengers/index.ts
index 1bf5d9e8491b..0d633e38c70c 100644
--- a/app/scripts/controller-init/messengers/index.ts
+++ b/app/scripts/controller-init/messengers/index.ts
@@ -6,7 +6,7 @@ import {
 import {
   getCronjobControllerMessenger,
   getExecutionServiceMessenger,
-  getMultichainRouterMessenger,
+  getMultichainRoutingServiceMessenger,
   getRateLimitControllerInitMessenger,
   getRateLimitControllerMessenger,
   getSnapControllerInitMessenger,
@@ -14,7 +14,7 @@ import {
   getSnapInsightsControllerMessenger,
   getSnapInterfaceControllerMessenger,
   getSnapsNameProviderMessenger,
-  getSnapsRegistryMessenger,
+  getSnapRegistryControllerMessenger,
   getWebSocketServiceMessenger,
 } from './snaps';
 import {
@@ -179,7 +179,6 @@ import { getAlertControllerMessenger } from './alert-controller-messenger';
 import { getMetaMetricsDataDeletionControllerMessenger } from './metametrics-data-deletion-controller-messenger';
 import { getLoggingControllerMessenger } from './logging-controller-messenger';
 import { getAppMetadataControllerMessenger } from './app-metadata-controller-messenger';
-import { getErrorReportingServiceMessenger } from './error-reporting-service-messenger';
 import { getApprovalControllerMessenger } from './approval-controller-messenger';
 import { getAddressBookControllerMessenger } from './address-book-controller-messenger';
 import { getDecryptMessageManagerMessenger } from './decrypt-message-manager-messenger';
@@ -235,15 +234,11 @@ export type { AppStateControllerMessenger } from './app-state-controller-messeng
 export { getAppStateControllerMessenger } from './app-state-controller-messenger';
 export type { ApprovalControllerMessenger } from './approval-controller-messenger';
 export { getApprovalControllerMessenger } from './approval-controller-messenger';
-export type {
-  BridgeControllerMessenger,
-  BridgeControllerInitMessenger,
-} from './bridge-controller-messenger';
+export type { BridgeControllerInitMessenger } from './bridge-controller-messenger';
 export {
   getBridgeControllerMessenger,
   getBridgeControllerInitMessenger,
 } from './bridge-controller-messenger';
-export type { BridgeStatusControllerMessenger } from './bridge-status-controller-messenger';
 export { getBridgeStatusControllerMessenger } from './bridge-status-controller-messenger';
 export type {
   CurrencyRateControllerMessenger,
@@ -278,8 +273,6 @@ export {
   getEnsControllerMessenger,
   getEnsControllerInitMessenger,
 } from './ens-controller-messenger';
-export type { ErrorReportingServiceMessenger } from './error-reporting-service-messenger';
-export { getErrorReportingServiceMessenger } from './error-reporting-service-messenger';
 export type { StorageServiceMessenger } from './storage-service-messenger';
 export { getStorageServiceMessenger } from './storage-service-messenger';
 export type {
@@ -524,10 +517,6 @@ export const CONTROLLER_MESSENGERS = {
     getMessenger: getEnsControllerMessenger,
     getInitMessenger: getEnsControllerInitMessenger,
   },
-  ErrorReportingService: {
-    getMessenger: getErrorReportingServiceMessenger,
-    getInitMessenger: noop,
-  },
   StorageService: {
     getMessenger: getStorageServiceMessenger,
     getInitMessenger: noop,
@@ -584,8 +573,8 @@ export const CONTROLLER_MESSENGERS = {
     getMessenger: getMultichainNetworkControllerMessenger,
     getInitMessenger: noop,
   },
-  MultichainRouter: {
-    getMessenger: getMultichainRouterMessenger,
+  MultichainRoutingService: {
+    getMessenger: getMultichainRoutingServiceMessenger,
     getInitMessenger: noop,
   },
   NameController: {
@@ -660,8 +649,8 @@ export const CONTROLLER_MESSENGERS = {
     getMessenger: getSnapsNameProviderMessenger,
     getInitMessenger: noop,
   },
-  SnapsRegistry: {
-    getMessenger: getSnapsRegistryMessenger,
+  SnapRegistryController: {
+    getMessenger: getSnapRegistryControllerMessenger,
     getInitMessenger: noop,
   },
   SnapController: {
diff --git a/app/scripts/controller-init/messengers/multichain/index.ts b/app/scripts/controller-init/messengers/multichain/index.ts
index a3b9c1f880a1..b78b364a63c3 100644
--- a/app/scripts/controller-init/messengers/multichain/index.ts
+++ b/app/scripts/controller-init/messengers/multichain/index.ts
@@ -4,7 +4,6 @@ export { getMultichainBalancesControllerMessenger } from './multichain-balances-
 export { getMultichainTransactionsControllerMessenger } from './multichain-transactions-controller-messenger';
 export { getMultichainNetworkControllerMessenger } from './multichain-network-controller-messenger';
 
-export type { MultichainAssetsControllerMessenger } from './multichain-assets-controller-messenger';
 export type { MultichainAssetsRatesControllerMessenger } from './multichain-assets-rates-controller-messenger';
 export type { MultichainBalancesControllerMessenger } from './multichain-balances-controller-messenger';
 export type { MultichainTransactionsControllerMessenger } from './multichain-transactions-controller-messenger';
diff --git a/app/scripts/controller-init/messengers/multichain/multichain-assets-controller-messenger.ts b/app/scripts/controller-init/messengers/multichain/multichain-assets-controller-messenger.ts
index f24278ec0f19..7b903e7f7341 100644
--- a/app/scripts/controller-init/messengers/multichain/multichain-assets-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/multichain/multichain-assets-controller-messenger.ts
@@ -1,31 +1,11 @@
 import {
-  AccountsControllerAccountAddedEvent,
-  AccountsControllerAccountAssetListUpdatedEvent,
-  AccountsControllerAccountRemovedEvent,
-  AccountsControllerListMultichainAccountsAction,
-} from '@metamask/accounts-controller';
-import { Messenger } from '@metamask/messenger';
-import { GetPermissions } from '@metamask/permission-controller';
-import { GetAllSnaps, HandleSnapRequest } from '@metamask/snaps-controllers';
-import { PhishingControllerBulkScanTokensAction } from '@metamask/phishing-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { MultichainAssetsControllerMessenger } from '@metamask/assets-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-type Actions =
-  | HandleSnapRequest
-  | GetAllSnaps
-  | GetPermissions
-  | AccountsControllerListMultichainAccountsAction
-  | PhishingControllerBulkScanTokensAction;
-
-type Events =
-  | AccountsControllerAccountAddedEvent
-  | AccountsControllerAccountRemovedEvent
-  | AccountsControllerAccountAssetListUpdatedEvent;
-
-export type MultichainAssetsControllerMessenger = ReturnType<
-  typeof getMultichainAssetsControllerMessenger
->;
-
 /**
  * Get a restricted messenger for the Multichain Assets controller. This is scoped to the
  * actions and events that the multichain Assets controller is allowed to handle.
@@ -34,17 +14,17 @@ export type MultichainAssetsControllerMessenger = ReturnType<
  * @returns The restricted controller messenger.
  */
 export function getMultichainAssetsControllerMessenger(
-  messenger: RootMessenger<Actions, Events>,
+  messenger: RootMessenger<
+    MessengerActions<MultichainAssetsControllerMessenger>,
+    MessengerEvents<MultichainAssetsControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'MultichainAssetsController',
-    Actions,
-    Events,
-    typeof messenger
-  >({
-    namespace: 'MultichainAssetsController',
-    parent: messenger,
-  });
+  const controllerMessenger: MultichainAssetsControllerMessenger =
+    new Messenger({
+      namespace: 'MultichainAssetsController',
+      parent: messenger,
+    });
+
   messenger.delegate({
     messenger: controllerMessenger,
     events: [
@@ -55,10 +35,11 @@ export function getMultichainAssetsControllerMessenger(
     actions: [
       'PermissionController:getPermissions',
       'SnapController:handleRequest',
-      'SnapController:getAll',
+      'SnapController:getRunnableSnaps',
       'AccountsController:listMultichainAccounts',
       'PhishingController:bulkScanTokens',
     ],
   });
+
   return controllerMessenger;
 }
diff --git a/app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.ts b/app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.ts
index e6637a432f73..366971265a26 100644
--- a/app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.ts
@@ -14,11 +14,11 @@ import {
   KeyringControllerLockEvent,
   KeyringControllerUnlockEvent,
 } from '@metamask/keyring-controller';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
 type Actions =
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | AccountsControllerListMultichainAccountsAction
   | GetCurrencyRateState
   | MultichainAssetsControllerGetStateAction
diff --git a/app/scripts/controller-init/messengers/multichain/multichain-balances-controller-messenger.ts b/app/scripts/controller-init/messengers/multichain/multichain-balances-controller-messenger.ts
index eb0bcccefad4..ead08c8abb25 100644
--- a/app/scripts/controller-init/messengers/multichain/multichain-balances-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/multichain/multichain-balances-controller-messenger.ts
@@ -5,7 +5,7 @@ import {
   AccountsControllerListMultichainAccountsAction,
   AccountsControllerAccountBalancesUpdatesEvent,
 } from '@metamask/accounts-controller';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import {
   MultichainAssetsControllerAccountAssetListUpdatedEvent,
   MultichainAssetsControllerGetStateAction,
@@ -15,7 +15,7 @@ import { RootMessenger } from '../../../lib/messenger';
 
 type Actions =
   | AccountsControllerListMultichainAccountsAction
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | MultichainAssetsControllerGetStateAction
   | KeyringControllerGetStateAction;
 
diff --git a/app/scripts/controller-init/messengers/multichain/multichain-transactions-controller-messenger.ts b/app/scripts/controller-init/messengers/multichain/multichain-transactions-controller-messenger.ts
index 87ed73827b86..ec5216447cf8 100644
--- a/app/scripts/controller-init/messengers/multichain/multichain-transactions-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/multichain/multichain-transactions-controller-messenger.ts
@@ -5,13 +5,13 @@ import {
   AccountsControllerListMultichainAccountsAction,
   AccountsControllerAccountTransactionsUpdatedEvent,
 } from '@metamask/accounts-controller';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { KeyringControllerGetStateAction } from '@metamask/keyring-controller';
 import { RootMessenger } from '../../../lib/messenger';
 
 type Actions =
   | AccountsControllerListMultichainAccountsAction
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | KeyringControllerGetStateAction;
 
 type Events =
diff --git a/app/scripts/controller-init/messengers/permission-controller-messenger.ts b/app/scripts/controller-init/messengers/permission-controller-messenger.ts
index 2ceb3d1b6823..d7db504a2cbf 100644
--- a/app/scripts/controller-init/messengers/permission-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/permission-controller-messenger.ts
@@ -9,10 +9,10 @@ import type {
 import type { GetSubjectMetadata } from '@metamask/permission-controller';
 import { AccountsControllerListAccountsAction } from '@metamask/accounts-controller';
 import {
-  GetPermittedSnaps,
-  InstallSnaps,
-  MultichainRouterGetSupportedAccountsAction,
-  MultichainRouterIsSupportedScopeAction,
+  SnapControllerGetPermittedSnapsAction,
+  SnapControllerInstallSnapsAction,
+  MultichainRoutingServiceGetSupportedAccountsAction,
+  MultichainRoutingServiceIsSupportedScopeAction,
 } from '@metamask/snaps-controllers';
 import { SnapPermissionSpecificationsActions } from '../../controllers/permissions/snaps/specifications';
 import { RootMessenger } from '../../lib/messenger';
@@ -23,8 +23,8 @@ type AllowedActions =
   | ApprovalControllerAcceptRequestAction
   | ApprovalControllerRejectRequestAction
   | GetSubjectMetadata
-  | GetPermittedSnaps
-  | InstallSnaps;
+  | SnapControllerGetPermittedSnapsAction
+  | SnapControllerInstallSnapsAction;
 
 export type PermissionControllerMessenger = ReturnType<
   typeof getPermissionControllerMessenger
@@ -56,8 +56,8 @@ export function getPermissionControllerMessenger(
       'ApprovalController:hasRequest',
       'ApprovalController:acceptRequest',
       'ApprovalController:rejectRequest',
-      'SnapController:getPermitted',
-      'SnapController:install',
+      'SnapController:getPermittedSnaps',
+      'SnapController:installSnaps',
       'SubjectMetadataController:getSubjectMetadata',
     ],
   });
@@ -66,8 +66,8 @@ export function getPermissionControllerMessenger(
 
 type AllowedInitializationActions =
   | AccountsControllerListAccountsAction
-  | MultichainRouterIsSupportedScopeAction
-  | MultichainRouterGetSupportedAccountsAction
+  | MultichainRoutingServiceGetSupportedAccountsAction
+  | MultichainRoutingServiceIsSupportedScopeAction
   | NetworkControllerFindNetworkClientIdByChainIdAction
   | SnapPermissionSpecificationsActions;
 
@@ -102,15 +102,15 @@ export function getPermissionControllerInitMessenger(
       'CurrencyRateController:getState',
       'KeyringController:getKeyringsByType',
       'KeyringController:withKeyring',
-      'MultichainRouter:isSupportedScope',
-      'MultichainRouter:getSupportedAccounts',
+      'MultichainRoutingService:isSupportedScope',
+      'MultichainRoutingService:getSupportedAccounts',
       'NetworkController:findNetworkClientIdByChainId',
       'PhishingController:maybeUpdateState',
       'PhishingController:testOrigin',
       'PreferencesController:getState',
       'RateLimitController:call',
       'SnapController:clearSnapState',
-      'SnapController:get',
+      'SnapController:getSnap',
       'SnapController:getSnapState',
       'SnapController:handleRequest',
       'SnapController:updateSnapState',
diff --git a/app/scripts/controller-init/messengers/rewards-controller-messenger.ts b/app/scripts/controller-init/messengers/rewards-controller-messenger.ts
index 324497b7a88d..34ca1944b528 100644
--- a/app/scripts/controller-init/messengers/rewards-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/rewards-controller-messenger.ts
@@ -18,7 +18,7 @@ import {
   KeyringControllerUnlockEvent,
 } from '@metamask/keyring-controller';
 import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { PreferencesControllerGetStateAction } from '../../controllers/preferences-controller';
 import {
   RewardsDataServiceGetOptInStatusAction,
@@ -107,7 +107,7 @@ type AllowedActions =
   | RewardsDataServiceGetDiscoverSeasonsAction
   | RewardsDataServiceGenerateChallengeAction
   | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction
-  | HandleSnapRequest;
+  | SnapControllerHandleRequestAction;
 
 type AllowedEvents =
   | KeyringControllerUnlockEvent
diff --git a/app/scripts/controller-init/messengers/snaps/cronjob-controller-messenger.ts b/app/scripts/controller-init/messengers/snaps/cronjob-controller-messenger.ts
index deecde73e49b..384083feacce 100644
--- a/app/scripts/controller-init/messengers/snaps/cronjob-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/cronjob-controller-messenger.ts
@@ -1,28 +1,11 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  SnapInstalled,
-  SnapUpdated,
-  SnapDisabled,
-  SnapEnabled,
-  SnapUninstalled,
-  HandleSnapRequest,
-} from '@metamask/snaps-controllers';
-import { GetPermissions } from '@metamask/permission-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { CronjobControllerMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-type Actions = GetPermissions | HandleSnapRequest;
-
-type Events =
-  | SnapInstalled
-  | SnapUpdated
-  | SnapUninstalled
-  | SnapEnabled
-  | SnapDisabled;
-
-export type CronjobControllerMessenger = ReturnType<
-  typeof getCronjobControllerMessenger
->;
-
 /**
  * Get a restricted messenger for the cronjob controller. This is scoped to the
  * actions and events that the cronjob controller is allowed to handle.
@@ -31,14 +14,12 @@ export type CronjobControllerMessenger = ReturnType<
  * @returns The restricted controller messenger.
  */
 export function getCronjobControllerMessenger(
-  messenger: RootMessenger<Actions, Events>,
+  messenger: RootMessenger<
+    MessengerActions<CronjobControllerMessenger>,
+    MessengerEvents<CronjobControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'CronjobController',
-    Actions,
-    Events,
-    typeof messenger
-  >({
+  const controllerMessenger: CronjobControllerMessenger = new Messenger({
     namespace: 'CronjobController',
     parent: messenger,
   });
diff --git a/app/scripts/controller-init/messengers/snaps/execution-service-messenger.ts b/app/scripts/controller-init/messengers/snaps/execution-service-messenger.ts
index 1ccfc61146c1..67d42dffab7f 100644
--- a/app/scripts/controller-init/messengers/snaps/execution-service-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/execution-service-messenger.ts
@@ -1,10 +1,11 @@
-import { Messenger } from '@metamask/messenger';
+import {
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { ExecutionServiceMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-export type ExecutionServiceMessenger = ReturnType<
-  typeof getExecutionServiceMessenger
->;
-
 /**
  * Get a restricted messenger for the execution service. This is scoped to the
  * actions and events that the execution service is allowed to handle.
@@ -13,9 +14,12 @@ export type ExecutionServiceMessenger = ReturnType<
  * @returns The restricted messenger.
  */
 export function getExecutionServiceMessenger(
-  messenger: RootMessenger<never, never>,
+  messenger: RootMessenger<
+    MessengerActions<ExecutionServiceMessenger>,
+    MessengerEvents<ExecutionServiceMessenger>
+  >,
 ) {
-  return new Messenger<'ExecutionService', never, never, typeof messenger>({
+  return new Messenger({
     namespace: 'ExecutionService',
     parent: messenger,
   });
diff --git a/app/scripts/controller-init/messengers/snaps/index.ts b/app/scripts/controller-init/messengers/snaps/index.ts
index 3ec5bdc84813..5200c3f0e0f6 100644
--- a/app/scripts/controller-init/messengers/snaps/index.ts
+++ b/app/scripts/controller-init/messengers/snaps/index.ts
@@ -1,9 +1,6 @@
 export { getCronjobControllerMessenger } from './cronjob-controller-messenger';
-export type { CronjobControllerMessenger } from './cronjob-controller-messenger';
 export { getExecutionServiceMessenger } from './execution-service-messenger';
-export type { ExecutionServiceMessenger } from './execution-service-messenger';
-export { getMultichainRouterMessenger } from './multichain-router-messenger';
-export type { MultichainRouterMessenger } from './multichain-router-messenger';
+export { getMultichainRoutingServiceMessenger } from './multichain-routing-service-messenger';
 export {
   getRateLimitControllerMessenger,
   getRateLimitControllerInitMessenger,
@@ -16,17 +13,9 @@ export {
   getSnapControllerMessenger,
   getSnapControllerInitMessenger,
 } from './snap-controller-messenger';
-export type {
-  SnapControllerMessenger,
-  SnapControllerInitMessenger,
-} from './snap-controller-messenger';
+export type { SnapControllerInitMessenger } from './snap-controller-messenger';
 export { getSnapInsightsControllerMessenger } from './snap-insights-controller-messenger';
-export type { SnapInsightsControllerMessenger } from './snap-insights-controller-messenger';
 export { getSnapInterfaceControllerMessenger } from './snap-interface-controller-messenger';
-export type { SnapInterfaceControllerMessenger } from './snap-interface-controller-messenger';
 export { getSnapsNameProviderMessenger } from './snaps-name-provider-messenger';
-export type { SnapsNameProviderMessenger } from './snaps-name-provider-messenger';
-export { getSnapsRegistryMessenger } from './snaps-registry-messenger';
-export type { SnapsRegistryMessenger } from './snaps-registry-messenger';
+export { getSnapRegistryControllerMessenger } from './snap-registry-controller-messenger';
 export { getWebSocketServiceMessenger } from './websocket-service-messenger';
-export type { WebSocketServiceMessenger } from './websocket-service-messenger';
diff --git a/app/scripts/controller-init/messengers/snaps/multichain-router-messenger.test.ts b/app/scripts/controller-init/messengers/snaps/multichain-router-messenger.test.ts
deleted file mode 100644
index a9992ff7dd8d..000000000000
--- a/app/scripts/controller-init/messengers/snaps/multichain-router-messenger.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Messenger } from '@metamask/messenger';
-import { getRootMessenger } from '../../../lib/messenger';
-import { getMultichainRouterMessenger } from './multichain-router-messenger';
-
-describe('getMultichainRouterMessenger', () => {
-  it('returns a restricted messenger', () => {
-    const messenger = getRootMessenger<never, never>();
-    const MultichainRouterMessenger = getMultichainRouterMessenger(messenger);
-
-    expect(MultichainRouterMessenger).toBeInstanceOf(Messenger);
-  });
-});
diff --git a/app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.test.ts b/app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.test.ts
new file mode 100644
index 000000000000..f0df72ee8ff6
--- /dev/null
+++ b/app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.test.ts
@@ -0,0 +1,13 @@
+import { Messenger } from '@metamask/messenger';
+import { getRootMessenger } from '../../../lib/messenger';
+import { getMultichainRoutingServiceMessenger } from './multichain-routing-service-messenger';
+
+describe('getMultichainRoutingServiceMessenger', () => {
+  it('returns a restricted messenger', () => {
+    const messenger = getRootMessenger<never, never>();
+    const MultichainRoutingServiceMessenger =
+      getMultichainRoutingServiceMessenger(messenger);
+
+    expect(MultichainRoutingServiceMessenger).toBeInstanceOf(Messenger);
+  });
+});
diff --git a/app/scripts/controller-init/messengers/snaps/multichain-router-messenger.ts b/app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.ts
similarity index 52%
rename from app/scripts/controller-init/messengers/snaps/multichain-router-messenger.ts
rename to app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.ts
index 24ba35155dac..c813fd272961 100644
--- a/app/scripts/controller-init/messengers/snaps/multichain-router-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/multichain-routing-service-messenger.ts
@@ -1,14 +1,11 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  MultichainRouterEvents,
-  MultichainRouterAllowedActions,
-} from '@metamask/snaps-controllers';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { MultichainRoutingServiceMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-export type MultichainRouterMessenger = ReturnType<
-  typeof getMultichainRouterMessenger
->;
-
 /**
  * Get a restricted messenger for the multichain router. This is scoped to the
  * actions and events that the multichain router is allowed to handle.
@@ -16,25 +13,20 @@ export type MultichainRouterMessenger = ReturnType<
  * @param messenger - The messenger to restrict.
  * @returns The restricted messenger.
  */
-export function getMultichainRouterMessenger(
+export function getMultichainRoutingServiceMessenger(
   messenger: RootMessenger<
-    MultichainRouterAllowedActions,
-    MultichainRouterEvents
+    MessengerActions<MultichainRoutingServiceMessenger>,
+    MessengerEvents<MultichainRoutingServiceMessenger>
   >,
 ) {
-  const routerMessenger = new Messenger<
-    'MultichainRouter',
-    MultichainRouterAllowedActions,
-    MultichainRouterEvents,
-    typeof messenger
-  >({
-    namespace: 'MultichainRouter',
+  const routerMessenger: MultichainRoutingServiceMessenger = new Messenger({
+    namespace: 'MultichainRoutingService',
     parent: messenger,
   });
   messenger.delegate({
     messenger: routerMessenger,
     actions: [
-      'SnapController:getAll',
+      'SnapController:getRunnableSnaps',
       'SnapController:handleRequest',
       'PermissionController:getPermissions',
       'AccountsController:listMultichainAccounts',
diff --git a/app/scripts/controller-init/messengers/snaps/snap-controller-messenger.ts b/app/scripts/controller-init/messengers/snaps/snap-controller-messenger.ts
index 4a3cc1dd1c95..65aa40ff76e3 100644
--- a/app/scripts/controller-init/messengers/snaps/snap-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/snap-controller-messenger.ts
@@ -1,54 +1,17 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  ExecuteSnapAction,
-  TerminateSnapAction,
-  TerminateAllSnapsAction,
-  HandleRpcRequestAction,
-  GetResult,
-  GetMetadata,
-  Update,
-  ResolveVersion,
-  CreateInterface,
-  GetInterface,
-  ErrorMessageEvent,
-  OutboundRequest,
-  OutboundResponse,
-  SetClientActive,
-  SnapsRegistryStateChangeEvent,
-  SnapInterfaceControllerSetInterfaceDisplayedAction,
-} from '@metamask/snaps-controllers';
-import {
-  GetEndowments,
-  GetPermissions,
-  HasPermission,
-  HasPermissions,
-  RequestPermissions,
-  RevokeAllPermissions,
-  RevokePermissions,
-  RevokePermissionForAllSubjects,
-  GetSubjects,
-  GrantPermissions,
-  GetSubjectMetadata,
-  AddSubjectMetadata,
-  UpdateCaveat,
-} from '@metamask/permission-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
 import {
-  ApprovalControllerAddRequestAction,
-  ApprovalControllerUpdateRequestStateAction,
-} from '@metamask/approval-controller';
+  SnapControllerMessenger,
+  SnapControllerSetClientActiveAction,
+} from '@metamask/snaps-controllers';
 import {
   KeyringControllerLockEvent,
   KeyringControllerUnlockEvent,
   KeyringControllerWithKeyringAction,
 } from '@metamask/keyring-controller';
-import { SelectedNetworkControllerGetNetworkClientIdForDomainAction } from '@metamask/selected-network-controller';
-import { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';
-import {
-  StorageServiceClearAction,
-  StorageServiceGetItemAction,
-  StorageServiceRemoveItemAction,
-  StorageServiceSetItemAction,
-} from '@metamask/storage-service';
 import { PreferencesControllerGetStateAction } from '../../../controllers/preferences-controller';
 import { MetaMetricsControllerTrackEventAction } from '../../../controllers/metametrics-controller';
 import { RootMessenger } from '../../../lib/messenger';
@@ -57,51 +20,6 @@ import {
   OnboardingControllerStateChangeEvent,
 } from '../../../controllers/onboarding';
 
-type Actions =
-  | GetEndowments
-  | GetPermissions
-  | HasPermission
-  | HasPermissions
-  | RequestPermissions
-  | RevokeAllPermissions
-  | RevokePermissions
-  | RevokePermissionForAllSubjects
-  | GetSubjects
-  | ApprovalControllerAddRequestAction
-  | ApprovalControllerUpdateRequestStateAction
-  | GrantPermissions
-  | GetSubjectMetadata
-  | UpdateCaveat
-  | AddSubjectMetadata
-  | ExecuteSnapAction
-  | TerminateSnapAction
-  | TerminateAllSnapsAction
-  | HandleRpcRequestAction
-  | GetResult
-  | GetMetadata
-  | Update
-  | ResolveVersion
-  | CreateInterface
-  | GetInterface
-  | SnapInterfaceControllerSetInterfaceDisplayedAction
-  | SelectedNetworkControllerGetNetworkClientIdForDomainAction
-  | NetworkControllerGetNetworkClientByIdAction
-  | StorageServiceSetItemAction
-  | StorageServiceGetItemAction
-  | StorageServiceRemoveItemAction
-  | StorageServiceClearAction;
-
-type Events =
-  | ErrorMessageEvent
-  | OutboundRequest
-  | OutboundResponse
-  | KeyringControllerLockEvent
-  | SnapsRegistryStateChangeEvent;
-
-export type SnapControllerMessenger = ReturnType<
-  typeof getSnapControllerMessenger
->;
-
 /**
  * Get a restricted messenger for the Snap controller. This is scoped to the
  * actions and events that the Snap controller is allowed to handle.
@@ -110,14 +28,12 @@ export type SnapControllerMessenger = ReturnType<
  * @returns The restricted messenger.
  */
 export function getSnapControllerMessenger(
-  messenger: RootMessenger<Actions, Events>,
+  messenger: RootMessenger<
+    MessengerActions<SnapControllerMessenger>,
+    MessengerEvents<SnapControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'SnapController',
-    Actions,
-    Events,
-    typeof messenger
-  >({
+  const controllerMessenger: SnapControllerMessenger = new Messenger({
     namespace: 'SnapController',
     parent: messenger,
   });
@@ -128,14 +44,13 @@ export function getSnapControllerMessenger(
       'ExecutionService:outboundRequest',
       'ExecutionService:outboundResponse',
       'KeyringController:lock',
-      'SnapsRegistry:stateChange',
+      'SnapRegistryController:stateChange',
     ],
     actions: [
       'PermissionController:getEndowments',
       'PermissionController:getPermissions',
       'PermissionController:hasPermission',
       'PermissionController:hasPermissions',
-      'PermissionController:requestPermissions',
       'PermissionController:revokeAllPermissions',
       'PermissionController:revokePermissions',
       'PermissionController:revokePermissionForAllSubjects',
@@ -148,14 +63,11 @@ export function getSnapControllerMessenger(
       'SubjectMetadataController:addSubjectMetadata',
       'ExecutionService:executeSnap',
       'ExecutionService:terminateSnap',
-      'ExecutionService:terminateAllSnaps',
       'ExecutionService:handleRpcRequest',
-      'NetworkController:getNetworkClientById',
-      'SelectedNetworkController:getNetworkClientIdForDomain',
-      'SnapsRegistry:get',
-      'SnapsRegistry:getMetadata',
-      'SnapsRegistry:update',
-      'SnapsRegistry:resolveVersion',
+      'SnapRegistryController:get',
+      'SnapRegistryController:getMetadata',
+      'SnapRegistryController:requestUpdate',
+      'SnapRegistryController:resolveVersion',
       'SnapInterfaceController:createInterface',
       'SnapInterfaceController:getInterface',
       'SnapInterfaceController:setInterfaceDisplayed',
@@ -172,7 +84,7 @@ type InitActions =
   | KeyringControllerWithKeyringAction
   | PreferencesControllerGetStateAction
   | MetaMetricsControllerTrackEventAction
-  | SetClientActive
+  | SnapControllerSetClientActiveAction
   | OnboardingControllerGetStateAction;
 
 type InitEvents =
diff --git a/app/scripts/controller-init/messengers/snaps/snap-insights-controller-messenger.ts b/app/scripts/controller-init/messengers/snaps/snap-insights-controller-messenger.ts
index 6c342bf9ff99..385fb7e09ed8 100644
--- a/app/scripts/controller-init/messengers/snaps/snap-insights-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/snap-insights-controller-messenger.ts
@@ -1,32 +1,11 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  DeleteInterface,
-  GetAllSnaps,
-  HandleSnapRequest,
-} from '@metamask/snaps-controllers';
-import { GetPermissions } from '@metamask/permission-controller';
-import {
-  TransactionControllerUnapprovedTransactionAddedEvent,
-  TransactionControllerTransactionStatusUpdatedEvent,
-} from '@metamask/transaction-controller';
-import { SignatureStateChange } from '@metamask/signature-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { SnapInsightsControllerMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-type Actions =
-  | HandleSnapRequest
-  | GetAllSnaps
-  | GetPermissions
-  | DeleteInterface;
-
-type Events =
-  | TransactionControllerUnapprovedTransactionAddedEvent
-  | TransactionControllerTransactionStatusUpdatedEvent
-  | SignatureStateChange;
-
-export type SnapInsightsControllerMessenger = ReturnType<
-  typeof getSnapInsightsControllerMessenger
->;
-
 /**
  * Get a restricted messenger for the Snap insights controller. This is scoped
  * to the actions and events that the Snap insights controller is allowed to
@@ -36,14 +15,12 @@ export type SnapInsightsControllerMessenger = ReturnType<
  * @returns The restricted messenger.
  */
 export function getSnapInsightsControllerMessenger(
-  messenger: RootMessenger<Actions, Events>,
+  messenger: RootMessenger<
+    MessengerActions<SnapInsightsControllerMessenger>,
+    MessengerEvents<SnapInsightsControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'SnapInsightsController',
-    Actions,
-    Events,
-    typeof messenger
-  >({
+  const controllerMessenger: SnapInsightsControllerMessenger = new Messenger({
     namespace: 'SnapInsightsController',
     parent: messenger,
   });
@@ -51,7 +28,7 @@ export function getSnapInsightsControllerMessenger(
     messenger: controllerMessenger,
     actions: [
       'SnapController:handleRequest',
-      'SnapController:getAll',
+      'SnapController:getRunnableSnaps',
       'PermissionController:getPermissions',
       'SnapInterfaceController:deleteInterface',
     ],
diff --git a/app/scripts/controller-init/messengers/snaps/snap-interface-controller-messenger.ts b/app/scripts/controller-init/messengers/snaps/snap-interface-controller-messenger.ts
index 0f72067e63fa..4f986dd665c2 100644
--- a/app/scripts/controller-init/messengers/snaps/snap-interface-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/snap-interface-controller-messenger.ts
@@ -1,40 +1,11 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  AccountsControllerListMultichainAccountsAction,
-  GetSnap,
-} from '@metamask/snaps-controllers';
-import {
-  ApprovalControllerAcceptRequestAction,
-  ApprovalControllerHasRequestAction,
-} from '@metamask/approval-controller';
-import { MaybeUpdateState, TestOrigin } from '@metamask/phishing-controller';
-import { NotificationListUpdatedEvent } from '@metamask/notification-services-controller/notification-services';
-import { MultichainAssetsControllerGetStateAction } from '@metamask/assets-controllers';
-import {
-  AccountsControllerGetAccountByAddressAction,
-  AccountsControllerGetSelectedMultichainAccountAction,
-} from '@metamask/accounts-controller';
-import { HasPermission } from '@metamask/permission-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { SnapInterfaceControllerMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-type Actions =
-  | MaybeUpdateState
-  | TestOrigin
-  | ApprovalControllerHasRequestAction
-  | ApprovalControllerAcceptRequestAction
-  | GetSnap
-  | MultichainAssetsControllerGetStateAction
-  | AccountsControllerGetSelectedMultichainAccountAction
-  | AccountsControllerGetAccountByAddressAction
-  | AccountsControllerListMultichainAccountsAction
-  | HasPermission;
-
-type Events = NotificationListUpdatedEvent;
-
-export type SnapInterfaceControllerMessenger = ReturnType<
-  typeof getSnapInterfaceControllerMessenger
->;
-
 /**
  * Get a restricted messenger for the Snap interface controller. This is scoped
  * to the actions and events that the Snap interface controller is allowed to
@@ -44,30 +15,27 @@ export type SnapInterfaceControllerMessenger = ReturnType<
  * @returns The restricted messenger.
  */
 export function getSnapInterfaceControllerMessenger(
-  messenger: RootMessenger<Actions, Events>,
+  messenger: RootMessenger<
+    MessengerActions<SnapInterfaceControllerMessenger>,
+    MessengerEvents<SnapInterfaceControllerMessenger>
+  >,
 ) {
-  const controllerMessenger = new Messenger<
-    'SnapInterfaceController',
-    Actions,
-    Events,
-    typeof messenger
-  >({
+  const controllerMessenger: SnapInterfaceControllerMessenger = new Messenger({
     namespace: 'SnapInterfaceController',
     parent: messenger,
   });
   messenger.delegate({
     messenger: controllerMessenger,
     actions: [
-      `PhishingController:maybeUpdateState`,
-      `PhishingController:testOrigin`,
-      `ApprovalController:hasRequest`,
-      `ApprovalController:acceptRequest`,
-      `SnapController:get`,
+      'PhishingController:testOrigin',
+      'ApprovalController:hasRequest',
+      'ApprovalController:acceptRequest',
+      'SnapController:getSnap',
       'MultichainAssetsController:getState',
-      `AccountsController:getSelectedMultichainAccount`,
-      `AccountsController:getAccountByAddress`,
-      `AccountsController:listMultichainAccounts`,
-      `PermissionController:hasPermission`,
+      'AccountsController:getSelectedMultichainAccount',
+      'AccountsController:getAccountByAddress',
+      'AccountsController:listMultichainAccounts',
+      'PermissionController:hasPermission',
     ],
     events: ['NotificationServicesController:notificationsListUpdated'],
   });
diff --git a/app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.test.ts b/app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.test.ts
similarity index 55%
rename from app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.test.ts
rename to app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.test.ts
index 393376a035e0..976aa5bebad6 100644
--- a/app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.test.ts
+++ b/app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.test.ts
@@ -1,11 +1,12 @@
 import { Messenger } from '@metamask/messenger';
 import { getRootMessenger } from '../../../lib/messenger';
-import { getSnapsRegistryMessenger } from './snaps-registry-messenger';
+import { getSnapRegistryControllerMessenger } from './snap-registry-controller-messenger';
 
-describe('getSnapsRegistryMessenger', () => {
+describe('getSnapRegistryControllerMessenger', () => {
   it('returns a restricted controller messenger', () => {
     const messenger = getRootMessenger<never, never>();
-    const snapsRegistryMessenger = getSnapsRegistryMessenger(messenger);
+    const snapsRegistryMessenger =
+      getSnapRegistryControllerMessenger(messenger);
 
     expect(snapsRegistryMessenger).toBeInstanceOf(Messenger);
   });
diff --git a/app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.ts b/app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.ts
new file mode 100644
index 000000000000..92d42f742bdd
--- /dev/null
+++ b/app/scripts/controller-init/messengers/snaps/snap-registry-controller-messenger.ts
@@ -0,0 +1,26 @@
+import {
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { SnapRegistryControllerMessenger } from '@metamask/snaps-controllers';
+import { RootMessenger } from '../../../lib/messenger';
+
+/**
+ * Get a restricted messenger for the Snaps registry. This is scoped to the
+ * actions and events that the Snaps registry is allowed to handle.
+ *
+ * @param controllerMessenger - The messenger to restrict.
+ * @returns The restricted messenger.
+ */
+export function getSnapRegistryControllerMessenger(
+  controllerMessenger: RootMessenger<
+    MessengerActions<SnapRegistryControllerMessenger>,
+    MessengerEvents<SnapRegistryControllerMessenger>
+  >,
+) {
+  return new Messenger({
+    namespace: 'SnapRegistryController',
+    parent: controllerMessenger,
+  });
+}
diff --git a/app/scripts/controller-init/messengers/snaps/snaps-name-provider-messenger.ts b/app/scripts/controller-init/messengers/snaps/snaps-name-provider-messenger.ts
index 9b66bd922749..7ec07db77a4d 100644
--- a/app/scripts/controller-init/messengers/snaps/snaps-name-provider-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/snaps-name-provider-messenger.ts
@@ -1,21 +1,10 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  GetAllSnaps,
-  GetSnap,
-  HandleSnapRequest,
-} from '@metamask/snaps-controllers';
-import { GetPermissionControllerState } from '@metamask/permission-controller';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
 import { RootMessenger } from '../../../lib/messenger';
-
-type AllowedActions =
-  | GetAllSnaps
-  | GetSnap
-  | HandleSnapRequest
-  | GetPermissionControllerState;
-
-export type SnapsNameProviderMessenger = ReturnType<
-  typeof getSnapsNameProviderMessenger
->;
+import { SnapsNameProviderMessenger } from '../../../lib/SnapsNameProvider';
 
 /**
  * Create a messenger restricted to the allowed actions and events of the Snaps
@@ -25,22 +14,20 @@ export type SnapsNameProviderMessenger = ReturnType<
  * messenger.
  */
 export function getSnapsNameProviderMessenger(
-  messenger: RootMessenger<AllowedActions, never>,
+  messenger: RootMessenger<
+    MessengerActions<SnapsNameProviderMessenger>,
+    MessengerEvents<SnapsNameProviderMessenger>
+  >,
 ) {
-  const providerMessenger = new Messenger<
-    'SnapsNameProvider',
-    AllowedActions,
-    never,
-    typeof messenger
-  >({
+  const providerMessenger: SnapsNameProviderMessenger = new Messenger({
     namespace: 'SnapsNameProvider',
     parent: messenger,
   });
   messenger.delegate({
     messenger: providerMessenger,
     actions: [
-      'SnapController:getAll',
-      'SnapController:get',
+      'SnapController:getAllSnaps',
+      'SnapController:getSnap',
       'SnapController:handleRequest',
       'PermissionController:getState',
     ],
diff --git a/app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.ts b/app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.ts
deleted file mode 100644
index a50571a4a2ca..000000000000
--- a/app/scripts/controller-init/messengers/snaps/snaps-registry-messenger.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Messenger } from '@metamask/messenger';
-import { RootMessenger } from '../../../lib/messenger';
-
-export type SnapsRegistryMessenger = ReturnType<
-  typeof getSnapsRegistryMessenger
->;
-
-/**
- * Get a restricted messenger for the Snaps registry. This is scoped to the
- * actions and events that the Snaps registry is allowed to handle.
- *
- * @param controllerMessenger - The messenger to restrict.
- * @returns The restricted messenger.
- */
-export function getSnapsRegistryMessenger(
-  controllerMessenger: RootMessenger<never, never>,
-) {
-  return new Messenger({
-    namespace: 'SnapsRegistry',
-    parent: controllerMessenger,
-  });
-}
diff --git a/app/scripts/controller-init/messengers/snaps/websocket-service-messenger.ts b/app/scripts/controller-init/messengers/snaps/websocket-service-messenger.ts
index ccfb48e2931f..7f0c9dfdfe08 100644
--- a/app/scripts/controller-init/messengers/snaps/websocket-service-messenger.ts
+++ b/app/scripts/controller-init/messengers/snaps/websocket-service-messenger.ts
@@ -1,14 +1,11 @@
-import { Messenger } from '@metamask/messenger';
 import {
-  WebSocketServiceEvents,
-  WebSocketServiceAllowedActions,
-} from '@metamask/snaps-controllers';
+  Messenger,
+  MessengerActions,
+  MessengerEvents,
+} from '@metamask/messenger';
+import { WebSocketServiceMessenger } from '@metamask/snaps-controllers';
 import { RootMessenger } from '../../../lib/messenger';
 
-export type WebSocketServiceMessenger = ReturnType<
-  typeof getWebSocketServiceMessenger
->;
-
 /**
  * Get a restricted messenger for the WebSocket service. This is scoped to the
  * actions and events that the WebSocket service is allowed to handle.
@@ -18,16 +15,11 @@ export type WebSocketServiceMessenger = ReturnType<
  */
 export function getWebSocketServiceMessenger(
   messenger: RootMessenger<
-    WebSocketServiceAllowedActions,
-    WebSocketServiceEvents
+    MessengerActions<WebSocketServiceMessenger>,
+    MessengerEvents<WebSocketServiceMessenger>
   >,
 ) {
-  const serviceMessenger = new Messenger<
-    'WebSocketService',
-    WebSocketServiceAllowedActions,
-    WebSocketServiceEvents,
-    typeof messenger
-  >({
+  const serviceMessenger: WebSocketServiceMessenger = new Messenger({
     namespace: 'WebSocketService',
     parent: messenger,
   });
diff --git a/app/scripts/controller-init/messengers/transaction-pay-controller-messenger.ts b/app/scripts/controller-init/messengers/transaction-pay-controller-messenger.ts
index 61639d2dae9e..1947f7f09d5f 100644
--- a/app/scripts/controller-init/messengers/transaction-pay-controller-messenger.ts
+++ b/app/scripts/controller-init/messengers/transaction-pay-controller-messenger.ts
@@ -42,6 +42,7 @@ export function getTransactionPayControllerMessenger(
       'TransactionController:getGasFeeTokens',
       'TransactionController:getState',
       'TransactionController:updateTransaction',
+      'KeyringController:signTypedMessage',
     ],
     events: [
       'BridgeStatusController:stateChange',
diff --git a/app/scripts/controller-init/multichain/multichain-account-service-init.test.ts b/app/scripts/controller-init/multichain/multichain-account-service-init.test.ts
index 47ef65d65ca1..77f3d06942a9 100644
--- a/app/scripts/controller-init/multichain/multichain-account-service-init.test.ts
+++ b/app/scripts/controller-init/multichain/multichain-account-service-init.test.ts
@@ -5,7 +5,6 @@ import {
   Messenger,
   MockAnyNamespace,
 } from '@metamask/messenger';
-import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
 import { buildControllerInitRequestMock } from '../test/utils';
 import { ControllerInitRequest } from '../types';
 import {
@@ -29,9 +28,7 @@ function buildInitRequestMock(): jest.Mocked<
 > {
   const baseControllerMessenger = new Messenger<
     MockAnyNamespace,
-    | PreferencesControllerGetStateAction
-    | RemoteFeatureFlagControllerGetStateAction
-    | ActionConstraint,
+    PreferencesControllerGetStateAction | ActionConstraint,
     never
   >({ namespace: MOCK_ANY_NAMESPACE });
 
@@ -40,11 +37,6 @@ function buildInitRequestMock(): jest.Mocked<
     jest.fn().mockReturnValue(PREFERENCES_STATE),
   );
 
-  baseControllerMessenger.registerActionHandler(
-    'RemoteFeatureFlagController:getState',
-    jest.fn().mockReturnValue({}),
-  );
-
   return {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getMultichainAccountServiceMessenger(
@@ -89,7 +81,6 @@ describe('MultichainAccountServiceInit', () => {
 
       expect(multichainAccountServiceClassMock).toHaveBeenCalledWith({
         messenger: requestMock.controllerMessenger,
-        providers: expect.any(Array),
         providerConfigs: expect.any(Object),
         config: expect.any(Object),
         ensureOnboardingComplete: requestMock.ensureOnboardingComplete,
@@ -140,20 +131,6 @@ describe('MultichainAccountServiceInit', () => {
 
       expect(callSpy).toHaveBeenCalledWith('PreferencesController:getState');
     });
-
-    it('calls RemoteFeatureFlagController:getState during init', () => {
-      const requestMock = buildInitRequestMock();
-      const callSpy = jest.spyOn(
-        requestMock.initMessenger,
-        'call',
-      ) as jest.Mock;
-
-      MultichainAccountServiceInit(requestMock);
-
-      expect(callSpy).toHaveBeenCalledWith(
-        'RemoteFeatureFlagController:getState',
-      );
-    });
   });
 
   describe('subscriptions', () => {
@@ -168,21 +145,6 @@ describe('MultichainAccountServiceInit', () => {
         expect.any(Function),
       );
     });
-
-    it('subscribes to RemoteFeatureFlagController:stateChange on controllerMessenger', () => {
-      const requestMock = buildInitRequestMock();
-      const subscribeSpy = jest.spyOn(
-        requestMock.controllerMessenger,
-        'subscribe',
-      );
-
-      MultichainAccountServiceInit(requestMock);
-
-      expect(subscribeSpy).toHaveBeenCalledWith(
-        'RemoteFeatureFlagController:stateChange',
-        expect.any(Function),
-      );
-    });
   });
 
   describe('PreferencesController:stateChange handler', () => {
diff --git a/app/scripts/controller-init/multichain/multichain-account-service-init.ts b/app/scripts/controller-init/multichain/multichain-account-service-init.ts
index 0262f9687d83..4caa3ad15c38 100644
--- a/app/scripts/controller-init/multichain/multichain-account-service-init.ts
+++ b/app/scripts/controller-init/multichain/multichain-account-service-init.ts
@@ -1,9 +1,8 @@
 import {
   MultichainAccountService,
-  AccountProviderWrapper,
   SOL_ACCOUNT_PROVIDER_NAME,
-  BtcAccountProvider,
-  TrxAccountProvider,
+  TRX_ACCOUNT_PROVIDER_NAME,
+  BTC_ACCOUNT_PROVIDER_NAME,
 } from '@metamask/multichain-account-service';
 import { ControllerInitFunction } from '../types';
 import {
@@ -11,7 +10,6 @@ import {
   MultichainAccountServiceInitMessenger,
 } from '../messengers/accounts';
 import { previousValueComparator } from '../../lib/util';
-import { isMultichainFeatureEnabled } from '../../../../shared/lib/multichain-feature-flags';
 import { trace } from '../../../../shared/lib/trace';
 
 /**
@@ -41,24 +39,19 @@ export const MultichainAccountServiceInit: ControllerInitFunction<
     },
     createAccounts: {
       timeoutMs: 3000,
+      batched: false,
+    },
+    resyncAccounts: {
+      autoRemoveExtraSnapAccounts: false,
     },
   };
 
-  const btcProvider = new AccountProviderWrapper(
-    controllerMessenger,
-    new BtcAccountProvider(controllerMessenger, snapAccountProviderConfig),
-  );
-
-  const trxProvider = new AccountProviderWrapper(
-    controllerMessenger,
-    new TrxAccountProvider(controllerMessenger, snapAccountProviderConfig),
-  );
-
   const controller = new MultichainAccountService({
     messenger: controllerMessenger,
-    providers: [btcProvider, trxProvider],
     providerConfigs: {
       [SOL_ACCOUNT_PROVIDER_NAME]: snapAccountProviderConfig,
+      [BTC_ACCOUNT_PROVIDER_NAME]: snapAccountProviderConfig,
+      [TRX_ACCOUNT_PROVIDER_NAME]: snapAccountProviderConfig,
     },
     config: {
       // @ts-expect-error Controller uses string for names rather than enum
@@ -91,72 +84,6 @@ export const MultichainAccountServiceInit: ControllerInitFunction<
     }, preferencesState),
   );
 
-  // Handle Bitcoin + Tron provider feature flag using previousValueComparator pattern
-  const initialRemoteFeatureFlagsState = initMessenger.call(
-    'RemoteFeatureFlagController:getState',
-  );
-
-  const initialBitcoinEnabled = isMultichainFeatureEnabled(
-    initialRemoteFeatureFlagsState?.remoteFeatureFlags?.bitcoinAccounts,
-  );
-  btcProvider.setEnabled(initialBitcoinEnabled);
-
-  const initialTronEnabled = isMultichainFeatureEnabled(
-    initialRemoteFeatureFlagsState?.remoteFeatureFlags?.tronAccounts,
-  );
-  trxProvider.setEnabled(initialTronEnabled);
-
-  controllerMessenger.subscribe(
-    'RemoteFeatureFlagController:stateChange',
-    previousValueComparator((prevState, currState) => {
-      const prevBitcoinEnabled = isMultichainFeatureEnabled(
-        prevState?.remoteFeatureFlags?.bitcoinAccounts,
-      );
-      const currBitcoinEnabled = isMultichainFeatureEnabled(
-        currState?.remoteFeatureFlags?.bitcoinAccounts,
-      );
-
-      if (prevBitcoinEnabled !== currBitcoinEnabled) {
-        // Enable/disable Bitcoin provider based on feature flag
-        btcProvider.setEnabled(currBitcoinEnabled);
-
-        // Trigger wallet alignment when Bitcoin accounts are enabled
-        // This will create Bitcoin accounts for existing wallets
-        if (currBitcoinEnabled) {
-          controller.alignWallets().catch((error) => {
-            console.error(
-              'Failed to align wallets after enabling Bitcoin provider:',
-              error,
-            );
-          });
-        }
-        // Note: When disabled, no action needed as the provider won't create new accounts
-      }
-
-      const prevTronEnabled = isMultichainFeatureEnabled(
-        prevState?.remoteFeatureFlags?.tronAccounts,
-      );
-      const currTronEnabled = isMultichainFeatureEnabled(
-        currState?.remoteFeatureFlags?.tronAccounts,
-      );
-
-      if (prevTronEnabled !== currTronEnabled) {
-        trxProvider.setEnabled(currTronEnabled);
-
-        if (currTronEnabled) {
-          controller.alignWallets().catch((error) => {
-            console.error(
-              'Failed to align wallets after enabling Tron provider:',
-              error,
-            );
-          });
-        }
-      }
-
-      return true;
-    }, initialRemoteFeatureFlagsState),
-  );
-
   return {
     memStateKey: null,
     persistedStateKey: null,
diff --git a/app/scripts/controller-init/multichain/multichain-assets-controller-init.test.ts b/app/scripts/controller-init/multichain/multichain-assets-controller-init.test.ts
index 626012b10b13..f27bffa2a43a 100644
--- a/app/scripts/controller-init/multichain/multichain-assets-controller-init.test.ts
+++ b/app/scripts/controller-init/multichain/multichain-assets-controller-init.test.ts
@@ -1,10 +1,10 @@
-import { MultichainAssetsController } from '@metamask/assets-controllers';
-import { buildControllerInitRequestMock } from '../test/utils';
-import { ControllerInitRequest } from '../types';
 import {
-  getMultichainAssetsControllerMessenger,
+  MultichainAssetsController,
   MultichainAssetsControllerMessenger,
-} from '../messengers/multichain';
+} from '@metamask/assets-controllers';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { ControllerInitRequest } from '../types';
+import { getMultichainAssetsControllerMessenger } from '../messengers/multichain';
 import { getRootMessenger } from '../../lib/messenger';
 import { MultichainAssetsControllerInit } from './multichain-assets-controller-init';
 
diff --git a/app/scripts/controller-init/multichain/multichain-assets-controller-init.ts b/app/scripts/controller-init/multichain/multichain-assets-controller-init.ts
index 72439263760d..8f789a131b6d 100644
--- a/app/scripts/controller-init/multichain/multichain-assets-controller-init.ts
+++ b/app/scripts/controller-init/multichain/multichain-assets-controller-init.ts
@@ -1,6 +1,8 @@
-import { MultichainAssetsController } from '@metamask/assets-controllers';
+import {
+  MultichainAssetsController,
+  MultichainAssetsControllerMessenger,
+} from '@metamask/assets-controllers';
 import { ControllerInitFunction } from '../types';
-import { MultichainAssetsControllerMessenger } from '../messengers/multichain';
 
 /**
  * Initialize the Multichain Assets controller.
diff --git a/app/scripts/controller-init/permission-controller-init.ts b/app/scripts/controller-init/permission-controller-init.ts
index c3bad05edeb4..feeb9c7f30be 100644
--- a/app/scripts/controller-init/permission-controller-init.ts
+++ b/app/scripts/controller-init/permission-controller-init.ts
@@ -52,11 +52,11 @@ export const PermissionControllerInit: ControllerInitFunction<
       ),
       isNonEvmScopeSupported: initMessenger.call.bind(
         initMessenger,
-        'MultichainRouter:isSupportedScope',
+        'MultichainRoutingService:isSupportedScope',
       ),
       getNonEvmAccountAddresses: initMessenger.call.bind(
         initMessenger,
-        'MultichainRouter:getSupportedAccounts',
+        'MultichainRoutingService:getSupportedAccounts',
       ),
     }),
     permissionSpecifications: {
diff --git a/app/scripts/controller-init/perps-controller-init.test.ts b/app/scripts/controller-init/perps-controller-init.test.ts
index b5ecb13f9be5..09ef8d064c4c 100644
--- a/app/scripts/controller-init/perps-controller-init.test.ts
+++ b/app/scripts/controller-init/perps-controller-init.test.ts
@@ -61,6 +61,11 @@ jest.mock('@metamask/perps-controller', () => ({
     updateMargin: jest.fn(),
     flipPosition: jest.fn(),
     withdraw: jest.fn(),
+    validateWithdrawal: jest.fn(),
+    getWithdrawalRoutes: jest.fn(),
+    updateWithdrawalStatus: jest.fn(),
+    updateWithdrawalProgress: jest.fn(),
+    getWithdrawalProgress: jest.fn(),
     depositWithConfirmation: jest.fn(),
     getPositions: jest.fn(),
     getMarkets: jest.fn(),
@@ -95,6 +100,7 @@ jest.mock('@metamask/perps-controller', () => ({
     getOrderBookGrouping: jest.fn(),
     getActiveProvider: jest.fn().mockReturnValue({
       getUserHistory: jest.fn(),
+      getUserNonFundingLedgerUpdates: jest.fn(),
     }),
     clearDepositResult: jest.fn(),
     clearWithdrawResult: jest.fn(),
@@ -311,6 +317,11 @@ describe('PerpsControllerInit', () => {
       ['perpsUpdateMargin', 'updateMargin'],
       ['perpsFlipPosition', 'flipPosition'],
       ['perpsWithdraw', 'withdraw'],
+      ['perpsValidateWithdrawal', 'validateWithdrawal'],
+      ['perpsGetWithdrawalRoutes', 'getWithdrawalRoutes'],
+      ['perpsUpdateWithdrawalStatus', 'updateWithdrawalStatus'],
+      ['perpsUpdateWithdrawalProgress', 'updateWithdrawalProgress'],
+      ['perpsGetWithdrawalProgress', 'getWithdrawalProgress'],
       ['perpsGetPositions', 'getPositions'],
       ['perpsGetMarkets', 'getMarkets'],
       ['perpsGetMarketDataWithPrices', 'getMarketDataWithPrices'],
@@ -398,5 +409,16 @@ describe('PerpsControllerInit', () => {
         controller.getActiveProvider().getUserHistory,
       ).toHaveBeenCalledWith(params);
     });
+
+    it('perpsGetUserNonFundingLedgerUpdates calls provider.getUserNonFundingLedgerUpdates', async () => {
+      const { api, controller } = initWithApi();
+      const params = { startTime: 0 };
+
+      await api.perpsGetUserNonFundingLedgerUpdates(params);
+
+      expect(
+        controller.getActiveProvider().getUserNonFundingLedgerUpdates,
+      ).toHaveBeenCalledWith(params);
+    });
   });
 });
diff --git a/app/scripts/controller-init/perps-controller-init.ts b/app/scripts/controller-init/perps-controller-init.ts
index f045abbc0bcc..83a84cb912ec 100644
--- a/app/scripts/controller-init/perps-controller-init.ts
+++ b/app/scripts/controller-init/perps-controller-init.ts
@@ -1,4 +1,8 @@
-import { PerpsController, UserHistoryItem } from '@metamask/perps-controller';
+import {
+  PerpsController,
+  type RawLedgerUpdate,
+  type UserHistoryItem,
+} from '@metamask/perps-controller';
 import { createPerpsInfrastructure } from '../controllers/perps/infrastructure';
 import { ControllerInitFunction } from './types';
 import { PerpsControllerMessenger } from './messengers/perps-controller-messenger';
@@ -63,6 +67,12 @@ type PerpsActionName =
   | 'perpsUpdateMargin'
   | 'perpsFlipPosition'
   | 'perpsWithdraw'
+  | 'perpsValidateWithdrawal'
+  | 'perpsGetWithdrawalRoutes'
+  | 'perpsUpdateWithdrawalStatus'
+  | 'perpsUpdateWithdrawalProgress'
+  | 'perpsGetWithdrawalProgress'
+  | 'perpsGetUserNonFundingLedgerUpdates'
   | 'perpsDepositWithConfirmation'
   | 'perpsGetPositions'
   | 'perpsGetMarkets'
@@ -111,7 +121,8 @@ type PerpsActionName =
 // method, these can be removed and the mapped type will cover them automatically.
 type PerpsCustomApiNames =
   | 'perpsDepositWithConfirmation'
-  | 'perpsGetUserHistory';
+  | 'perpsGetUserHistory'
+  | 'perpsGetUserNonFundingLedgerUpdates';
 
 type PerpsBackgroundApi = {
   [ActionName in Exclude<
@@ -131,6 +142,11 @@ type PerpsBackgroundApi = {
     endTime?: number;
     accountId?: `${string}:${string}:${string}`;
   }) => Promise<UserHistoryItem[]>;
+  perpsGetUserNonFundingLedgerUpdates: (params?: {
+    startTime?: number;
+    endTime?: number;
+    accountId?: string;
+  }) => Promise<RawLedgerUpdate[]>;
 };
 
 function getApi(controller: PerpsController): PerpsBackgroundApi {
@@ -150,6 +166,14 @@ function getApi(controller: PerpsController): PerpsBackgroundApi {
     perpsUpdateMargin: controller.updateMargin.bind(controller),
     perpsFlipPosition: controller.flipPosition.bind(controller),
     perpsWithdraw: controller.withdraw.bind(controller),
+    perpsValidateWithdrawal: controller.validateWithdrawal.bind(controller),
+    perpsGetWithdrawalRoutes: controller.getWithdrawalRoutes.bind(controller),
+    perpsUpdateWithdrawalStatus:
+      controller.updateWithdrawalStatus.bind(controller),
+    perpsUpdateWithdrawalProgress:
+      controller.updateWithdrawalProgress.bind(controller),
+    perpsGetWithdrawalProgress:
+      controller.getWithdrawalProgress.bind(controller),
     perpsDepositWithConfirmation: async (
       ...args: Parameters<typeof controller.depositWithConfirmation>
     ) => {
@@ -225,6 +249,15 @@ function getApi(controller: PerpsController): PerpsBackgroundApi {
     }) => {
       return controller.getActiveProvider().getUserHistory(params);
     },
+    perpsGetUserNonFundingLedgerUpdates: async (params?: {
+      startTime?: number;
+      endTime?: number;
+      accountId?: string;
+    }) => {
+      return controller
+        .getActiveProvider()
+        .getUserNonFundingLedgerUpdates(params);
+    },
 
     // -- Misc --
     perpsClearDepositResult: controller.clearDepositResult.bind(controller),
diff --git a/app/scripts/controller-init/snaps/cronjob-controller-init.test.ts b/app/scripts/controller-init/snaps/cronjob-controller-init.test.ts
index 7d084704a50b..f758f073f66f 100644
--- a/app/scripts/controller-init/snaps/cronjob-controller-init.test.ts
+++ b/app/scripts/controller-init/snaps/cronjob-controller-init.test.ts
@@ -1,10 +1,10 @@
-import { CronjobController } from '@metamask/snaps-controllers';
-import { ControllerInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
+  CronjobController,
   CronjobControllerMessenger,
-  getCronjobControllerMessenger,
-} from '../messengers/snaps';
+} from '@metamask/snaps-controllers';
+import { ControllerInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getCronjobControllerMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
 import { CronjobControllerInit } from './cronjob-controller-init';
 
diff --git a/app/scripts/controller-init/snaps/cronjob-controller-init.ts b/app/scripts/controller-init/snaps/cronjob-controller-init.ts
index 32970b5f5431..f465dc40bf4d 100644
--- a/app/scripts/controller-init/snaps/cronjob-controller-init.ts
+++ b/app/scripts/controller-init/snaps/cronjob-controller-init.ts
@@ -1,6 +1,8 @@
-import { CronjobController } from '@metamask/snaps-controllers';
+import {
+  CronjobController,
+  CronjobControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitFunction } from '../types';
-import { CronjobControllerMessenger } from '../messengers/snaps';
 
 /**
  * Initialize the cronjob controller.
diff --git a/app/scripts/controller-init/snaps/execution-service-init.test.ts b/app/scripts/controller-init/snaps/execution-service-init.test.ts
index e613c4be09f3..9e772155e491 100644
--- a/app/scripts/controller-init/snaps/execution-service-init.test.ts
+++ b/app/scripts/controller-init/snaps/execution-service-init.test.ts
@@ -1,13 +1,11 @@
 import {
+  ExecutionServiceMessenger,
   IframeExecutionService,
   OffscreenExecutionService,
 } from '@metamask/snaps-controllers';
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
-import {
-  ExecutionServiceMessenger,
-  getExecutionServiceMessenger,
-} from '../messengers/snaps';
+import { getExecutionServiceMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
 import { ExecutionServiceInit } from './execution-service-init';
 
diff --git a/app/scripts/controller-init/snaps/execution-service-init.ts b/app/scripts/controller-init/snaps/execution-service-init.ts
index 6dc6c480e807..85218e249779 100644
--- a/app/scripts/controller-init/snaps/execution-service-init.ts
+++ b/app/scripts/controller-init/snaps/execution-service-init.ts
@@ -1,5 +1,6 @@
 import {
-  AbstractExecutionService,
+  ExecutionService,
+  ExecutionServiceMessenger,
   IframeExecutionService,
   OffscreenExecutionService,
 } from '@metamask/snaps-controllers';
@@ -8,7 +9,6 @@ import { SubjectType } from '@metamask/permission-controller';
 import { Duplex } from 'readable-stream';
 import { ControllerInitFunction } from '../types';
 import { isManifestV3 } from '../../../../shared/lib/mv3.utils';
-import { ExecutionServiceMessenger } from '../messengers/snaps';
 import { setupMultiplex } from '../../lib/stream-utils';
 import {
   METAMASK_CAIP_MULTICHAIN_PROVIDER,
@@ -29,7 +29,7 @@ import {
  * @returns The initialized controller.
  */
 export const ExecutionServiceInit: ControllerInitFunction<
-  AbstractExecutionService<unknown>,
+  ExecutionService,
   ExecutionServiceMessenger
 > = ({
   controllerMessenger,
diff --git a/app/scripts/controller-init/snaps/index.ts b/app/scripts/controller-init/snaps/index.ts
index f568b5886bb6..b9ec9ba8e1d7 100644
--- a/app/scripts/controller-init/snaps/index.ts
+++ b/app/scripts/controller-init/snaps/index.ts
@@ -1,10 +1,10 @@
 export { CronjobControllerInit } from './cronjob-controller-init';
 export { ExecutionServiceInit } from './execution-service-init';
-export { MultichainRouterInit } from './multichain-router-init';
+export { MultichainRoutingServiceInit } from './multichain-routing-service-init';
 export { RateLimitControllerInit } from './rate-limit-controller-init';
 export { SnapControllerInit } from './snap-controller-init';
 export { SnapInsightsControllerInit } from './snap-insights-controller-init';
 export { SnapInterfaceControllerInit } from './snap-interface-controller-init';
 export { SnapsNameProviderInit } from './snaps-name-provider-init';
-export { SnapsRegistryInit } from './snaps-registry-init';
+export { SnapRegistryControllerInit } from './snap-registry-controller-init';
 export { WebSocketServiceInit } from './websocket-service-init';
diff --git a/app/scripts/controller-init/snaps/multichain-router-init.test.ts b/app/scripts/controller-init/snaps/multichain-routing-service-init.test.ts
similarity index 53%
rename from app/scripts/controller-init/snaps/multichain-router-init.test.ts
rename to app/scripts/controller-init/snaps/multichain-routing-service-init.test.ts
index 36ec35f12588..f092f86b9e0e 100644
--- a/app/scripts/controller-init/snaps/multichain-router-init.test.ts
+++ b/app/scripts/controller-init/snaps/multichain-routing-service-init.test.ts
@@ -1,47 +1,47 @@
-import { MultichainRouter } from '@metamask/snaps-controllers';
+import {
+  MultichainRoutingService,
+  MultichainRoutingServiceMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
-import {
-  MultichainRouterMessenger,
-  getMultichainRouterMessenger,
-} from '../messengers/snaps';
+import { getMultichainRoutingServiceMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
-import { MultichainRouterInit } from './multichain-router-init';
+import { MultichainRoutingServiceInit } from './multichain-routing-service-init';
 
 jest.mock('@metamask/snaps-controllers');
 
 function getInitRequestMock(): jest.Mocked<
-  ControllerInitRequest<MultichainRouterMessenger>
+  ControllerInitRequest<MultichainRoutingServiceMessenger>
 > {
   const baseMessenger = getRootMessenger<never, never>();
 
   const requestMock = {
     ...buildControllerInitRequestMock(),
-    controllerMessenger: getMultichainRouterMessenger(baseMessenger),
+    controllerMessenger: getMultichainRoutingServiceMessenger(baseMessenger),
     initMessenger: undefined,
   };
 
   return requestMock;
 }
 
-describe('MultichainRouterInit', () => {
+describe('MultichainRoutingServiceInit', () => {
   it('initializes the multichain router', () => {
-    const { controller } = MultichainRouterInit(getInitRequestMock());
-    expect(controller).toBeInstanceOf(MultichainRouter);
+    const { controller } = MultichainRoutingServiceInit(getInitRequestMock());
+    expect(controller).toBeInstanceOf(MultichainRoutingService);
   });
 
   it('does not store state', () => {
     const { memStateKey, persistedStateKey } =
-      MultichainRouterInit(getInitRequestMock());
+      MultichainRoutingServiceInit(getInitRequestMock());
 
     expect(memStateKey).toBeNull();
     expect(persistedStateKey).toBeNull();
   });
 
   it('passes the proper arguments to the router', () => {
-    MultichainRouterInit(getInitRequestMock());
+    MultichainRoutingServiceInit(getInitRequestMock());
 
-    const controllerMock = jest.mocked(MultichainRouter);
+    const controllerMock = jest.mocked(MultichainRoutingService);
     expect(controllerMock).toHaveBeenCalledWith({
       messenger: expect.any(Object),
       withSnapKeyring: expect.any(Function),
diff --git a/app/scripts/controller-init/snaps/multichain-router-init.ts b/app/scripts/controller-init/snaps/multichain-routing-service-init.ts
similarity index 82%
rename from app/scripts/controller-init/snaps/multichain-router-init.ts
rename to app/scripts/controller-init/snaps/multichain-routing-service-init.ts
index e29e002e7f60..106b9062adc3 100644
--- a/app/scripts/controller-init/snaps/multichain-router-init.ts
+++ b/app/scripts/controller-init/snaps/multichain-routing-service-init.ts
@@ -1,23 +1,22 @@
+import { SnapKeyring } from '@metamask/eth-snap-keyring';
 import {
-  MultichainRouter,
-  MultichainRouterArgs,
+  MultichainRoutingService,
+  MultichainRoutingServiceMessenger,
 } from '@metamask/snaps-controllers';
-import { SnapKeyring } from '@metamask/eth-snap-keyring';
 import { ControllerInitFunction } from '../types';
-import { MultichainRouterMessenger } from '../messengers/snaps';
 import { KeyringType } from '../../../../shared/constants/keyring';
 
 /**
- * Initialize the multichain router.
+ * Initialize the multichain routing service.
  *
  * @param request - The request object.
  * @param request.controllerMessenger - The messenger to use for the service.
  * @param request.getController
  * @returns The initialized service.
  */
-export const MultichainRouterInit: ControllerInitFunction<
-  MultichainRouter,
-  MultichainRouterMessenger
+export const MultichainRoutingServiceInit: ControllerInitFunction<
+  MultichainRoutingService,
+  MultichainRoutingServiceMessenger
 > = ({ controllerMessenger, getController }) => {
   const keyringController = getController('KeyringController');
   const appStateController = getController('AppStateController');
@@ -44,7 +43,9 @@ export const MultichainRouterInit: ControllerInitFunction<
   // locked, it would cause a deadlock. This is a temporary fix until we can
   // refactor how we handle requests to the Snaps Keyring.
   // @ts-expect-error: Types of `SnapKeyring` are incompatible.
-  const withSnapKeyring: MultichainRouterArgs['withSnapKeyring'] = async <
+  const withSnapKeyring: ConstructorParameters<
+    typeof MultichainRoutingService
+  >[0]['withSnapKeyring'] = async <
     Type extends (options: { keyring: SnapKeyring }) => unknown,
   >(
     operation: Type,
@@ -54,7 +55,7 @@ export const MultichainRouterInit: ControllerInitFunction<
     return operation({ keyring });
   };
 
-  const controller = new MultichainRouter({
+  const controller = new MultichainRoutingService({
     messenger: controllerMessenger,
     withSnapKeyring,
   });
diff --git a/app/scripts/controller-init/snaps/snap-controller-init.test.ts b/app/scripts/controller-init/snaps/snap-controller-init.test.ts
index 6ebf83c06f41..8608701fd069 100644
--- a/app/scripts/controller-init/snaps/snap-controller-init.test.ts
+++ b/app/scripts/controller-init/snaps/snap-controller-init.test.ts
@@ -1,4 +1,7 @@
-import { SnapController } from '@metamask/snaps-controllers';
+import {
+  SnapController,
+  SnapControllerMessenger,
+} from '@metamask/snaps-controllers';
 import {
   MOCK_ANY_NAMESPACE,
   Messenger,
@@ -14,7 +17,6 @@ import {
   getSnapControllerInitMessenger,
   getSnapControllerMessenger,
   SnapControllerInitMessenger,
-  SnapControllerMessenger,
 } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
 import { SnapControllerInit } from './snap-controller-init';
diff --git a/app/scripts/controller-init/snaps/snap-controller-init.ts b/app/scripts/controller-init/snaps/snap-controller-init.ts
index dfed2185156a..ee4aaf243575 100644
--- a/app/scripts/controller-init/snaps/snap-controller-init.ts
+++ b/app/scripts/controller-init/snaps/snap-controller-init.ts
@@ -1,4 +1,7 @@
-import { SnapController } from '@metamask/snaps-controllers';
+import {
+  SnapController,
+  SnapControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { createDeferredPromise, Json } from '@metamask/utils';
 import { ControllerInitFunction } from '../types';
 import {
@@ -7,10 +10,7 @@ import {
   ExcludedSnapPermissions,
 } from '../../../../shared/constants/snaps/permissions';
 import { encryptorFactory } from '../../lib/encryptor-factory';
-import {
-  SnapControllerInitMessenger,
-  SnapControllerMessenger,
-} from '../messengers/snaps';
+import { SnapControllerInitMessenger } from '../messengers/snaps';
 import { getBooleanFlag } from '../../lib/util';
 import { OnboardingControllerState } from '../../controllers/onboarding';
 import { getMnemonicSeed } from '../../controllers/permissions/snaps/utils';
@@ -111,9 +111,6 @@ export const SnapControllerInit: ControllerInitFunction<
     // TODO: Look into the type mismatch.
     state: persistedState.SnapController,
 
-    // @ts-expect-error: `controllerMessenger` is not compatible with the
-    // expected type.
-    // TODO: Look into the type mismatch.
     messenger: controllerMessenger,
     featureFlags: {
       allowLocalSnaps,
diff --git a/app/scripts/controller-init/snaps/snap-insights-controller-init.test.ts b/app/scripts/controller-init/snaps/snap-insights-controller-init.test.ts
index 7c064fa9fc1e..456f7d0b0f8a 100644
--- a/app/scripts/controller-init/snaps/snap-insights-controller-init.test.ts
+++ b/app/scripts/controller-init/snaps/snap-insights-controller-init.test.ts
@@ -1,10 +1,10 @@
-import { SnapInsightsController } from '@metamask/snaps-controllers';
-import { ControllerInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
-  getSnapInsightsControllerMessenger,
+  SnapInsightsController,
   SnapInsightsControllerMessenger,
-} from '../messengers/snaps';
+} from '@metamask/snaps-controllers';
+import { ControllerInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getSnapInsightsControllerMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
 import { SnapInsightsControllerInit } from './snap-insights-controller-init';
 
diff --git a/app/scripts/controller-init/snaps/snap-insights-controller-init.ts b/app/scripts/controller-init/snaps/snap-insights-controller-init.ts
index 7ba84b1f4c46..705deb79f965 100644
--- a/app/scripts/controller-init/snaps/snap-insights-controller-init.ts
+++ b/app/scripts/controller-init/snaps/snap-insights-controller-init.ts
@@ -1,6 +1,8 @@
-import { SnapInsightsController } from '@metamask/snaps-controllers';
+import {
+  SnapInsightsController,
+  SnapInsightsControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitFunction } from '../types';
-import { SnapInsightsControllerMessenger } from '../messengers/snaps';
 
 /**
  * Initialize the Snap insights controller.
diff --git a/app/scripts/controller-init/snaps/snap-interface-controller-init.test.ts b/app/scripts/controller-init/snaps/snap-interface-controller-init.test.ts
index 5c85a87cfe4a..c53c5ebf96da 100644
--- a/app/scripts/controller-init/snaps/snap-interface-controller-init.test.ts
+++ b/app/scripts/controller-init/snaps/snap-interface-controller-init.test.ts
@@ -1,10 +1,10 @@
-import { SnapInterfaceController } from '@metamask/snaps-controllers';
-import { ControllerInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
-  getSnapInterfaceControllerMessenger,
+  SnapInterfaceController,
   SnapInterfaceControllerMessenger,
-} from '../messengers/snaps';
+} from '@metamask/snaps-controllers';
+import { ControllerInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getSnapInterfaceControllerMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
 import { SnapInterfaceControllerInit } from './snap-interface-controller-init';
 
diff --git a/app/scripts/controller-init/snaps/snap-interface-controller-init.ts b/app/scripts/controller-init/snaps/snap-interface-controller-init.ts
index 26552379092c..d57cd006efd3 100644
--- a/app/scripts/controller-init/snaps/snap-interface-controller-init.ts
+++ b/app/scripts/controller-init/snaps/snap-interface-controller-init.ts
@@ -1,6 +1,8 @@
-import { SnapInterfaceController } from '@metamask/snaps-controllers';
+import {
+  SnapInterfaceController,
+  SnapInterfaceControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitFunction } from '../types';
-import { SnapInterfaceControllerMessenger } from '../messengers/snaps';
 
 /**
  * Initialize the Snap interface controller.
@@ -19,9 +21,6 @@ export const SnapInterfaceControllerInit: ControllerInitFunction<
     // with the expected type.
     // TODO: Look into the type mismatch.
     state: persistedState.SnapInterfaceController,
-    // @ts-expect-error: `controllerMessenger` is not compatible with the
-    // expected type.
-    // TODO: Look into the type mismatch.
     messenger: controllerMessenger,
   });
 
diff --git a/app/scripts/controller-init/snaps/snaps-registry-init.test.ts b/app/scripts/controller-init/snaps/snap-registry-controller-init.test.ts
similarity index 60%
rename from app/scripts/controller-init/snaps/snaps-registry-init.test.ts
rename to app/scripts/controller-init/snaps/snap-registry-controller-init.test.ts
index 5763dbc88cb8..3628098443ac 100644
--- a/app/scripts/controller-init/snaps/snaps-registry-init.test.ts
+++ b/app/scripts/controller-init/snaps/snap-registry-controller-init.test.ts
@@ -1,30 +1,30 @@
-import { JsonSnapsRegistry } from '@metamask/snaps-controllers';
+import {
+  SnapRegistryController,
+  SnapRegistryControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
-import {
-  getSnapsRegistryMessenger,
-  SnapsRegistryMessenger,
-} from '../messengers/snaps';
+import { getSnapRegistryControllerMessenger } from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
-import { SnapsRegistryInit } from './snaps-registry-init';
+import { SnapRegistryControllerInit } from './snap-registry-controller-init';
 
 jest.mock('@metamask/snaps-controllers');
 
 function getInitRequestMock(): jest.Mocked<
-  ControllerInitRequest<SnapsRegistryMessenger>
+  ControllerInitRequest<SnapRegistryControllerMessenger>
 > {
   const baseMessenger = getRootMessenger<never, never>();
 
   const requestMock = {
     ...buildControllerInitRequestMock(),
-    controllerMessenger: getSnapsRegistryMessenger(baseMessenger),
+    controllerMessenger: getSnapRegistryControllerMessenger(baseMessenger),
     initMessenger: undefined,
   };
 
   return requestMock;
 }
 
-describe('SnapsRegistryInit', () => {
+describe('SnapRegistryControllerInit', () => {
   const metamaskVersion = process.env.METAMASK_VERSION;
   beforeAll(() => {
     process.env.METAMASK_VERSION = '13.9.0-flask.0';
@@ -35,14 +35,14 @@ describe('SnapsRegistryInit', () => {
   });
 
   it('initializes the controller', () => {
-    const { controller } = SnapsRegistryInit(getInitRequestMock());
-    expect(controller).toBeInstanceOf(JsonSnapsRegistry);
+    const { controller } = SnapRegistryControllerInit(getInitRequestMock());
+    expect(controller).toBeInstanceOf(SnapRegistryController);
   });
 
   it('passes the proper arguments to the controller', () => {
-    SnapsRegistryInit(getInitRequestMock());
+    SnapRegistryControllerInit(getInitRequestMock());
 
-    const controllerMock = jest.mocked(JsonSnapsRegistry);
+    const controllerMock = jest.mocked(SnapRegistryController);
     expect(controllerMock).toHaveBeenCalledWith({
       messenger: expect.any(Object),
       state: undefined,
diff --git a/app/scripts/controller-init/snaps/snaps-registry-init.ts b/app/scripts/controller-init/snaps/snap-registry-controller-init.ts
similarity index 72%
rename from app/scripts/controller-init/snaps/snaps-registry-init.ts
rename to app/scripts/controller-init/snaps/snap-registry-controller-init.ts
index e0c48fda86cc..3f6d8f076b99 100644
--- a/app/scripts/controller-init/snaps/snaps-registry-init.ts
+++ b/app/scripts/controller-init/snaps/snap-registry-controller-init.ts
@@ -1,8 +1,10 @@
-import { JsonSnapsRegistry } from '@metamask/snaps-controllers';
+import {
+  SnapRegistryController,
+  SnapRegistryControllerMessenger,
+} from '@metamask/snaps-controllers';
 import { SemVerVersion } from '@metamask/utils';
 import { parse } from 'semver';
 import { ControllerInitFunction } from '../types';
-import { SnapsRegistryMessenger } from '../messengers/snaps';
 import { getBooleanFlag } from '../../lib/util';
 
 /**
@@ -13,9 +15,9 @@ import { getBooleanFlag } from '../../lib/util';
  * @param request.persistedState - The persisted state of the extension.
  * @returns The initialized controller.
  */
-export const SnapsRegistryInit: ControllerInitFunction<
-  JsonSnapsRegistry,
-  SnapsRegistryMessenger
+export const SnapRegistryControllerInit: ControllerInitFunction<
+  SnapRegistryController,
+  SnapRegistryControllerMessenger
 > = ({ controllerMessenger, persistedState }) => {
   const requireAllowlist = getBooleanFlag(process.env.REQUIRE_SNAPS_ALLOWLIST);
 
@@ -28,11 +30,11 @@ export const SnapsRegistryInit: ControllerInitFunction<
       : originalVersion
   ) as SemVerVersion;
 
-  const controller = new JsonSnapsRegistry({
-    // @ts-expect-error: `persistedState.SnapsRegistry` is not compatible
-    // with the expected type.
+  const controller = new SnapRegistryController({
+    // @ts-expect-error: `persistedState.SnapRegistryController` is not
+    // compatible with the expected type.
     // TODO: Look into the type mismatch.
-    state: persistedState.SnapsRegistry,
+    state: persistedState.SnapRegistryController,
     messenger: controllerMessenger,
     refetchOnAllowlistMiss: requireAllowlist,
     clientConfig: {
diff --git a/app/scripts/controller-init/snaps/snaps-name-provider-init.test.ts b/app/scripts/controller-init/snaps/snaps-name-provider-init.test.ts
index 58987f70724a..944be24a9646 100644
--- a/app/scripts/controller-init/snaps/snaps-name-provider-init.test.ts
+++ b/app/scripts/controller-init/snaps/snaps-name-provider-init.test.ts
@@ -1,11 +1,11 @@
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
+import { getSnapsNameProviderMessenger } from '../messengers/snaps';
+import { getRootMessenger } from '../../lib/messenger';
 import {
-  getSnapsNameProviderMessenger,
+  SnapsNameProvider,
   SnapsNameProviderMessenger,
-} from '../messengers/snaps';
-import { getRootMessenger } from '../../lib/messenger';
-import { SnapsNameProvider } from '../../lib/SnapsNameProvider';
+} from '../../lib/SnapsNameProvider';
 import { SnapsNameProviderInit } from './snaps-name-provider-init';
 
 jest.mock('../../lib/SnapsNameProvider');
diff --git a/app/scripts/controller-init/snaps/snaps-name-provider-init.ts b/app/scripts/controller-init/snaps/snaps-name-provider-init.ts
index 7591e706673e..f2c6e231808a 100644
--- a/app/scripts/controller-init/snaps/snaps-name-provider-init.ts
+++ b/app/scripts/controller-init/snaps/snaps-name-provider-init.ts
@@ -1,5 +1,7 @@
-import { SnapsNameProvider } from '../../lib/SnapsNameProvider';
-import { SnapsNameProviderMessenger } from '../messengers/snaps';
+import {
+  SnapsNameProvider,
+  SnapsNameProviderMessenger,
+} from '../../lib/SnapsNameProvider';
 import { ControllerInitFunction } from '../types';
 
 /**
diff --git a/app/scripts/controller-init/snaps/websocket-service-init.test.ts b/app/scripts/controller-init/snaps/websocket-service-init.test.ts
index 2d3970f00472..bad4a12c2bb0 100644
--- a/app/scripts/controller-init/snaps/websocket-service-init.test.ts
+++ b/app/scripts/controller-init/snaps/websocket-service-init.test.ts
@@ -1,15 +1,15 @@
-import { WebSocketService } from '@metamask/snaps-controllers';
+import {
+  WebSocketService,
+  WebSocketServiceMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
-import {
-  CronjobControllerMessenger,
-  getWebSocketServiceMessenger,
-} from '../messengers/snaps';
 import { getRootMessenger } from '../../lib/messenger';
+import { getWebSocketServiceMessenger } from '../messengers/snaps';
 import { WebSocketServiceInit } from './websocket-service-init';
 
 function getInitRequestMock(): jest.Mocked<
-  ControllerInitRequest<CronjobControllerMessenger>
+  ControllerInitRequest<WebSocketServiceMessenger>
 > {
   const baseMessenger = getRootMessenger<never, never>();
 
diff --git a/app/scripts/controller-init/snaps/websocket-service-init.ts b/app/scripts/controller-init/snaps/websocket-service-init.ts
index 3a6fe3ef1a83..1b2c00f8b90c 100644
--- a/app/scripts/controller-init/snaps/websocket-service-init.ts
+++ b/app/scripts/controller-init/snaps/websocket-service-init.ts
@@ -1,6 +1,8 @@
-import { WebSocketService } from '@metamask/snaps-controllers';
+import {
+  WebSocketService,
+  WebSocketServiceMessenger,
+} from '@metamask/snaps-controllers';
 import { ControllerInitFunction } from '../types';
-import { WebSocketServiceMessenger } from '../messengers/snaps';
 
 /**
  * Initialize the WebSocket service.
diff --git a/app/scripts/controller-init/utils.ts b/app/scripts/controller-init/utils.ts
index feca9ee8262a..7225da79facb 100644
--- a/app/scripts/controller-init/utils.ts
+++ b/app/scripts/controller-init/utils.ts
@@ -51,7 +51,7 @@ export type ControllersToInitialize =
   | 'NotificationServicesController'
   | 'NotificationServicesPushController'
   | 'RateLimitController'
-  | 'SnapsRegistry'
+  | 'SnapRegistryController'
   | 'SnapController'
   | 'SnapInsightsController'
   | 'SnapInterfaceController'
diff --git a/app/scripts/controllers/institutional-snap/InstitutionalSnapController.ts b/app/scripts/controllers/institutional-snap/InstitutionalSnapController.ts
index 28d2c3e89e79..64a029f23790 100644
--- a/app/scripts/controllers/institutional-snap/InstitutionalSnapController.ts
+++ b/app/scripts/controllers/institutional-snap/InstitutionalSnapController.ts
@@ -4,7 +4,7 @@ import {
   TransactionMeta,
   TransactionStatus,
 } from '@metamask/transaction-controller';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { HandlerType } from '@metamask/snaps-utils';
 import {
   BaseController,
@@ -25,10 +25,12 @@ const SNAP_ID = INSTITUTIONAL_WALLET_SNAP_ID;
 
 const controllerName = 'InstitutionalSnapController';
 
-type SnapRPCRequest = Parameters<HandleSnapRequest['handler']>[0];
+type SnapRPCRequest = Parameters<
+  SnapControllerHandleRequestAction['handler']
+>[0];
 
 export type AllowedActions =
-  | HandleSnapRequest
+  | SnapControllerHandleRequestAction
   | AccountsControllerGetAccountByAddressAction
   | TransactionControllerUpdateCustodialTransactionAction;
 
diff --git a/app/scripts/controllers/permissions/background-api.test.js b/app/scripts/controllers/permissions/background-api.test.ts
similarity index 94%
rename from app/scripts/controllers/permissions/background-api.test.js
rename to app/scripts/controllers/permissions/background-api.test.ts
index dcb28a4f870b..53e19c8fb8ec 100644
--- a/app/scripts/controllers/permissions/background-api.test.js
+++ b/app/scripts/controllers/permissions/background-api.test.ts
@@ -6,9 +6,14 @@ import {
   Caip25CaveatType,
   Caip25EndowmentPermissionName,
 } from '@metamask/chain-agnostic-permission';
+import type { AccountsControllerState } from '@metamask/accounts-controller';
+import type { NetworkConfiguration } from '@metamask/network-controller';
 import { flushPromises } from '../../../../test/lib/timer-helpers';
 import * as NetworkSelectors from '../../../../shared/lib/selectors/networks';
-import { getPermissionBackgroundApiMethods } from './background-api';
+import {
+  getPermissionBackgroundApiMethods,
+  PermissionBackgroundApiOptions,
+} from './background-api';
 
 jest.mock('../../../../shared/lib/selectors/networks', () => ({
   ...jest.requireActual('../../../../shared/lib/selectors/networks'),
@@ -16,7 +21,21 @@ jest.mock('../../../../shared/lib/selectors/networks', () => ({
 }));
 const MockNetworkSelectors = jest.mocked(NetworkSelectors);
 
-const setupPermissionBackgroundApiMethods = (overrides) => {
+const MOCK_EMPTY_INTERNAL_ACCOUNTS: AccountsControllerState['internalAccounts'] =
+  {
+    accounts: {},
+    selectedAccount: '',
+  };
+
+const MOCK_NETWORK_CONFIG = {} as NetworkConfiguration;
+
+const setupPermissionBackgroundApiMethods = (
+  overrides: Partial<{
+    [K in keyof PermissionBackgroundApiOptions]: Partial<
+      PermissionBackgroundApiOptions[K]
+    >;
+  }> = {},
+) => {
   const params = {
     permissionController: {
       getCaveat: jest.fn(),
@@ -30,7 +49,7 @@ const setupPermissionBackgroundApiMethods = (overrides) => {
     accountsController: {
       getAccountByAddress: jest.fn(),
       state: {
-        internalAccounts: {},
+        internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
       },
     },
     networkController: {
@@ -46,7 +65,9 @@ const setupPermissionBackgroundApiMethods = (overrides) => {
     ...overrides,
   };
 
-  return getPermissionBackgroundApiMethods(params);
+  return getPermissionBackgroundApiMethods(
+    params as PermissionBackgroundApiOptions,
+  );
 };
 
 describe('permission background API methods', () => {
@@ -81,7 +102,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -125,7 +149,7 @@ describe('permission background API methods', () => {
       const accountsController = {
         getAccountByAddress: jest.fn(),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -172,15 +196,15 @@ describe('permission background API methods', () => {
           scopes: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'],
         }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
       MockNetworkSelectors.getNetworkConfigurationsByCaipChainId.mockReturnValue(
         {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': {},
-          'solana:foo': {},
-          'solana:bar': {},
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': MOCK_NETWORK_CONFIG,
+          'solana:foo': MOCK_NETWORK_CONFIG,
+          'solana:bar': MOCK_NETWORK_CONFIG,
         },
       );
 
@@ -255,7 +279,7 @@ describe('permission background API methods', () => {
           scopes: ['eip155:0'],
         }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -333,7 +357,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -377,7 +404,7 @@ describe('permission background API methods', () => {
       const accountsController = {
         getAccountByAddress: jest.fn(),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -439,7 +466,7 @@ describe('permission background API methods', () => {
             scopes: ['eip155:0'],
           }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -529,15 +556,15 @@ describe('permission background API methods', () => {
             scopes: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'],
           }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
       MockNetworkSelectors.getNetworkConfigurationsByCaipChainId.mockReturnValue(
         {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': {},
-          'solana:foo': {},
-          'solana:bar': {},
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': MOCK_NETWORK_CONFIG,
+          'solana:foo': MOCK_NETWORK_CONFIG,
+          'solana:bar': MOCK_NETWORK_CONFIG,
         },
       );
 
@@ -606,7 +633,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -650,7 +680,7 @@ describe('permission background API methods', () => {
       const accountsController = {
         getAccountByAddress: jest.fn(),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -704,7 +734,7 @@ describe('permission background API methods', () => {
           scopes: ['eip155:0'],
         }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -746,7 +776,7 @@ describe('permission background API methods', () => {
           scopes: ['eip155:0'],
         }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -795,7 +825,7 @@ describe('permission background API methods', () => {
           scopes: ['eip155:0'],
         }),
         state: {
-          internalAccounts: {},
+          internalAccounts: MOCK_EMPTY_INTERNAL_ACCOUNTS,
         },
       };
 
@@ -857,7 +887,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -1106,7 +1139,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -1224,7 +1260,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -1345,7 +1384,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
@@ -1509,7 +1551,10 @@ describe('permission background API methods', () => {
     it('throws an error if there is no existing CAIP-25 caveat', () => {
       const permissionController = {
         getCaveat: jest.fn().mockImplementation(() => {
-          throw new PermissionDoesNotExistError();
+          throw new PermissionDoesNotExistError(
+            'foo.com',
+            Caip25EndowmentPermissionName,
+          );
         }),
       };
 
diff --git a/app/scripts/controllers/permissions/background-api.js b/app/scripts/controllers/permissions/background-api.ts
similarity index 72%
rename from app/scripts/controllers/permissions/background-api.js
rename to app/scripts/controllers/permissions/background-api.ts
index 3b8cc1fd3677..a6a610693f54 100644
--- a/app/scripts/controllers/permissions/background-api.js
+++ b/app/scripts/controllers/permissions/background-api.ts
@@ -5,6 +5,7 @@ import {
 } from '@metamask/permission-controller';
 import {
   Caip25CaveatType,
+  Caip25CaveatValue,
   Caip25EndowmentPermissionName,
   setNonSCACaipAccountIdsInCaip25CaveatValue,
   getCaipAccountIdsFromCaip25CaveatValue,
@@ -13,18 +14,77 @@ import {
   setChainIdsInCaip25CaveatValue,
 } from '@metamask/chain-agnostic-permission';
 import { isSnapId } from '@metamask/snaps-utils';
-import { parseCaipAccountId, parseCaipChainId } from '@metamask/utils';
+import {
+  type CaipAccountId,
+  type CaipChainId,
+  parseCaipAccountId,
+  parseCaipChainId,
+} from '@metamask/utils';
+import type { InternalAccount } from '@metamask/keyring-internal-api';
+import type { AccountsControllerState } from '@metamask/accounts-controller';
+import type { NetworkState } from '@metamask/network-controller';
+import type { MultichainNetworkControllerState } from '@metamask/multichain-network-controller';
 import { getNetworkConfigurationsByCaipChainId } from '../../../../shared/lib/selectors/networks';
 
+export type PermissionBackgroundApiOptions = {
+  permissionController: {
+    getCaveat(
+      origin: string,
+      targetName: string,
+      caveatType: string,
+    ): { value: Caip25CaveatValue };
+    updateCaveat(
+      origin: string,
+      targetName: string,
+      caveatType: string,
+      caveatValue: Caip25CaveatValue,
+    ): void;
+    grantPermissions(options: {
+      subject: { origin: string };
+      approvedPermissions: Record<string, unknown>;
+    }): void;
+    revokePermission(origin: string, targetName: string): void;
+  };
+  approvalController: {
+    addAndShowApprovalRequest(options: {
+      id: string;
+      origin: string;
+      requestData: {
+        metadata: { id: string; origin: string };
+        permissions: Record<string, unknown>;
+      };
+      type: string;
+    }): Promise<{ permissions: Record<string, unknown> }>;
+  };
+  accountsController: {
+    getAccountByAddress(address: string): InternalAccount;
+    state: {
+      internalAccounts: AccountsControllerState['internalAccounts'];
+    };
+  };
+  networkController: {
+    state: {
+      networkConfigurationsByChainId: NetworkState['networkConfigurationsByChainId'];
+    };
+  };
+  multichainNetworkController: {
+    state: {
+      multichainNetworkConfigurationsByChainId: MultichainNetworkControllerState['multichainNetworkConfigurationsByChainId'];
+    };
+  };
+};
+
 export function getPermissionBackgroundApiMethods({
   permissionController,
   approvalController,
   accountsController,
   networkController,
   multichainNetworkController,
-}) {
+}: PermissionBackgroundApiOptions) {
   // Returns the CAIP-25 caveat or undefined if it does not exist
-  const getCaip25Caveat = (origin) => {
+  const getCaip25Caveat = (
+    origin: string,
+  ): { value: Caip25CaveatValue } | undefined => {
     let caip25Caveat;
     try {
       caip25Caveat = permissionController.getCaveat(
@@ -43,7 +103,10 @@ export function getPermissionBackgroundApiMethods({
     return caip25Caveat;
   };
 
-  const setPermittedAccounts = (origin, caipAccountIds) => {
+  const setPermittedAccounts = (
+    origin: string,
+    caipAccountIds: string[],
+  ): void => {
     const caip25Caveat = getCaip25Caveat(origin);
     if (!caip25Caveat) {
       throw new Error(
@@ -81,12 +144,14 @@ export function getPermissionBackgroundApiMethods({
     caipAccountIds.forEach((caipAccountAddress) => {
       const {
         chain: { namespace: accountNamespace },
-      } = parseCaipAccountId(caipAccountAddress);
+      } = parseCaipAccountId(caipAccountAddress as CaipAccountId);
 
       const existsSelectedChainForNamespace = updatedPermittedChainIds.some(
         (caipChainId) => {
           try {
-            const { namespace: chainNamespace } = parseCaipChainId(caipChainId);
+            const { namespace: chainNamespace } = parseCaipChainId(
+              caipChainId as CaipChainId,
+            );
             return accountNamespace === chainNamespace;
           } catch (err) {
             return false;
@@ -97,7 +162,9 @@ export function getPermissionBackgroundApiMethods({
       if (!existsSelectedChainForNamespace) {
         const chainIdsForNamespace = allNetworksList.filter((caipChainId) => {
           try {
-            const { namespace: chainNamespace } = parseCaipChainId(caipChainId);
+            const { namespace: chainNamespace } = parseCaipChainId(
+              caipChainId as CaipChainId,
+            );
             return accountNamespace === chainNamespace;
           } catch (err) {
             return false;
@@ -106,20 +173,20 @@ export function getPermissionBackgroundApiMethods({
 
         updatedPermittedChainIds = [
           ...updatedPermittedChainIds,
-          ...chainIdsForNamespace,
+          ...(chainIdsForNamespace as CaipChainId[]),
         ];
       }
     });
 
     const updatedCaveatValueWithChainIds = setChainIdsInCaip25CaveatValue(
       caip25Caveat.value,
-      updatedPermittedChainIds,
+      updatedPermittedChainIds as CaipChainId[],
     );
 
     const updatedCaveatValueWithAccountIds =
       setNonSCACaipAccountIdsInCaip25CaveatValue(
         updatedCaveatValueWithChainIds,
-        caipAccountIds,
+        caipAccountIds as CaipAccountId[],
       );
 
     permissionController.updateCaveat(
@@ -130,7 +197,7 @@ export function getPermissionBackgroundApiMethods({
     );
   };
 
-  const setPermittedChains = (origin, chainIds) => {
+  const setPermittedChains = (origin: string, chainIds: string[]): void => {
     const caip25Caveat = getCaip25Caveat(origin);
     if (!caip25Caveat) {
       throw new Error(
@@ -148,7 +215,7 @@ export function getPermissionBackgroundApiMethods({
     } else {
       const updatedCaveatValueWithChainIds = setChainIdsInCaip25CaveatValue(
         caip25Caveat.value,
-        chainIds,
+        chainIds as CaipChainId[],
       );
 
       const existingPermittedAccountIds =
@@ -169,7 +236,7 @@ export function getPermissionBackgroundApiMethods({
     }
   };
 
-  const addMoreAccounts = (origin, addresses) => {
+  const addMoreAccounts = (origin: string, addresses: string[]): void => {
     const caip25Caveat = getCaip25Caveat(origin);
     if (!caip25Caveat) {
       throw new Error(
@@ -196,10 +263,10 @@ export function getPermissionBackgroundApiMethods({
       new Set([...existingPermittedAccountIds, ...caipAccountIds]),
     );
 
-    setPermittedAccounts(origin, updatedAccountIds);
+    setPermittedAccounts(origin, updatedAccountIds as CaipAccountId[]);
   };
 
-  const addMoreChains = (origin, chainIds) => {
+  const addMoreChains = (origin: string, chainIds: string[]): void => {
     const caip25Caveat = getCaip25Caveat(origin);
     if (!caip25Caveat) {
       throw new Error(
@@ -215,10 +282,13 @@ export function getPermissionBackgroundApiMethods({
       new Set([...existingPermittedChainIds, ...chainIds]),
     );
 
-    setPermittedChains(origin, updatedChainIds);
+    setPermittedChains(origin, updatedChainIds as CaipChainId[]);
   };
 
-  const requestAccountsAndChainPermissions = async (origin, id) => {
+  const requestAccountsAndChainPermissions = async (
+    origin: string,
+    id: string,
+  ): Promise<void> => {
     /**
      * Note that we are purposely requesting an approval from the ApprovalController
      * and then manually forming the permission that is then granted via the
@@ -260,13 +330,13 @@ export function getPermissionBackgroundApiMethods({
   };
 
   return {
-    addPermittedAccount: (origin, address) =>
+    addPermittedAccount: (origin: string, address: string) =>
       addMoreAccounts(origin, [address]),
 
-    addPermittedAccounts: (origin, addresses) =>
+    addPermittedAccounts: (origin: string, addresses: string[]) =>
       addMoreAccounts(origin, addresses),
 
-    removePermittedAccount: (origin, address) => {
+    removePermittedAccount: (origin: string, address: string) => {
       const caip25Caveat = getCaip25Caveat(origin);
       if (!caip25Caveat) {
         throw new Error(
@@ -297,11 +367,13 @@ export function getPermissionBackgroundApiMethods({
 
     setPermittedAccounts,
 
-    addPermittedChain: (origin, chainId) => addMoreChains(origin, [chainId]),
+    addPermittedChain: (origin: string, chainId: string) =>
+      addMoreChains(origin, [chainId]),
 
-    addPermittedChains: (origin, chainIds) => addMoreChains(origin, chainIds),
+    addPermittedChains: (origin: string, chainIds: string[]) =>
+      addMoreChains(origin, chainIds),
 
-    removePermittedChain: (origin, chainId) => {
+    removePermittedChain: (origin: string, chainId: string) => {
       const caip25Caveat = getCaip25Caveat(origin);
       if (!caip25Caveat) {
         throw new Error(
@@ -326,7 +398,7 @@ export function getPermissionBackgroundApiMethods({
 
     setPermittedChains,
 
-    requestAccountsAndChainPermissionsWithId: (origin) => {
+    requestAccountsAndChainPermissionsWithId: (origin: string) => {
       const id = nanoid();
       requestAccountsAndChainPermissions(origin, id);
       return id;
diff --git a/app/scripts/controllers/permissions/snaps/specifications.ts b/app/scripts/controllers/permissions/snaps/specifications.ts
index 618cb5052c2a..82d24a8195af 100644
--- a/app/scripts/controllers/permissions/snaps/specifications.ts
+++ b/app/scripts/controllers/permissions/snaps/specifications.ts
@@ -5,13 +5,13 @@ import {
 import { ControllerGetStateAction } from '@metamask/base-controller';
 import { CurrencyRateController } from '@metamask/assets-controllers';
 import {
-  ClearSnapState,
-  GetSnap,
-  GetSnapState,
-  HandleSnapRequest,
-  UpdateSnapState,
-  CreateInterface,
-  GetInterface,
+  SnapControllerClearSnapStateAction,
+  SnapControllerGetSnapAction,
+  SnapControllerGetSnapStateAction,
+  SnapControllerHandleRequestAction,
+  SnapControllerUpdateSnapStateAction,
+  SnapInterfaceControllerCreateInterfaceAction,
+  SnapInterfaceControllerGetInterfaceAction,
   SnapInterfaceControllerSetInterfaceDisplayedAction,
 } from '@metamask/snaps-controllers';
 import {
@@ -37,16 +37,16 @@ import { getMnemonic, getMnemonicSeed } from './utils';
 
 export type SnapPermissionSpecificationsActions =
   | AppStateControllerGetUnlockPromiseAction
-  | ClearSnapState
+  | SnapControllerClearSnapStateAction
   | ControllerGetStateAction<
       'CurrencyRateController',
       CurrencyRateController['state']
     >
-  | CreateInterface
-  | GetInterface
-  | GetSnap
-  | GetSnapState
-  | HandleSnapRequest
+  | SnapInterfaceControllerCreateInterfaceAction
+  | SnapInterfaceControllerGetInterfaceAction
+  | SnapControllerGetSnapAction
+  | SnapControllerGetSnapStateAction
+  | SnapControllerHandleRequestAction
   | KeyringControllerGetKeyringsByTypeAction
   | KeyringControllerWithKeyringAction
   | MaybeUpdateState
@@ -54,7 +54,7 @@ export type SnapPermissionSpecificationsActions =
   | RateLimitControllerCallApiAction<RateLimitedApiMap>
   | SnapInterfaceControllerSetInterfaceDisplayedAction
   | TestOrigin
-  | UpdateSnapState;
+  | SnapControllerUpdateSnapStateAction;
 
 type SnapPermissionSpecificationsHooks = {
   addAndShowApprovalRequest(request: unknown): Promise<unknown>;
@@ -132,7 +132,7 @@ export function getSnapPermissionSpecifications(
           'AppStateController:getUnlockPromise',
         ),
 
-        getSnap: messenger.call.bind(messenger, 'SnapController:get'),
+        getSnap: messenger.call.bind(messenger, 'SnapController:getSnap'),
         handleSnapRpcRequest: messenger.call.bind(
           messenger,
           'SnapController:handleRequest',
diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
index 5a4a8d517c8b..bb39def6eea0 100644
--- a/app/scripts/controllers/permissions/specifications.js
+++ b/app/scripts/controllers/permissions/specifications.js
@@ -183,7 +183,6 @@ export const unrestrictedMethods = Object.freeze([
   'wallet_invokeSnap',
   'wallet_invokeKeyring',
   'snap_getClientStatus',
-  'snap_getCurrencyRate',
   'snap_clearState',
   'snap_getFile',
   'snap_getState',
@@ -197,7 +196,6 @@ export const unrestrictedMethods = Object.freeze([
   'snap_scheduleBackgroundEvent',
   'snap_cancelBackgroundEvent',
   'snap_getBackgroundEvents',
-  'snap_experimentalProviderRequest',
   'snap_trackError',
   'snap_trackEvent',
   'snap_openWebSocket',
diff --git a/app/scripts/controllers/preferences-controller.test.ts b/app/scripts/controllers/preferences-controller.test.ts
index 4b52335e6da0..1444a6a59dd3 100644
--- a/app/scripts/controllers/preferences-controller.test.ts
+++ b/app/scripts/controllers/preferences-controller.test.ts
@@ -123,19 +123,6 @@ describe('preferences controller', () => {
     });
   });
 
-  describe('useBlockie', () => {
-    it('defaults useBlockie to false', () => {
-      const { controller } = setupController({});
-      expect(controller.state.useBlockie).toStrictEqual(false);
-    });
-
-    it('setUseBlockie to true', () => {
-      const { controller } = setupController({});
-      controller.setUseBlockie(true);
-      expect(controller.state.useBlockie).toStrictEqual(true);
-    });
-  });
-
   describe('setCurrentLocale', () => {
     it('checks the default currentLocale', () => {
       const { controller } = setupController({});
@@ -675,7 +662,6 @@ describe('preferences controller', () => {
           "theme": "os",
           "use4ByteResolution": true,
           "useAddressBarEnsResolution": true,
-          "useBlockie": false,
           "useCurrencyRateCheck": true,
           "useMultiAccountBalanceChecker": true,
           "useNftDetection": true,
@@ -754,7 +740,6 @@ describe('preferences controller', () => {
           "theme": "os",
           "use4ByteResolution": true,
           "useAddressBarEnsResolution": true,
-          "useBlockie": false,
           "useCurrencyRateCheck": true,
           "useExternalNameSources": true,
           "useExternalServices": true,
@@ -837,7 +822,6 @@ describe('preferences controller', () => {
           "theme": "os",
           "use4ByteResolution": true,
           "useAddressBarEnsResolution": true,
-          "useBlockie": false,
           "useCurrencyRateCheck": true,
           "useExternalNameSources": true,
           "useExternalServices": true,
@@ -920,7 +904,6 @@ describe('preferences controller', () => {
           "theme": "os",
           "use4ByteResolution": true,
           "useAddressBarEnsResolution": true,
-          "useBlockie": false,
           "useCurrencyRateCheck": true,
           "useExternalNameSources": true,
           "useExternalServices": true,
@@ -1194,7 +1177,6 @@ describe('preferences controller', () => {
       const { controller } = setupController({
         state: {
           currentLocale: 'ja',
-          useBlockie: true,
           theme: ThemeType.dark,
           knownMethodData: { '0x12345678': 'transfer' },
           advancedGasFee: { '0x1': { maxBaseFee: '100', priorityFee: '10' } },
@@ -1230,14 +1212,12 @@ describe('preferences controller', () => {
 
       // Verify state was customized
       expect(controller.state.currentLocale).toBe('ja');
-      expect(controller.state.useBlockie).toBe(true);
       expect(controller.state.theme).toBe(ThemeType.dark);
 
       controller.resetState();
 
       // Verify state was reset to defaults
       expect(controller.state.currentLocale).toBe(FALLBACK_LOCALE);
-      expect(controller.state.useBlockie).toBe(false);
       expect(controller.state.theme).toBe(ThemeType.os);
       expect(controller.state.knownMethodData).toStrictEqual({});
       expect(controller.state.advancedGasFee).toStrictEqual({});
diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index fa671572e185..e069d5f654a3 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -138,8 +138,6 @@ export type PreferencesControllerState = Omit<
   theme: ThemeType;
   use4ByteResolution: boolean;
   useAddressBarEnsResolution: boolean;
-  /** @deprecated Use avatarType instead */
-  useBlockie: boolean;
   useCurrencyRateCheck: boolean;
   useExternalNameSources: boolean;
   useExternalServices: boolean;
@@ -207,7 +205,6 @@ export const getDefaultPreferencesControllerState =
     theme: ThemeType.os,
     use4ByteResolution: true,
     useAddressBarEnsResolution: true,
-    useBlockie: false,
     useCurrencyRateCheck: true,
     useExternalNameSources: true,
     // Turning OFF basic functionality toggle means turning OFF this useExternalServices flag.
@@ -372,13 +369,6 @@ const controllerMetadata: StateMetadata<PreferencesControllerState> = {
     includeInDebugSnapshot: true,
     usedInUi: true,
   },
-  /** @deprecated Use avatarType instead */
-  useBlockie: {
-    includeInStateLogs: true,
-    persist: true,
-    includeInDebugSnapshot: true,
-    usedInUi: true,
-  },
   useCurrencyRateCheck: {
     includeInStateLogs: true,
     persist: true,
@@ -509,18 +499,6 @@ export class PreferencesController extends BaseController<
     });
   }
 
-  /**
-   * Setter for the `useBlockie` property
-   *
-   * @deprecated Use setAvatarType instead
-   * @param val - Whether or not the user prefers blockie indicators
-   */
-  setUseBlockie(val: boolean): void {
-    this.update((state) => {
-      state.useBlockie = val;
-    });
-  }
-
   /**
    * Setter for the `usePhishDetect` property
    *
diff --git a/app/scripts/controllers/rewards/rewards-controller.test.ts b/app/scripts/controllers/rewards/rewards-controller.test.ts
index 4ba68ebe33b4..3ef355701931 100644
--- a/app/scripts/controllers/rewards/rewards-controller.test.ts
+++ b/app/scripts/controllers/rewards/rewards-controller.test.ts
@@ -9,15 +9,15 @@ import {
 import { EthAccountType } from '@metamask/keyring-api';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 import { CaipAccountId } from '@metamask/utils';
-import {
-  AccountsControllerListMultichainAccountsAction,
-  HandleSnapRequest,
-} from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import {
   AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,
   AccountTreeControllerSelectedAccountGroupChangeEvent,
 } from '@metamask/account-tree-controller';
-import { AccountsControllerGetSelectedMultichainAccountAction } from '@metamask/accounts-controller';
+import {
+  AccountsControllerGetSelectedMultichainAccountAction,
+  AccountsControllerListMultichainAccountsAction,
+} from '@metamask/accounts-controller';
 import {
   KeyringControllerSignPersonalMessageAction,
   KeyringControllerUnlockEvent,
@@ -230,7 +230,7 @@ async function withController<ReturnValue>(
     | RewardsDataServiceSiweLoginAction
     | RewardsDataServiceSiweJoinAction
     | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction
-    | HandleSnapRequest;
+    | SnapControllerHandleRequestAction;
 
   type TestAllowedEvents =
     | KeyringControllerUnlockEvent
diff --git a/app/scripts/controllers/rewards/rewards-controller.ts b/app/scripts/controllers/rewards/rewards-controller.ts
index 0b1a90a409f6..f74445185b13 100644
--- a/app/scripts/controllers/rewards/rewards-controller.ts
+++ b/app/scripts/controllers/rewards/rewards-controller.ts
@@ -9,7 +9,7 @@ import {
   toCaipAccountId,
 } from '@metamask/utils';
 import { base58, isAddress as isEvmAddress } from 'ethers/lib/utils';
-import { HandleSnapRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { detectSIWE } from '@metamask/controller-utils';
 import { RewardsControllerMessenger } from '../../controller-init/messengers/rewards-controller-messenger';
 import {
@@ -662,7 +662,7 @@ export class RewardsController extends BaseController<
         this.messenger.call.bind(
           this.messenger,
           'SnapController:handleRequest',
-        ) as unknown as HandleSnapRequest['handler'],
+        ) as unknown as SnapControllerHandleRequestAction['handler'],
         account.id,
         Buffer.from(hotWalletMessage, 'utf8').toString('base64'),
       );
@@ -682,7 +682,7 @@ export class RewardsController extends BaseController<
         this.messenger.call.bind(
           this.messenger,
           'SnapController:handleRequest',
-        ) as unknown as HandleSnapRequest['handler'],
+        ) as unknown as SnapControllerHandleRequestAction['handler'],
         account.id,
         Buffer.from(hotWalletMessage, 'utf8').toString('base64'),
       );
@@ -700,7 +700,7 @@ export class RewardsController extends BaseController<
         this.messenger.call.bind(
           this.messenger,
           'SnapController:handleRequest',
-        ) as unknown as HandleSnapRequest['handler'],
+        ) as unknown as SnapControllerHandleRequestAction['handler'],
         account.id,
         Buffer.from(hotWalletMessage, 'utf8').toString('base64'),
       );
diff --git a/app/scripts/controllers/rewards/utils/bitcoin-snap.test.ts b/app/scripts/controllers/rewards/utils/bitcoin-snap.test.ts
index e3d6b782e02a..56c3b7e67e4b 100644
--- a/app/scripts/controllers/rewards/utils/bitcoin-snap.test.ts
+++ b/app/scripts/controllers/rewards/utils/bitcoin-snap.test.ts
@@ -1,4 +1,4 @@
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { HandlerType } from '@metamask/snaps-utils';
 import { BITCOIN_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 import {
@@ -8,7 +8,7 @@ import {
 
 // Mock the snap request handler
 const mockHandleSnapRequest = jest.fn() as jest.MockedFunction<
-  HandleSnapRequest['handler']
+  SnapControllerHandleRequestAction['handler']
 >;
 
 // Mock console.error to avoid test noise
diff --git a/app/scripts/controllers/rewards/utils/bitcoin-snap.ts b/app/scripts/controllers/rewards/utils/bitcoin-snap.ts
index ecfc69391b5c..983dc9b481f7 100644
--- a/app/scripts/controllers/rewards/utils/bitcoin-snap.ts
+++ b/app/scripts/controllers/rewards/utils/bitcoin-snap.ts
@@ -1,6 +1,6 @@
 import { HandlerType } from '@metamask/snaps-utils';
 import log from 'loglevel';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { BITCOIN_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 
 export type SignRewardsMessageResult = {
@@ -10,7 +10,7 @@ export type SignRewardsMessageResult = {
 };
 
 export async function signBitcoinRewardsMessage(
-  handleSnapRequest: HandleSnapRequest['handler'],
+  handleSnapRequest: SnapControllerHandleRequestAction['handler'],
   accountId: string,
   message: string,
 ): Promise<SignRewardsMessageResult> {
diff --git a/app/scripts/controllers/rewards/utils/solana-snap.test.ts b/app/scripts/controllers/rewards/utils/solana-snap.test.ts
index b74fcb20403d..0baf31570b5a 100644
--- a/app/scripts/controllers/rewards/utils/solana-snap.test.ts
+++ b/app/scripts/controllers/rewards/utils/solana-snap.test.ts
@@ -1,4 +1,4 @@
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { HandlerType } from '@metamask/snaps-utils';
 import { SOLANA_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 import {
@@ -8,7 +8,7 @@ import {
 
 // Mock the snap request handler
 const mockHandleSnapRequest = jest.fn() as jest.MockedFunction<
-  HandleSnapRequest['handler']
+  SnapControllerHandleRequestAction['handler']
 >;
 
 // Mock console.error to avoid test noise
diff --git a/app/scripts/controllers/rewards/utils/solana-snap.ts b/app/scripts/controllers/rewards/utils/solana-snap.ts
index a905f04c720c..f9d888ed1f6a 100644
--- a/app/scripts/controllers/rewards/utils/solana-snap.ts
+++ b/app/scripts/controllers/rewards/utils/solana-snap.ts
@@ -1,6 +1,6 @@
 import { HandlerType } from '@metamask/snaps-utils';
 import log from 'loglevel';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { SOLANA_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 
 export type SignRewardsMessageResult = {
@@ -10,7 +10,7 @@ export type SignRewardsMessageResult = {
 };
 
 export async function signSolanaRewardsMessage(
-  handleSnapRequest: HandleSnapRequest['handler'],
+  handleSnapRequest: SnapControllerHandleRequestAction['handler'],
   accountId: string,
   message: string,
 ): Promise<SignRewardsMessageResult> {
diff --git a/app/scripts/controllers/rewards/utils/tron-snap.test.ts b/app/scripts/controllers/rewards/utils/tron-snap.test.ts
index 17f5b565c658..0d8acab90a46 100644
--- a/app/scripts/controllers/rewards/utils/tron-snap.test.ts
+++ b/app/scripts/controllers/rewards/utils/tron-snap.test.ts
@@ -1,11 +1,11 @@
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { HandlerType } from '@metamask/snaps-utils';
 import { TRON_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 import { signTronRewardsMessage, SignRewardsMessageResult } from './tron-snap';
 
 // Mock the snap request handler
 const mockHandleSnapRequest = jest.fn() as jest.MockedFunction<
-  HandleSnapRequest['handler']
+  SnapControllerHandleRequestAction['handler']
 >;
 
 // Mock console.error to avoid test noise
diff --git a/app/scripts/controllers/rewards/utils/tron-snap.ts b/app/scripts/controllers/rewards/utils/tron-snap.ts
index 3d8e15bc626c..d5dc592f7b59 100644
--- a/app/scripts/controllers/rewards/utils/tron-snap.ts
+++ b/app/scripts/controllers/rewards/utils/tron-snap.ts
@@ -1,6 +1,6 @@
 import { HandlerType } from '@metamask/snaps-utils';
 import log from 'loglevel';
-import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { TRON_WALLET_SNAP_ID } from '../../../../../shared/lib/accounts';
 
 export type SignRewardsMessageResult = {
@@ -10,7 +10,7 @@ export type SignRewardsMessageResult = {
 };
 
 export async function signTronRewardsMessage(
-  handleSnapRequest: HandleSnapRequest['handler'],
+  handleSnapRequest: SnapControllerHandleRequestAction['handler'],
   accountId: string,
   message: string,
 ): Promise<SignRewardsMessageResult> {
diff --git a/app/scripts/lib/SnapsNameProvider.test.ts b/app/scripts/lib/SnapsNameProvider.test.ts
index a23917352b5b..11a5955d4288 100644
--- a/app/scripts/lib/SnapsNameProvider.test.ts
+++ b/app/scripts/lib/SnapsNameProvider.test.ts
@@ -1,9 +1,9 @@
 import { NameType } from '@metamask/name-controller';
 import { HandlerType, SnapCaveatType } from '@metamask/snaps-utils';
 import {
-  GetAllSnaps,
-  GetSnap,
-  HandleSnapRequest,
+  SnapControllerGetAllSnapsAction,
+  SnapControllerGetSnapAction,
+  SnapControllerHandleRequestAction,
 } from '@metamask/snaps-controllers';
 import { GetPermissionControllerState } from '@metamask/permission-controller';
 import {
@@ -52,9 +52,9 @@ function createMockMessenger({
   handleSnapRequest,
   getPermissionControllerState,
 }: {
-  getAllSnaps?: jest.Mocked<GetAllSnaps['handler']>;
-  getSnap?: jest.Mocked<GetSnap['handler']>;
-  handleSnapRequest?: jest.Mocked<HandleSnapRequest['handler']>;
+  getAllSnaps?: jest.Mocked<SnapControllerGetAllSnapsAction['handler']>;
+  getSnap?: jest.Mocked<SnapControllerGetSnapAction['handler']>;
+  handleSnapRequest?: jest.Mocked<SnapControllerHandleRequestAction['handler']>;
   getPermissionControllerState?: jest.Mocked<
     GetPermissionControllerState['handler']
   >;
@@ -110,9 +110,9 @@ function createMockMessenger({
 
   const callMock = jest.fn().mockImplementation((method, ...args) => {
     switch (method) {
-      case 'SnapController:getAll':
+      case 'SnapController:getAllSnaps':
         return getAllSnapsMock();
-      case 'SnapController:get':
+      case 'SnapController:getSnap':
         return getSnapMock(args[0]);
       case 'SnapController:handleRequest':
         return handleSnapRequestMock(args[0]);
diff --git a/app/scripts/lib/SnapsNameProvider.ts b/app/scripts/lib/SnapsNameProvider.ts
index 04f8293e0a3c..363703016fe0 100644
--- a/app/scripts/lib/SnapsNameProvider.ts
+++ b/app/scripts/lib/SnapsNameProvider.ts
@@ -17,17 +17,17 @@ import {
 import { HandlerType } from '@metamask/snaps-utils';
 import log from 'loglevel';
 import {
-  GetAllSnaps,
-  GetSnap,
-  HandleSnapRequest,
+  SnapControllerGetAllSnapsAction,
+  SnapControllerGetSnapAction,
+  SnapControllerHandleRequestAction,
 } from '@metamask/snaps-controllers';
 import { Messenger } from '@metamask/messenger';
 import { getChainIdsCaveat } from '@metamask/snaps-rpc-methods';
 
 type AllowedActions =
-  | GetAllSnaps
-  | GetSnap
-  | HandleSnapRequest
+  | SnapControllerGetAllSnapsAction
+  | SnapControllerGetSnapAction
+  | SnapControllerHandleRequestAction
   | GetPermissionControllerState;
 
 export type SnapsNameProviderMessenger = Messenger<
@@ -57,7 +57,10 @@ export class SnapsNameProvider implements NameProvider {
 
     const sourceLabels = snaps.reduce(
       (acc: NameProviderMetadata['sourceLabels'], snap) => {
-        const snapDetails = this.#messenger.call('SnapController:get', snap.id);
+        const snapDetails = this.#messenger.call(
+          'SnapController:getSnap',
+          snap.id,
+        );
         const snapName = snapDetails?.manifest.proposedName;
 
         return {
@@ -109,7 +112,7 @@ export class SnapsNameProvider implements NameProvider {
       'PermissionController:getState',
     ).subjects;
 
-    const snaps = this.#messenger.call('SnapController:getAll');
+    const snaps = this.#messenger.call('SnapController:getAllSnaps');
 
     return snaps.filter(({ id }) => {
       const permission =
diff --git a/app/scripts/lib/backup.test.js b/app/scripts/lib/backup.test.js
index 3f92fc438e7e..30bfa3e4dfcb 100644
--- a/app/scripts/lib/backup.test.js
+++ b/app/scripts/lib/backup.test.js
@@ -135,7 +135,6 @@ const jsonData = JSON.stringify({
     ),
   },
   preferences: {
-    useBlockie: false,
     usePhishDetect: true,
     dismissSeedBackUpReminder: false,
     overrideContentSecurityPolicyHeader: true,
diff --git a/app/scripts/lib/ens-ipfs/contracts/ens-registry.json b/app/scripts/lib/ens-ipfs/contracts/ens-registry.json
new file mode 100644
index 000000000000..38682c0a4ead
--- /dev/null
+++ b/app/scripts/lib/ens-ipfs/contracts/ens-registry.json
@@ -0,0 +1,108 @@
+[
+  {
+    "constant": true,
+    "inputs": [{ "name": "node", "type": "bytes32" }],
+    "name": "resolver",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "node", "type": "bytes32" }],
+    "name": "owner",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "node", "type": "bytes32" },
+      { "name": "label", "type": "bytes32" },
+      { "name": "owner", "type": "address" }
+    ],
+    "name": "setSubnodeOwner",
+    "outputs": [],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "node", "type": "bytes32" },
+      { "name": "ttl", "type": "uint64" }
+    ],
+    "name": "setTTL",
+    "outputs": [],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "node", "type": "bytes32" }],
+    "name": "ttl",
+    "outputs": [{ "name": "", "type": "uint64" }],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "node", "type": "bytes32" },
+      { "name": "resolver", "type": "address" }
+    ],
+    "name": "setResolver",
+    "outputs": [],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "node", "type": "bytes32" },
+      { "name": "owner", "type": "address" }
+    ],
+    "name": "setOwner",
+    "outputs": [],
+    "payable": false,
+    "type": "function"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "node", "type": "bytes32" },
+      { "indexed": false, "name": "owner", "type": "address" }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "node", "type": "bytes32" },
+      { "indexed": true, "name": "label", "type": "bytes32" },
+      { "indexed": false, "name": "owner", "type": "address" }
+    ],
+    "name": "NewOwner",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "node", "type": "bytes32" },
+      { "indexed": false, "name": "resolver", "type": "address" }
+    ],
+    "name": "NewResolver",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "node", "type": "bytes32" },
+      { "indexed": false, "name": "ttl", "type": "uint64" }
+    ],
+    "name": "NewTTL",
+    "type": "event"
+  }
+]
diff --git a/app/scripts/lib/ens-ipfs/contracts/registry.js b/app/scripts/lib/ens-ipfs/contracts/registry.js
deleted file mode 100644
index 07342ac37f07..000000000000
--- a/app/scripts/lib/ens-ipfs/contracts/registry.js
+++ /dev/null
@@ -1,109 +0,0 @@
-const abi = [
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'resolver',
-    outputs: [{ name: '', type: 'address' }],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'owner',
-    outputs: [{ name: '', type: 'address' }],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'label', type: 'bytes32' },
-      { name: 'owner', type: 'address' },
-    ],
-    name: 'setSubnodeOwner',
-    outputs: [],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'ttl', type: 'uint64' },
-    ],
-    name: 'setTTL',
-    outputs: [],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'ttl',
-    outputs: [{ name: '', type: 'uint64' }],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'resolver', type: 'address' },
-    ],
-    name: 'setResolver',
-    outputs: [],
-    payable: false,
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'owner', type: 'address' },
-    ],
-    name: 'setOwner',
-    outputs: [],
-    payable: false,
-    type: 'function',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'owner', type: 'address' },
-    ],
-    name: 'Transfer',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: true, name: 'label', type: 'bytes32' },
-      { indexed: false, name: 'owner', type: 'address' },
-    ],
-    name: 'NewOwner',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'resolver', type: 'address' },
-    ],
-    name: 'NewResolver',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'ttl', type: 'uint64' },
-    ],
-    name: 'NewTTL',
-    type: 'event',
-  },
-];
-export default abi;
diff --git a/app/scripts/lib/ens-ipfs/contracts/registry.test.ts b/app/scripts/lib/ens-ipfs/contracts/registry.test.ts
new file mode 100644
index 000000000000..9db61436bfde
--- /dev/null
+++ b/app/scripts/lib/ens-ipfs/contracts/registry.test.ts
@@ -0,0 +1,25 @@
+import ensRegistryAbi from './registry';
+
+describe('ens-registry ABI', () => {
+  it('exports a non-empty fragment list', () => {
+    expect(Array.isArray(ensRegistryAbi)).toBe(true);
+    expect(ensRegistryAbi.length).toBe(11);
+  });
+
+  it('includes functions and events used with the ENS registry contract', () => {
+    const names = ensRegistryAbi.map(
+      (fragment: { name?: string }) => fragment.name,
+    );
+    expect(names).toContain('resolver');
+    expect(names).toContain('owner');
+    expect(names).toContain('setSubnodeOwner');
+    expect(names).toContain('setTTL');
+    expect(names).toContain('ttl');
+    expect(names).toContain('setResolver');
+    expect(names).toContain('setOwner');
+    expect(names).toContain('Transfer');
+    expect(names).toContain('NewOwner');
+    expect(names).toContain('NewResolver');
+    expect(names).toContain('NewTTL');
+  });
+});
diff --git a/app/scripts/lib/ens-ipfs/contracts/registry.ts b/app/scripts/lib/ens-ipfs/contracts/registry.ts
new file mode 100644
index 000000000000..cdaf05bab7c5
--- /dev/null
+++ b/app/scripts/lib/ens-ipfs/contracts/registry.ts
@@ -0,0 +1,3 @@
+import ensRegistryAbi from './ens-registry.json';
+
+export default ensRegistryAbi;
diff --git a/app/scripts/lib/ens-ipfs/contracts/resolver.js b/app/scripts/lib/ens-ipfs/contracts/resolver.js
deleted file mode 100644
index af1f0e544e4e..000000000000
--- a/app/scripts/lib/ens-ipfs/contracts/resolver.js
+++ /dev/null
@@ -1,236 +0,0 @@
-const abi = [
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'hash', type: 'bytes32' },
-    ],
-    name: 'setContent',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'content',
-    outputs: [{ name: '', type: 'bytes32' }],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'interfaceID', type: 'bytes4' }],
-    name: 'supportsInterface',
-    outputs: [{ name: '', type: 'bool' }],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'key', type: 'string' },
-      { name: 'value', type: 'string' },
-    ],
-    name: 'setText',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'contentTypes', type: 'uint256' },
-    ],
-    name: 'ABI',
-    outputs: [
-      { name: 'contentType', type: 'uint256' },
-      { name: 'data', type: 'bytes' },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'x', type: 'bytes32' },
-      { name: 'y', type: 'bytes32' },
-    ],
-    name: 'setPubkey',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'hash', type: 'bytes' },
-    ],
-    name: 'setContenthash',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'addr',
-    outputs: [{ name: '', type: 'address' }],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'key', type: 'string' },
-    ],
-    name: 'text',
-    outputs: [{ name: '', type: 'string' }],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'contentType', type: 'uint256' },
-      { name: 'data', type: 'bytes' },
-    ],
-    name: 'setABI',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'name',
-    outputs: [{ name: '', type: 'string' }],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'name', type: 'string' },
-    ],
-    name: 'setName',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'contenthash',
-    outputs: [{ name: '', type: 'bytes' }],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [{ name: 'node', type: 'bytes32' }],
-    name: 'pubkey',
-    outputs: [
-      { name: 'x', type: 'bytes32' },
-      { name: 'y', type: 'bytes32' },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      { name: 'node', type: 'bytes32' },
-      { name: 'addr', type: 'address' },
-    ],
-    name: 'setAddr',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [{ name: 'ensAddr', type: 'address' }],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'constructor',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'a', type: 'address' },
-    ],
-    name: 'AddrChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'name', type: 'string' },
-    ],
-    name: 'NameChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: true, name: 'contentType', type: 'uint256' },
-    ],
-    name: 'ABIChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'x', type: 'bytes32' },
-      { indexed: false, name: 'y', type: 'bytes32' },
-    ],
-    name: 'PubkeyChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'indexedKey', type: 'string' },
-      { indexed: false, name: 'key', type: 'string' },
-    ],
-    name: 'TextChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, name: 'node', type: 'bytes32' },
-      { indexed: false, name: 'hash', type: 'bytes' },
-    ],
-    name: 'ContenthashChanged',
-    type: 'event',
-  },
-];
-export default abi;
diff --git a/app/scripts/lib/ens-ipfs/contracts/resolver.test.ts b/app/scripts/lib/ens-ipfs/contracts/resolver.test.ts
new file mode 100644
index 000000000000..98eb3c2fce2d
--- /dev/null
+++ b/app/scripts/lib/ens-ipfs/contracts/resolver.test.ts
@@ -0,0 +1,17 @@
+import resolverAbi from './resolver';
+
+describe('ENS resolver contract ABI', () => {
+  it('exports a non-empty ABI', () => {
+    expect(resolverAbi.length).toBeGreaterThan(0);
+  });
+
+  it('includes standard public resolver functions', () => {
+    const functionNames = resolverAbi
+      .filter((entry) => entry.type === 'function')
+      .map((entry) => entry.name);
+
+    expect(functionNames).toContain('contenthash');
+    expect(functionNames).toContain('text');
+    expect(functionNames).toContain('addr');
+  });
+});
diff --git a/app/scripts/lib/ens-ipfs/contracts/resolver.ts b/app/scripts/lib/ens-ipfs/contracts/resolver.ts
new file mode 100644
index 000000000000..d6bf5a4c3322
--- /dev/null
+++ b/app/scripts/lib/ens-ipfs/contracts/resolver.ts
@@ -0,0 +1,156 @@
+type AbiInput = {
+  name: string;
+  type: string;
+  indexed?: boolean;
+};
+
+type AbiOutput = { name: string; type: string };
+
+function abiFunction(
+  name: string,
+  inputs: readonly AbiInput[],
+  outputs: readonly AbiOutput[],
+  stateMutability: 'view' | 'nonpayable' | 'pure',
+) {
+  return {
+    constant: stateMutability === 'view' || stateMutability === 'pure',
+    inputs: [...inputs],
+    name,
+    outputs: outputs.length ? [...outputs] : [],
+    payable: false,
+    stateMutability,
+    type: 'function' as const,
+  };
+}
+
+function abiEvent(name: string, inputs: readonly AbiInput[]) {
+  return {
+    anonymous: false,
+    inputs: [...inputs],
+    name,
+    type: 'event' as const,
+  };
+}
+
+const b32 = (name: string): AbiInput => ({ name, type: 'bytes32' });
+
+const abi = [
+  abiFunction('setContent', [b32('node'), b32('hash')], [], 'nonpayable'),
+  abiFunction(
+    'content',
+    [b32('node')],
+    [{ name: '', type: 'bytes32' }],
+    'view',
+  ),
+  abiFunction(
+    'supportsInterface',
+    [{ name: 'interfaceID', type: 'bytes4' }],
+    [{ name: '', type: 'bool' }],
+    'pure',
+  ),
+  abiFunction(
+    'setText',
+    [
+      b32('node'),
+      { name: 'key', type: 'string' },
+      { name: 'value', type: 'string' },
+    ],
+    [],
+    'nonpayable',
+  ),
+  abiFunction(
+    'ABI',
+    [b32('node'), { name: 'contentTypes', type: 'uint256' }],
+    [
+      { name: 'contentType', type: 'uint256' },
+      { name: 'data', type: 'bytes' },
+    ],
+    'view',
+  ),
+  abiFunction('setPubkey', [b32('node'), b32('x'), b32('y')], [], 'nonpayable'),
+  abiFunction(
+    'setContenthash',
+    [b32('node'), { name: 'hash', type: 'bytes' }],
+    [],
+    'nonpayable',
+  ),
+  abiFunction('addr', [b32('node')], [{ name: '', type: 'address' }], 'view'),
+  abiFunction(
+    'text',
+    [b32('node'), { name: 'key', type: 'string' }],
+    [{ name: '', type: 'string' }],
+    'view',
+  ),
+  abiFunction(
+    'setABI',
+    [
+      b32('node'),
+      { name: 'contentType', type: 'uint256' },
+      { name: 'data', type: 'bytes' },
+    ],
+    [],
+    'nonpayable',
+  ),
+  abiFunction('name', [b32('node')], [{ name: '', type: 'string' }], 'view'),
+  abiFunction(
+    'setName',
+    [b32('node'), { name: 'name', type: 'string' }],
+    [],
+    'nonpayable',
+  ),
+  abiFunction(
+    'contenthash',
+    [b32('node')],
+    [{ name: '', type: 'bytes' }],
+    'view',
+  ),
+  abiFunction(
+    'pubkey',
+    [b32('node')],
+    [
+      { name: 'x', type: 'bytes32' },
+      { name: 'y', type: 'bytes32' },
+    ],
+    'view',
+  ),
+  abiFunction(
+    'setAddr',
+    [b32('node'), { name: 'addr', type: 'address' }],
+    [],
+    'nonpayable',
+  ),
+  {
+    inputs: [{ name: 'ensAddr', type: 'address' }],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  abiEvent('AddrChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: false, name: 'a', type: 'address' },
+  ]),
+  abiEvent('NameChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: false, name: 'name', type: 'string' },
+  ]),
+  abiEvent('ABIChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: true, name: 'contentType', type: 'uint256' },
+  ]),
+  abiEvent('PubkeyChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: false, name: 'x', type: 'bytes32' },
+    { indexed: false, name: 'y', type: 'bytes32' },
+  ]),
+  abiEvent('TextChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: false, name: 'indexedKey', type: 'string' },
+    { indexed: false, name: 'key', type: 'string' },
+  ]),
+  abiEvent('ContenthashChanged', [
+    { indexed: true, name: 'node', type: 'bytes32' },
+    { indexed: false, name: 'hash', type: 'bytes' },
+  ]),
+] as const;
+
+export default abi;
diff --git a/app/scripts/lib/safe-reload.ts b/app/scripts/lib/safe-reload.ts
index 0ea5f9598e8d..77b34bd26e23 100644
--- a/app/scripts/lib/safe-reload.ts
+++ b/app/scripts/lib/safe-reload.ts
@@ -5,6 +5,9 @@ import { OperationSafener } from './operation-safener';
 import { PersistenceManager } from './stores/persistence-manager';
 import { MetaMaskStateType } from './stores/base-store';
 
+/** Time before `runtime.reload()` so popup/notification UIs can `window.close()` first (issue #29151). */
+const RELOAD_AFTER_EVACUATE_MS = 150;
+
 /**
  * Creates a request-safe reload mechanism for the given persistence manager.
  *
@@ -54,11 +57,16 @@ export function getRequestSafeReload<Type extends PersistenceManager>(
     /**
      * Requests a safe reload of the browser. It prevents any new updates from
      * being sent to the persistence manager, and waits for any
-     * pending updates to complete before calling `browser.runtime.reload()`.
+     * pending updates to complete before scheduling `browser.runtime.reload()`
+     * after a short delay. The delay lets popup/notification windows call
+     * `window.close()` before reload so Chromium does not show normal tab
+     * content inside that window (see GitHub issue #29151).
      */
     requestSafeReload: async () => {
       await operationSafener.evacuate();
-      browser.runtime.reload();
+      globalThis.setTimeout(() => {
+        browser.runtime.reload();
+      }, RELOAD_AFTER_EVACUATE_MS);
     },
 
     /**
diff --git a/app/scripts/lib/sentry-filter-events.ts b/app/scripts/lib/sentry-filter-events.ts
deleted file mode 100644
index 9c802d872c15..000000000000
--- a/app/scripts/lib/sentry-filter-events.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Event as SentryEvent, Integration } from '@sentry/types';
-
-const NAME = 'FilterEvents';
-
-/**
- * Filter events when MetaMetrics is disabled.
- *
- * @param options - Options bag.
- * @param options.getMetaMetricsEnabled - Function that returns whether MetaMetrics is enabled.
- * @param options.log - Function to log messages.
- */
-export function filterEvents({
-  getMetaMetricsEnabled,
-  log,
-}: {
-  getMetaMetricsEnabled: () => Promise<boolean>;
-  log: (message: string) => void;
-}): Integration {
-  return {
-    name: NAME,
-    processEvent: async (event: SentryEvent) => {
-      // This integration is required in addition to the custom transport as it provides an
-      // asynchronous context which we may need in order to read the persisted state from the
-      // store, so it can later be added to the event via the `beforeSend` overload.
-      // It also provides a more native solution for discarding events, but any
-      // session requests will always be handled by the custom transport.
-      const metricsEnabled = await getMetaMetricsEnabled();
-
-      if (!metricsEnabled) {
-        log('Event dropped as metrics disabled');
-        return null;
-      }
-
-      return event;
-    },
-  };
-}
diff --git a/app/scripts/lib/sentry-get-state.test.ts b/app/scripts/lib/sentry-get-state.test.ts
new file mode 100644
index 000000000000..1c362f434a6d
--- /dev/null
+++ b/app/scripts/lib/sentry-get-state.test.ts
@@ -0,0 +1,272 @@
+import {
+  getMetaMetricsState,
+  getMetaMetricsStateFromAppState,
+  getState,
+} from './sentry-get-state';
+
+/** Matches `StateHooks.getSentryState` so tests satisfy `types/global.d.ts`. */
+function emptySentrySnapshot(): ReturnType<
+  (typeof globalThis.stateHooks)['getSentryState']
+> {
+  return { browser: 'jest', version: '0' };
+}
+
+function deleteStateHookProperty(
+  key: keyof typeof globalThis.stateHooks,
+): void {
+  Reflect.deleteProperty(
+    globalThis.stateHooks as unknown as Record<string, unknown>,
+    key,
+  );
+}
+
+describe('sentry-get-state', () => {
+  describe('getState', () => {
+    afterEach(() => {
+      deleteStateHookProperty('getSentryState');
+    });
+
+    it('returns the snapshot from getSentryState when present', () => {
+      const snapshot = {
+        ...emptySentrySnapshot(),
+        state: { metamask: { participateInMetaMetrics: true } },
+      };
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => snapshot,
+      };
+
+      expect(getState()).toStrictEqual(snapshot);
+    });
+
+    it('returns empty object when getSentryState is missing or returns falsy', () => {
+      const hooks = { ...globalThis.stateHooks };
+      Reflect.deleteProperty(
+        hooks as unknown as Record<string, unknown>,
+        'getSentryState',
+      );
+      globalThis.stateHooks = hooks as typeof globalThis.stateHooks;
+
+      expect(getState()).toStrictEqual({});
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () =>
+          undefined as unknown as ReturnType<
+            NonNullable<typeof globalThis.stateHooks.getSentryState>
+          >,
+      };
+
+      expect(getState()).toStrictEqual({});
+    });
+  });
+
+  describe('getMetaMetricsState', () => {
+    afterEach(() => {
+      deleteStateHookProperty('getPersistedState');
+      deleteStateHookProperty('getBackupState');
+    });
+
+    it('resolves participation from persisted state when snapshot has no state keys', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'id-123',
+            },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: true,
+        metaMetricsId: 'id-123',
+      });
+    });
+
+    it('resolves participation false from persisted state when not opted in', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: { participateInMetaMetrics: false },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+    });
+
+    it('treats missing or malformed persisted state as not opted in', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => undefined,
+        getBackupState: async () => ({}),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({ data: {} }),
+        getBackupState: async () => ({}),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+    });
+
+    it('resolves participation from backup when getPersistedState throws', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted unavailable');
+        },
+        getBackupState: async () => ({
+          MetaMetricsController: {
+            participateInMetaMetrics: true,
+            metaMetricsId: 'backup-id',
+          },
+        }),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: true,
+        metaMetricsId: 'backup-id',
+      });
+    });
+
+    it('resolves participation false from backup when not opted in', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted unavailable');
+        },
+        getBackupState: async () => ({
+          MetaMetricsController: { participateInMetaMetrics: false },
+        }),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+    });
+
+    it('treats missing or empty backup state as not opted in after persisted throws', async () => {
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted unavailable');
+        },
+        getBackupState: async () => undefined,
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted unavailable');
+        },
+        getBackupState: async () => ({}),
+      };
+
+      await expect(getMetaMetricsState()).resolves.toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+    });
+  });
+
+  describe('getMetaMetricsStateFromAppState', () => {
+    it('returns null when appState has no state or persistedState', () => {
+      expect(getMetaMetricsStateFromAppState({})).toBeNull();
+    });
+
+    it('delegates to persisted state when persistedState is present', () => {
+      const persistedState = {
+        data: {
+          MetaMetricsController: {
+            participateInMetaMetrics: true,
+            metaMetricsId: 'persisted-id',
+          },
+        },
+      };
+      expect(getMetaMetricsStateFromAppState({ persistedState })).toStrictEqual(
+        {
+          participateInMetaMetrics: true,
+          metaMetricsId: 'persisted-id',
+        },
+      );
+    });
+
+    it('returns state from appState.state.metamask when present', () => {
+      expect(
+        getMetaMetricsStateFromAppState({
+          state: {
+            metamask: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'metamask-id',
+            },
+          },
+        }),
+      ).toStrictEqual({
+        participateInMetaMetrics: true,
+        metaMetricsId: 'metamask-id',
+      });
+    });
+
+    it('returns state from appState.state.MetaMetricsController when state has no metamask', () => {
+      expect(
+        getMetaMetricsStateFromAppState({
+          state: {
+            MetaMetricsController: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'controller-id',
+            },
+          },
+        }),
+      ).toStrictEqual({
+        participateInMetaMetrics: true,
+        metaMetricsId: 'controller-id',
+      });
+    });
+
+    it('returns participateInMetaMetrics false and no metaMetricsId when not opted in', () => {
+      expect(
+        getMetaMetricsStateFromAppState({
+          state: {
+            MetaMetricsController: { participateInMetaMetrics: false },
+          },
+        }),
+      ).toStrictEqual({
+        participateInMetaMetrics: false,
+        metaMetricsId: undefined,
+      });
+    });
+  });
+});
diff --git a/app/scripts/lib/sentry-get-state.ts b/app/scripts/lib/sentry-get-state.ts
new file mode 100644
index 000000000000..482103192ca4
--- /dev/null
+++ b/app/scripts/lib/sentry-get-state.ts
@@ -0,0 +1,133 @@
+import { getManifestFlags } from '../../../shared/lib/manifestFlags';
+import { sentryLogger as log } from '../../../shared/lib/sentry';
+
+type SentryAppStateSnapshot = Record<string, unknown>;
+
+export type MetaMetricsParticipation = {
+  participateInMetaMetrics: boolean;
+  metaMetricsId?: string;
+} | null;
+
+/**
+ * Reads the current Sentry debug snapshot from global hooks (sync).
+ */
+export function getState(): SentryAppStateSnapshot {
+  return globalThis.stateHooks?.getSentryState?.() || {};
+}
+
+/**
+ * Resolves MetaMetrics participation: sync snapshot first, then persisted / backup.
+ */
+export async function getMetaMetricsState(): Promise<MetaMetricsParticipation> {
+  const flags = getManifestFlags();
+
+  if (flags.ci && flags.sentry?.forceEnable) {
+    return { participateInMetaMetrics: true, metaMetricsId: undefined };
+  }
+
+  const appState = getState();
+
+  if (appState.state || appState.persistedState) {
+    return getMetaMetricsStateFromAppState(appState);
+  }
+
+  try {
+    const persistedState = await globalThis.stateHooks.getPersistedState();
+    return getMetaMetricsStateFromPersistedState(persistedState);
+  } catch (error) {
+    log('Error retrieving persisted state, falling back to backup', error);
+    try {
+      const { getBackupState } = globalThis.stateHooks;
+      if (!getBackupState) {
+        return null;
+      }
+      const backupState = await getBackupState();
+      return getMetaMetricsStateFromBackupState(backupState);
+    } catch (backupError) {
+      log('Error retrieving backup state', backupError);
+      return null;
+    }
+  }
+}
+
+/**
+ * Returns MetaMetrics state from app snapshot (persisted vs in-memory `state`).
+ * @param appState
+ */
+export function getMetaMetricsStateFromAppState(
+  appState: SentryAppStateSnapshot,
+): MetaMetricsParticipation {
+  if (appState.persistedState) {
+    return getMetaMetricsStateFromPersistedState(appState.persistedState);
+  }
+  if (appState.state) {
+    const state = appState.state as Record<string, unknown>;
+    if ('metamask' in state && state.metamask !== undefined) {
+      const metamask = state.metamask as {
+        participateInMetaMetrics?: boolean;
+        metaMetricsId?: string;
+      };
+      const enabled = Boolean(metamask.participateInMetaMetrics);
+      return {
+        participateInMetaMetrics: enabled,
+        metaMetricsId: enabled ? metamask.metaMetricsId : undefined,
+      };
+    }
+    const controller = state.MetaMetricsController as
+      | {
+          participateInMetaMetrics?: boolean;
+          metaMetricsId?: string;
+        }
+      | undefined;
+    const enabled = Boolean(controller?.participateInMetaMetrics);
+    return {
+      participateInMetaMetrics: enabled,
+      metaMetricsId: enabled ? controller?.metaMetricsId : undefined,
+    };
+  }
+  return null;
+}
+
+/**
+ * Returns MetaMetrics state from persisted state (e.g. extension storage).
+ * @param persistedState
+ */
+function getMetaMetricsStateFromPersistedState(
+  persistedState: unknown,
+): Exclude<MetaMetricsParticipation, null> {
+  const data = (
+    persistedState as { data?: Record<string, unknown> } | undefined
+  )?.data;
+  const controller = data?.MetaMetricsController as
+    | {
+        participateInMetaMetrics?: boolean;
+        metaMetricsId?: string;
+      }
+    | undefined;
+  const enabled = Boolean(controller?.participateInMetaMetrics);
+  return {
+    participateInMetaMetrics: enabled,
+    metaMetricsId: enabled ? controller?.metaMetricsId : undefined,
+  };
+}
+
+/**
+ * Returns MetaMetrics state from backup state (e.g. IndexedDB).
+ * @param backupState
+ */
+function getMetaMetricsStateFromBackupState(
+  backupState: unknown,
+): Exclude<MetaMetricsParticipation, null> {
+  const controller = (backupState as Record<string, unknown> | undefined)
+    ?.MetaMetricsController as
+    | {
+        participateInMetaMetrics?: boolean;
+        metaMetricsId?: string;
+      }
+    | undefined;
+  const enabled = Boolean(controller?.participateInMetaMetrics);
+  return {
+    participateInMetaMetrics: enabled,
+    metaMetricsId: enabled ? controller?.metaMetricsId : undefined,
+  };
+}
diff --git a/app/scripts/lib/sentry-make-transport.test.ts b/app/scripts/lib/sentry-make-transport.test.ts
new file mode 100644
index 000000000000..f8faf16fcb3f
--- /dev/null
+++ b/app/scripts/lib/sentry-make-transport.test.ts
@@ -0,0 +1,375 @@
+import * as Sentry from '@sentry/browser';
+import { forEachEnvelopeItem, parseEnvelope } from '@sentry/utils';
+import { tick } from '../../../test/lib/timer-helpers';
+import { makeTransport } from './sentry-make-transport';
+
+const originalMakeFetchTransport = Sentry.makeFetchTransport.bind(Sentry);
+
+type TestTransport = ReturnType<typeof makeTransport>;
+type TestEnvelope = Parameters<TestTransport['send']>[0];
+type ParsedSentryEnvelope = ReturnType<typeof parseEnvelope>;
+type FetchCallArgs = [RequestInfo | URL, RequestInit | undefined];
+
+/** Matches `StateHooks.getSentryState` so tests satisfy `types/global.d.ts`. */
+function emptySentrySnapshot(): ReturnType<
+  (typeof globalThis.stateHooks)['getSentryState']
+> {
+  return { browser: 'jest', version: '0' };
+}
+
+function deleteStateHookProperty(
+  key: keyof typeof globalThis.stateHooks,
+): void {
+  Reflect.deleteProperty(
+    globalThis.stateHooks as unknown as Record<string, unknown>,
+    key,
+  );
+}
+
+function minimalFetchResponse(): Response {
+  return {
+    ok: true,
+    headers: { get: () => null },
+  } as unknown as Response;
+}
+
+function createTestTransportOptions() {
+  return {
+    url: 'https://public@fake.ingest.sentry.io/api/1/envelope/',
+    headers: {},
+    recordDroppedEvent: jest.fn(),
+  };
+}
+
+describe('sentry-make-transport', () => {
+  describe('makeTransport (construction)', () => {
+    it('does not call fetch when makeTransport is called', () => {
+      const fetchSpy = jest
+        .spyOn(globalThis, 'fetch')
+        .mockResolvedValue(minimalFetchResponse());
+
+      makeTransport({} as Parameters<typeof Sentry.makeFetchTransport>[0]);
+
+      expect(fetchSpy).not.toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('does not call send or flush on the default transport when makeTransport is called', () => {
+      const defaultTransportSend = jest.fn().mockResolvedValue({});
+      const defaultTransportFlush = jest.fn().mockResolvedValue(true);
+      const makeFetchTransportSpy = jest
+        .spyOn(Sentry, 'makeFetchTransport')
+        .mockReturnValue({
+          send: defaultTransportSend,
+          flush: defaultTransportFlush,
+        });
+
+      makeTransport({} as Parameters<typeof Sentry.makeFetchTransport>[0]);
+
+      expect(defaultTransportSend).not.toHaveBeenCalled();
+      expect(defaultTransportFlush).not.toHaveBeenCalled();
+
+      makeFetchTransportSpy.mockRestore();
+    });
+  });
+
+  describe('makeTransport', () => {
+    let makeFetchTransportSpy: jest.SpyInstance;
+
+    function mockFetchForTransport() {
+      return jest
+        .spyOn(globalThis, 'fetch')
+        .mockResolvedValue(minimalFetchResponse());
+    }
+
+    beforeEach(() => {
+      makeFetchTransportSpy = jest
+        .spyOn(Sentry, 'makeFetchTransport')
+        .mockImplementation((options, customFetch) =>
+          originalMakeFetchTransport(
+            options as Parameters<typeof originalMakeFetchTransport>[0],
+            customFetch,
+          ),
+        );
+    });
+
+    afterEach(() => {
+      makeFetchTransportSpy.mockRestore();
+      deleteStateHookProperty('getPersistedState');
+      deleteStateHookProperty('getBackupState');
+    });
+
+    it('throws when MetaMetrics is not opted in', async () => {
+      const fetchSpy = mockFetchForTransport();
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: { participateInMetaMetrics: false },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      const transport = makeTransport(
+        createTestTransportOptions() as Parameters<
+          typeof Sentry.makeFetchTransport
+        >[0],
+      );
+      const envelope = [
+        {},
+        [[{ type: 'event' }, { message: 'test' }]],
+      ] as unknown as TestEnvelope;
+
+      await expect(transport.send(envelope)).rejects.toThrow(
+        'Network request skipped as metrics disabled',
+      );
+      expect(makeFetchTransportSpy).toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('calls fetch when opted in', async () => {
+      const fetchSpy = mockFetchForTransport();
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'transport-test-id',
+            },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      const transport = makeTransport(
+        createTestTransportOptions() as Parameters<
+          typeof Sentry.makeFetchTransport
+        >[0],
+      );
+      const envelope = [
+        {},
+        [[{ type: 'event' }, { message: 'test event' }]],
+      ] as unknown as TestEnvelope;
+
+      await transport.send(envelope);
+
+      expect(fetchSpy).toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('uses app state from getSentryState when available', async () => {
+      const fetchSpy = mockFetchForTransport();
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => ({
+          ...emptySentrySnapshot(),
+          state: {
+            MetaMetricsController: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'app-state-id',
+            },
+          },
+        }),
+        getPersistedState: async () => ({}),
+        getBackupState: async () => ({}),
+      };
+
+      const transport = makeTransport(
+        createTestTransportOptions() as Parameters<
+          typeof Sentry.makeFetchTransport
+        >[0],
+      );
+      const envelope = [
+        {},
+        [[{ type: 'event' }, { message: 'test' }]],
+      ] as unknown as TestEnvelope;
+
+      await transport.send(envelope);
+
+      expect(fetchSpy).toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('falls back to backup state when getPersistedState throws', async () => {
+      const fetchSpy = mockFetchForTransport();
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted unavailable');
+        },
+        getBackupState: async () => ({
+          MetaMetricsController: {
+            participateInMetaMetrics: true,
+            metaMetricsId: 'backup-id',
+          },
+        }),
+      };
+
+      const transport = makeTransport(
+        createTestTransportOptions() as Parameters<
+          typeof Sentry.makeFetchTransport
+        >[0],
+      );
+      const envelope = [
+        {},
+        [[{ type: 'event' }, { message: 'test' }]],
+      ] as unknown as TestEnvelope;
+
+      await transport.send(envelope);
+
+      expect(fetchSpy).toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('throws when both getPersistedState and getBackupState fail', async () => {
+      const fetchSpy = mockFetchForTransport();
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => {
+          throw new Error('persisted failed');
+        },
+        getBackupState: async () => {
+          throw new Error('backup failed');
+        },
+      };
+
+      const transport = makeTransport(
+        createTestTransportOptions() as Parameters<
+          typeof Sentry.makeFetchTransport
+        >[0],
+      );
+      const envelope = [
+        {},
+        [[{ type: 'event' }, { message: 'test' }]],
+      ] as unknown as TestEnvelope;
+
+      await expect(transport.send(envelope)).rejects.toThrow(
+        'Network request skipped as metrics disabled',
+      );
+      expect(fetchSpy).not.toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+  });
+
+  describe('Sentry.init with makeTransport (MetaMetrics)', () => {
+    afterEach(async () => {
+      await Sentry.close(2000);
+      deleteStateHookProperty('getPersistedState');
+      deleteStateHookProperty('getBackupState');
+      deleteStateHookProperty('getSentryState');
+    });
+
+    it('does not call fetch after init when opted out', async () => {
+      (globalThis as typeof globalThis & { nw?: object }).nw = {};
+      globalThis.history ??= {} as unknown as History;
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: { participateInMetaMetrics: false },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      const fetchSpy = jest
+        .spyOn(globalThis, 'fetch')
+        .mockResolvedValue(minimalFetchResponse());
+
+      await Sentry.close(2000);
+      Sentry.init({
+        dsn: 'https://public@fake.ingest.sentry.io/1',
+        release: 'setup-sentry-unit-test',
+        transport: makeTransport,
+        tracesSampleRate: 0,
+      });
+
+      await tick();
+
+      expect(fetchSpy).not.toHaveBeenCalled();
+
+      fetchSpy.mockRestore();
+    });
+
+    it('calls fetch after init when opted in', async () => {
+      (globalThis as typeof globalThis & { nw?: object }).nw = {};
+      globalThis.history ??= {} as unknown as History;
+
+      globalThis.stateHooks = {
+        ...globalThis.stateHooks,
+        getSentryState: () => emptySentrySnapshot(),
+        getPersistedState: async () => ({
+          data: {
+            MetaMetricsController: {
+              participateInMetaMetrics: true,
+              metaMetricsId: 'init-session-test-id',
+            },
+          },
+        }),
+        getBackupState: async () => ({}),
+      };
+
+      const fetchSpy = jest
+        .spyOn(globalThis, 'fetch')
+        .mockResolvedValue(minimalFetchResponse());
+
+      await Sentry.close(2000);
+      Sentry.init({
+        dsn: 'https://public@fake.ingest.sentry.io/1',
+        release: 'setup-sentry-unit-test',
+        transport: makeTransport,
+        tracesSampleRate: 0,
+      });
+
+      await tick();
+
+      expect(fetchSpy).toHaveBeenCalled();
+
+      const fetchCalls = fetchSpy.mock.calls as FetchCallArgs[];
+
+      const envelopes = fetchCalls
+        .map(([, init]) => init?.body)
+        .filter((body): body is NonNullable<RequestInit['body']> =>
+          Boolean(body),
+        )
+        .map((body): ParsedSentryEnvelope | null => {
+          try {
+            return parseEnvelope(body as Parameters<typeof parseEnvelope>[0]);
+          } catch {
+            return null;
+          }
+        })
+        .filter((parsed): parsed is ParsedSentryEnvelope => parsed !== null);
+
+      const hasSessionItem = envelopes.some((parsedEnvelope) =>
+        forEachEnvelopeItem(
+          parsedEnvelope,
+          (_item: unknown, type: string) => type === 'session',
+        ),
+      );
+      expect(hasSessionItem).toBe(true);
+
+      fetchSpy.mockRestore();
+    });
+  });
+});
diff --git a/app/scripts/lib/sentry-make-transport.ts b/app/scripts/lib/sentry-make-transport.ts
new file mode 100644
index 000000000000..98a20871f1a5
--- /dev/null
+++ b/app/scripts/lib/sentry-make-transport.ts
@@ -0,0 +1,22 @@
+import * as Sentry from '@sentry/browser';
+import { getMetaMetricsState } from './sentry-get-state';
+
+/**
+ * Custom Sentry transport: skip network when MetaMetrics is off. Event bodies are already
+ * processed in {@link rewriteReport} via `beforeSend`.
+ *
+ * @param options - Sentry transport options passed to {@link Sentry.makeFetchTransport}.
+ */
+export function makeTransport(
+  options: Parameters<typeof Sentry.makeFetchTransport>[0],
+) {
+  return Sentry.makeFetchTransport(options, async (...args) => {
+    const state = await getMetaMetricsState();
+
+    if (!state?.participateInMetaMetrics) {
+      throw new Error('Network request skipped as metrics disabled');
+    }
+
+    return await fetch(...args);
+  });
+}
diff --git a/app/scripts/lib/sentry-metametrics.test.ts b/app/scripts/lib/sentry-metametrics.test.ts
new file mode 100644
index 000000000000..c1d7c96f18d4
--- /dev/null
+++ b/app/scripts/lib/sentry-metametrics.test.ts
@@ -0,0 +1,84 @@
+import type { Client, Event as SentryEvent, EventHint } from '@sentry/types';
+
+import type { MetaMetricsParticipation } from './sentry-get-state';
+import { metaMetricsIntegration } from './sentry-metametrics';
+
+const stubHint = {} as EventHint;
+const stubClient = {} as Client;
+
+describe('metaMetricsIntegration', () => {
+  const log = jest.fn();
+
+  beforeEach(() => {
+    log.mockClear();
+  });
+
+  function createIntegration(
+    getMetaMetricsState: () => Promise<MetaMetricsParticipation>,
+  ) {
+    return metaMetricsIntegration({
+      getMetaMetricsState,
+      log,
+    });
+  }
+
+  describe('processEvent', () => {
+    it('returns null and logs when MetaMetrics is disabled', async () => {
+      const integration = createIntegration(async () => ({
+        participateInMetaMetrics: false,
+      }));
+      const event: SentryEvent = { message: 'err' };
+      const { processEvent } = integration;
+      if (!processEvent) {
+        throw new Error('expected processEvent');
+      }
+      await expect(
+        processEvent(event, stubHint, stubClient),
+      ).resolves.toBeNull();
+      expect(log).toHaveBeenCalledWith('Event dropped as metrics disabled');
+    });
+
+    it('returns null when MetaMetrics state is null', async () => {
+      const integration = createIntegration(async () => null);
+      const event: SentryEvent = { message: 'err' };
+      const { processEvent } = integration;
+      if (!processEvent) {
+        throw new Error('expected processEvent');
+      }
+      await expect(
+        processEvent(event, stubHint, stubClient),
+      ).resolves.toBeNull();
+      expect(log).toHaveBeenCalledWith('Event dropped as metrics disabled');
+    });
+
+    it('attaches user.id from getMetaMetricsState when opted in', async () => {
+      const integration = createIntegration(async () => ({
+        participateInMetaMetrics: true,
+        metaMetricsId: 'metrics-id-from-async',
+      }));
+      const event: SentryEvent = { message: 'err' };
+      const { processEvent } = integration;
+      if (!processEvent) {
+        throw new Error('expected processEvent');
+      }
+      const result = await processEvent(event, stubHint, stubClient);
+      expect(result).toBe(event);
+      expect(event.user).toStrictEqual({ id: 'metrics-id-from-async' });
+      expect(log).not.toHaveBeenCalled();
+    });
+
+    it('does not set user when opted in but metaMetricsId is missing', async () => {
+      const integration = createIntegration(async () => ({
+        participateInMetaMetrics: true,
+        metaMetricsId: undefined,
+      }));
+      const event: SentryEvent = { message: 'err' };
+      const { processEvent } = integration;
+      if (!processEvent) {
+        throw new Error('expected processEvent');
+      }
+      await processEvent(event, stubHint, stubClient);
+      expect(event.user).toBeUndefined();
+    });
+  });
+});
diff --git a/app/scripts/lib/sentry-metametrics.ts b/app/scripts/lib/sentry-metametrics.ts
new file mode 100644
index 000000000000..2149de1c98ba
--- /dev/null
+++ b/app/scripts/lib/sentry-metametrics.ts
@@ -0,0 +1,54 @@
+import {
+  type Client,
+  Event as SentryEvent,
+  EventHint,
+  Integration,
+} from '@sentry/types';
+
+import type { MetaMetricsParticipation } from './sentry-get-state';
+
+const NAME = 'MetaMetrics';
+
+/**
+ * Drops Sentry events when MetaMetrics is disabled, and attaches `user.id` from the same
+ * async MetaMetrics resolution used for that check (persisted / backup when the in-memory
+ * snapshot is not ready yet).
+ *
+ * @param options - Options bag.
+ * @param options.getMetaMetricsState - Resolves participation and id (e.g. `getMetaMetricsState`).
+ * @param options.log - Function to log messages.
+ */
+export function metaMetricsIntegration({
+  getMetaMetricsState,
+  log,
+}: {
+  getMetaMetricsState: () => Promise<MetaMetricsParticipation>;
+  log: (message: string) => void;
+}): Integration {
+  return {
+    name: NAME,
+    processEvent: async (
+      event: SentryEvent,
+      _hint: EventHint,
+      _client: Client,
+    ) => {
+      // This integration is required in addition to the custom transport as it provides an
+      // asynchronous context which we may need in order to read the persisted state from the
+      // store, so it can later be added to the event via the `beforeSend` overload.
+      // It also provides a more native solution for discarding events, but any
+      // session requests will always be handled by the custom transport.
+      const metaMetricsState = await getMetaMetricsState();
+
+      if (!metaMetricsState?.participateInMetaMetrics) {
+        log('Event dropped as metrics disabled');
+        return null;
+      }
+
+      if (metaMetricsState.metaMetricsId) {
+        event.user = { ...event.user, id: metaMetricsState.metaMetricsId };
+      }
+
+      return event;
+    },
+  };
+}
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 6acb6f15fe69..aa450c9c61e8 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -7,7 +7,13 @@ import { isManifestV3 } from '../../../shared/lib/mv3.utils';
 import { getManifestFlags } from '../../../shared/lib/manifestFlags';
 import { getSentryRelease } from '../../../shared/lib/sentry-release';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
-import { filterEvents } from './sentry-filter-events';
+import { metaMetricsIntegration } from './sentry-metametrics';
+import {
+  getMetaMetricsState,
+  getMetaMetricsStateFromAppState,
+  getState,
+} from './sentry-get-state';
+import { makeTransport } from './sentry-make-transport';
 import { getInstallType, initInstallType } from './install-type';
 
 const internalLog = createModuleLogger(log, 'internal');
@@ -58,7 +64,6 @@ export default function setupSentry() {
 
   return {
     ...Sentry,
-    getMetaMetricsEnabled,
   };
 }
 
@@ -82,7 +87,10 @@ function getClientOptions() {
           return !url.match(/^https?:\/\/([\w\d.@-]+\.)?sentry\.io(\/|$)/u);
         },
       }),
-      filterEvents({ getMetaMetricsEnabled, log }),
+      metaMetricsIntegration({
+        getMetaMetricsState,
+        log,
+      }),
     ],
     release: RELEASE,
     // Client reports are automatically sent when a page's visibility changes to
@@ -157,55 +165,6 @@ function setCITags() {
   }
 }
 
-/**
- * Returns whether MetaMetrics is enabled, given the application state.
- *
- * @param {{ state: unknown} | { persistedState: unknown }} appState - Application state
- * @returns `true` if MetaMask's state has been initialized, and MetaMetrics
- * is enabled, `false` otherwise.
- */
-function getMetaMetricsEnabledFromAppState(appState) {
-  // during initialization after loading persisted state
-  if (appState.persistedState) {
-    return getMetaMetricsEnabledFromPersistedState(appState.persistedState);
-    // After initialization
-  } else if (appState.state) {
-    // UI
-    if (appState.state.metamask) {
-      return Boolean(appState.state.metamask.participateInMetaMetrics);
-    }
-    // background
-    return Boolean(
-      appState.state.MetaMetricsController?.participateInMetaMetrics,
-    );
-  }
-  // during initialization, before first persisted state is read
-  return false;
-}
-
-/**
- * Returns whether MetaMetrics is enabled, given the persisted state.
- *
- * @param {unknown} persistedState - Application state
- * @returns `true` if MetaMask's state has been initialized, and MetaMetrics
- * is enabled, `false` otherwise.
- */
-function getMetaMetricsEnabledFromPersistedState(persistedState) {
-  return Boolean(
-    persistedState?.data?.MetaMetricsController?.participateInMetaMetrics,
-  );
-}
-
-/**
- * Returns whether MetaMetrics is enabled, given the backup state.
- *
- * @param {unknown} backupState - Backup state from IndexedDB
- * @returns `true` if MetaMetrics is enabled in the backup, `false` otherwise.
- */
-function getMetaMetricsEnabledFromBackupState(backupState) {
-  return Boolean(backupState?.MetaMetricsController?.participateInMetaMetrics);
-}
-
 function getSentryEnvironment() {
   if (METAMASK_BUILD_TYPE === 'main') {
     return METAMASK_ENVIRONMENT;
@@ -241,43 +200,6 @@ function getSentryTarget() {
   return SENTRY_DSN;
 }
 
-/**
- * Returns whether MetaMetrics is enabled. If the application hasn't yet
- * been initialized, the persisted state will be used (if any).
- *
- * @returns `true` if MetaMetrics is enabled, `false` otherwise.
- */
-async function getMetaMetricsEnabled() {
-  const flags = getManifestFlags();
-
-  if (flags.ci && flags.sentry.forceEnable) {
-    return true;
-  }
-
-  const appState = getState();
-
-  if (appState.state || appState.persistedState) {
-    return getMetaMetricsEnabledFromAppState(appState);
-  }
-
-  // If we reach here, it means the error was thrown before initialization
-  // completed, and before we loaded the persisted state for the first time.
-  try {
-    const persistedState = await globalThis.stateHooks.getPersistedState();
-    return getMetaMetricsEnabledFromPersistedState(persistedState);
-  } catch (error) {
-    log('Error retrieving persisted state, falling back to backup', error);
-    // Primary storage failed (e.g., database corruption) - check the backup
-    try {
-      const backupState = await globalThis.stateHooks.getBackupState();
-      return getMetaMetricsEnabledFromBackupState(backupState);
-    } catch (backupError) {
-      log('Error retrieving backup state', backupError);
-      return false;
-    }
-  }
-}
-
 function setSentryClient() {
   const clientOptions = getClientOptions();
   const { dsn, environment, release, tracesSampleRate } = clientOptions;
@@ -340,8 +262,9 @@ export function beforeBreadcrumb() {
       return null;
     }
     const appState = getState();
+    const state = getMetaMetricsStateFromAppState(appState);
     if (
-      !getMetaMetricsEnabledFromAppState(appState) ||
+      !state?.participateInMetaMetrics ||
       breadcrumb?.category === 'ui.input'
     ) {
       return null;
@@ -373,13 +296,11 @@ export function removeUrlsFromBreadCrumb(breadcrumb) {
 }
 
 /**
- * Receives a Sentry event object and modifies it before the
- * error is sent to Sentry. Modifications include both sanitization
- * of data via helper methods and addition of state data from the
- * return value of the second parameter passed to the function.
+ * Receives a Sentry event object and modifies it before the error is sent to Sentry.
+ * Sanitizes messages/URLs and attaches app state.
  *
  * @param {object} report - A Sentry event object: https://develop.sentry.dev/sdk/event-payloads/
- * @returns {object} A modified Sentry event object.
+ * @returns {object} The modified report (same reference).
  */
 export function rewriteReport(report) {
   try {
@@ -395,7 +316,6 @@ export function rewriteReport(report) {
     // modify report urls
     rewriteReportUrls(report);
 
-    // append app state
     const appState = getState();
 
     if (!report.extra) {
@@ -530,10 +450,6 @@ function toMetamaskUrl(origUrl) {
   return metamaskUrl;
 }
 
-function getState() {
-  return globalThis.stateHooks?.getSentryState?.() || {};
-}
-
 function integrateLogging() {
   if (!METAMASK_DEBUG) {
     return;
@@ -570,18 +486,6 @@ function addDebugListeners() {
   log('Added debug listeners');
 }
 
-function makeTransport(options) {
-  return Sentry.makeFetchTransport(options, async (...args) => {
-    const metricsEnabled = await getMetaMetricsEnabled();
-
-    if (!metricsEnabled) {
-      throw new Error('Network request skipped as metrics disabled');
-    }
-
-    return await fetch(...args);
-  });
-}
-
 function isCompletedSessionEnvelope(envelope) {
   const type = envelope?.[1]?.[0]?.[0]?.type;
   const data = envelope?.[1]?.[0]?.[1] ?? {};
diff --git a/app/scripts/lib/setupSentry.test.js b/app/scripts/lib/setupSentry.test.js
index f8ab7fd32be1..4eaf059fdf0c 100644
--- a/app/scripts/lib/setupSentry.test.js
+++ b/app/scripts/lib/setupSentry.test.js
@@ -1,4 +1,4 @@
-import { rewriteReport, removeUrlsFromBreadCrumb } from './setupSentry';
+import { removeUrlsFromBreadCrumb, rewriteReport } from './setupSentry';
 
 describe('Setup Sentry', () => {
   describe('rewriteReport', () => {
@@ -7,8 +7,8 @@ describe('Setup Sentry', () => {
         message: 'This report has a test url: http://example.com',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report has a test url: **',
       );
     });
@@ -27,8 +27,8 @@ describe('Setup Sentry', () => {
         },
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.exception.values).toStrictEqual([
+      rewriteReport(testReport);
+      expect(testReport.exception.values).toStrictEqual([
         {
           value: 'This report has a test url: **',
         },
@@ -44,8 +44,8 @@ describe('Setup Sentry', () => {
           'There is an ethereum address 0x790A8A9E9bc1C9dB991D8721a92e461Db4CfB235 in this message',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'There is an ethereum address 0x** in this message',
       );
     });
@@ -55,8 +55,8 @@ describe('Setup Sentry', () => {
         message: 'This report has an allowed url: https://codefi.network/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report has an allowed url: https://codefi.network/',
       );
     });
@@ -67,8 +67,8 @@ describe('Setup Sentry', () => {
           'This report has an allowed url: https://subdomain.codefi.network/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report has an allowed url: https://subdomain.codefi.network/',
       );
     });
@@ -79,8 +79,8 @@ describe('Setup Sentry', () => {
           'This report does not have an allowed url: https://nodefi.network/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report does not have an allowed url: **',
       );
     });
@@ -91,8 +91,8 @@ describe('Setup Sentry', () => {
           'This report does not have an allowed url: https://codefi.network.another.domain.com/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report does not have an allowed url: **',
       );
     });
@@ -103,8 +103,8 @@ describe('Setup Sentry', () => {
           'This report does not have an allowed url: https://example.com/test?redirect=http://codefi.network',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report does not have an allowed url: **',
       );
     });
@@ -115,8 +115,8 @@ describe('Setup Sentry', () => {
           'This report does not have an allowed url: https://subdomain.example.com/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report does not have an allowed url: **',
       );
     });
@@ -127,8 +127,8 @@ describe('Setup Sentry', () => {
           'This report does not have an allowed url: https://example.%%%/',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This report does not have an allowed url: **',
       );
     });
@@ -139,8 +139,8 @@ describe('Setup Sentry', () => {
           'This 0x790A8A9E9bc1C9dB991D8721a92e461Db4CfB235 address used http://example.com on Saturday',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual(
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual(
         'This 0x** address used ** on Saturday',
       );
     });
@@ -150,8 +150,8 @@ describe('Setup Sentry', () => {
         message: 'This is a simple report',
         request: {},
       };
-      const rewrittenReport = rewriteReport(testReport);
-      expect(rewrittenReport.message).toStrictEqual('This is a simple report');
+      rewriteReport(testReport);
+      expect(testReport.message).toStrictEqual('This is a simple report');
     });
   });
 
diff --git a/app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts b/app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts
index 2be53b3d2320..ddb712062df1 100644
--- a/app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts
+++ b/app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts
@@ -25,6 +25,7 @@ describe('keyringSnapPermissionsBuilder', () => {
     subjectCacheLimit: 100,
     messenger: {
       registerActionHandler: jest.fn(),
+      registerMethodActionHandlers: jest.fn(),
       registerInitialEventPayload: jest.fn(),
       publish: jest.fn(),
       // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
diff --git a/app/scripts/lib/snap-keyring/metrics.test.ts b/app/scripts/lib/snap-keyring/metrics.test.ts
index 16888d763da7..fa3eb9725233 100644
--- a/app/scripts/lib/snap-keyring/metrics.test.ts
+++ b/app/scripts/lib/snap-keyring/metrics.test.ts
@@ -138,7 +138,7 @@ describe('getSnapAndHardwareInfoForMetrics', () => {
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
         2,
-        'SnapController:get',
+        'SnapController:getSnap',
         'snapId',
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
@@ -209,7 +209,7 @@ describe('getSnapAndHardwareInfoForMetrics', () => {
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
         2,
-        'SnapController:get',
+        'SnapController:getSnap',
         'snapId',
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
@@ -333,7 +333,7 @@ describe('getSnapAndHardwareInfoForMetrics', () => {
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
         2,
-        'SnapController:get',
+        'SnapController:getSnap',
         'snapId',
       );
       expect(messenger.call).toHaveBeenNthCalledWith(
diff --git a/app/scripts/lib/snap-keyring/metrics.ts b/app/scripts/lib/snap-keyring/metrics.ts
index 0d0573fe5a8b..ca9e1e387913 100644
--- a/app/scripts/lib/snap-keyring/metrics.ts
+++ b/app/scripts/lib/snap-keyring/metrics.ts
@@ -4,12 +4,12 @@ import {
   KeyringControllerGetStateAction,
 } from '@metamask/keyring-controller';
 import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
-import { GetSnap } from '@metamask/snaps-controllers';
+import { SnapControllerGetSnapAction } from '@metamask/snaps-controllers';
 import { Snap } from '@metamask/snaps-utils';
 import { HardwareKeyringType } from '../../../../shared/constants/hardware-wallets';
 
 type AllowedActions =
-  | GetSnap
+  | SnapControllerGetSnapAction
   | KeyringControllerGetKeyringForAccountAction
   | AccountsControllerGetSelectedAccountAction
   | KeyringControllerGetStateAction;
@@ -38,7 +38,7 @@ export async function getSnapAndHardwareInfoForMetrics(
   let snap;
   if (account.metadata.snap?.id) {
     snap = messenger.call(
-      'SnapController:get',
+      'SnapController:getSnap',
       account.metadata.snap?.id,
     ) as Snap;
   }
diff --git a/app/scripts/lib/snap-keyring/snap-keyring.test.ts b/app/scripts/lib/snap-keyring/snap-keyring.test.ts
index 237b00743c5c..f648aa1998bc 100644
--- a/app/scripts/lib/snap-keyring/snap-keyring.test.ts
+++ b/app/scripts/lib/snap-keyring/snap-keyring.test.ts
@@ -38,7 +38,7 @@ const mockGetAccountByAddress = jest.fn();
 const mockListMultichainAccounts = jest.fn();
 const mockLocale = 'en';
 const mockPreferencesControllerGetState = jest.fn();
-const mockSnapControllerGet = jest.fn();
+const mockSnapControllerGetSnap = jest.fn();
 const mockSnapControllerHandleRequest = jest.fn();
 const mockRemoteFeatureFlagsGetStateRequest = jest.fn();
 
@@ -110,7 +110,7 @@ const createControllerMessenger = ({
       'AccountsController:getAccountByAddress',
       'AccountsController:listMultichainAccounts',
       'PreferencesController:getState',
-      'SnapController:get',
+      'SnapController:getSnap',
       'SnapController:handleRequest',
       'RemoteFeatureFlagController:getState',
     ],
@@ -159,8 +159,8 @@ const createControllerMessenger = ({
           locale: mockLocale,
         })(params);
 
-      case 'SnapController:get':
-        return mockSnapControllerGet.mockReturnValue({
+      case 'SnapController:getSnap':
+        return mockSnapControllerGetSnap.mockReturnValue({
           id: mockSnapId,
           manifest: {
             proposedName: mockSnapName,
diff --git a/app/scripts/lib/snap-keyring/types.ts b/app/scripts/lib/snap-keyring/types.ts
index 555e69d5aa8c..6aaabe5eef0e 100644
--- a/app/scripts/lib/snap-keyring/types.ts
+++ b/app/scripts/lib/snap-keyring/types.ts
@@ -18,9 +18,9 @@ import type {
   ApprovalControllerStartFlowAction,
 } from '@metamask/approval-controller';
 import {
-  GetSnap,
-  HandleSnapRequest,
-  IsMinimumPlatformVersion,
+  SnapControllerGetSnapAction,
+  SnapControllerHandleRequestAction,
+  SnapControllerIsMinimumPlatformVersionAction,
 } from '@metamask/snaps-controllers';
 import { SnapKeyring } from '@metamask/eth-snap-keyring';
 import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
@@ -42,16 +42,15 @@ export type SnapKeyringBuilderAllowActions =
   | AccountsControllerGetAccountByAddressAction
   | AccountsControllerSetAccountNameAction
   | AccountsControllerListMultichainAccountsAction
-  | HandleSnapRequest
-  | GetSnap
+  | SnapControllerHandleRequestAction
+  | SnapControllerGetSnapAction
   | PreferencesControllerGetStateAction
-  | IsMinimumPlatformVersion
+  | SnapControllerIsMinimumPlatformVersionAction
   | RemoteFeatureFlagControllerGetStateAction;
 
 export type SnapKeyringBuilderMessenger = Messenger<
   'SnapKeyring',
-  SnapKeyringBuilderAllowActions,
-  never
+  SnapKeyringBuilderAllowActions
 >;
 
 /**
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 004d3927b698..462cf640429e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -220,6 +220,8 @@ import { createSentryError } from '../../shared/lib/error';
 import {
   getAccountTrackerControllerAccountsByChainId,
   getTokensControllerAllTokens,
+  getRatesControllerRates,
+  getRatesControllerFiatCurrency,
 } from '../../shared/lib/selectors/assets-migration';
 import {
   isUserRejectedHardwareWalletError,
@@ -347,9 +349,9 @@ import {
   SnapInsightsControllerInit,
   SnapInterfaceControllerInit,
   SnapsNameProviderInit,
-  SnapsRegistryInit,
+  SnapRegistryControllerInit,
   WebSocketServiceInit,
-  MultichainRouterInit,
+  MultichainRoutingServiceInit,
 } from './controller-init/snaps';
 import {
   BackendWebSocketServiceInit,
@@ -418,7 +420,6 @@ import { AlertControllerInit } from './controller-init/alert-controller-init';
 import { MetaMetricsDataDeletionControllerInit } from './controller-init/metametrics-data-deletion-controller-init';
 import { LoggingControllerInit } from './controller-init/logging-controller-init';
 import { AppMetadataControllerInit } from './controller-init/app-metadata-controller-init';
-import { ErrorReportingServiceInit } from './controller-init/error-reporting-service-init';
 import { StorageServiceInit } from './controller-init/storage-service-init';
 import { ApprovalControllerInit } from './controller-init/confirmations/approval-controller-init';
 import { AddressBookControllerInit } from './controller-init/confirmations/address-book-controller-init';
@@ -575,7 +576,6 @@ export default class MetamaskController extends EventEmitter {
     const controllerInitFunctions = {
       ApprovalController: ApprovalControllerInit,
       LoggingController: LoggingControllerInit,
-      ErrorReportingService: ErrorReportingServiceInit,
       StorageService: StorageServiceInit,
       AppMetadataController: AppMetadataControllerInit,
       PreferencesController: PreferencesControllerInit,
@@ -603,7 +603,7 @@ export default class MetamaskController extends EventEmitter {
       ExecutionService: ExecutionServiceInit,
       InstitutionalSnapController: InstitutionalSnapControllerInit,
       RateLimitController: RateLimitControllerInit,
-      SnapsRegistry: SnapsRegistryInit,
+      SnapRegistryController: SnapRegistryControllerInit,
       CronjobController: CronjobControllerInit,
       SelectedNetworkController: SelectedNetworkControllerInit,
       SnapController: SnapControllerInit,
@@ -648,7 +648,7 @@ export default class MetamaskController extends EventEmitter {
       MultichainBalancesController: MultichainBalancesControllerInit,
       MultichainTransactionsController: MultichainTransactionsControllerInit,
       MultichainAccountService: MultichainAccountServiceInit,
-      MultichainRouter: MultichainRouterInit,
+      MultichainRoutingService: MultichainRoutingServiceInit,
       AuthenticationController: AuthenticationControllerInit,
       UserStorageController: UserStorageControllerInit,
       NotificationServicesController: NotificationServicesControllerInit,
@@ -729,7 +729,7 @@ export default class MetamaskController extends EventEmitter {
     this.snapController = controllersByName.SnapController;
     this.snapInsightsController = controllersByName.SnapInsightsController;
     this.snapInterfaceController = controllersByName.SnapInterfaceController;
-    this.snapsRegistry = controllersByName.SnapsRegistry;
+    this.snapsRegistry = controllersByName.SnapRegistryController;
     this.ppomController = controllersByName.PPOMController;
     this.phishingController = controllersByName.PhishingController;
     this.onboardingController = controllersByName.OnboardingController;
@@ -1360,7 +1360,7 @@ export default class MetamaskController extends EventEmitter {
         MultichainRatesController: this.multichainRatesController,
         SnapController: this.snapController,
         CronjobController: this.cronjobController,
-        SnapsRegistry: this.snapsRegistry,
+        SnapRegistryController: this.snapsRegistry,
         SnapInterfaceController: this.snapInterfaceController,
         SnapInsightsController: this.snapInsightsController,
         NameController: this.nameController,
@@ -1586,7 +1586,8 @@ export default class MetamaskController extends EventEmitter {
     if (
       !isEvmAccountType(
         this.accountsController.getSelectedMultichainAccount().type,
-      )
+      ) &&
+      !this.#isAssetsUnifyStateEnabled()
     ) {
       this.multichainRatesController.start();
     }
@@ -1603,7 +1604,9 @@ export default class MetamaskController extends EventEmitter {
   stopNetworkRequests() {
     this.txController.stopIncomingTransactionPolling();
     this.tokenDetectionController.disable();
-    this.multichainRatesController.stop();
+    if (!this.#isAssetsUnifyStateEnabled()) {
+      this.multichainRatesController.stop();
+    }
     if (getIsPerpsIncludedInBuild()) {
       this.controllerApi.perpsStopEligibilityMonitoring?.()?.catch((error) => {
         console.error(error);
@@ -1972,6 +1975,20 @@ export default class MetamaskController extends EventEmitter {
     this.controllerMessenger.subscribe(
       `${this.accountTreeController.name}:selectedAccountGroupChange`,
       (groupId) => {
+        const authorizationsByOrigin = getAuthorizedScopesByOrigin(
+          this.permissionController.state,
+        );
+
+        // TODO: Remove this setTimeout once https://github.com/MetaMask/core/pull/8261 is released
+        setTimeout(() => {
+          for (const [
+            origin,
+            authorization,
+          ] of authorizationsByOrigin.entries()) {
+            this._notifyAuthorizationChange(origin, authorization);
+          }
+        }, 1000);
+
         // TODO: Move this logic to the SnapKeyring directly.
         // Forward selected accounts to the Snap keyring, so each Snaps can fetch those accounts.
         // eslint-disable-next-line no-void
@@ -2252,6 +2269,10 @@ export default class MetamaskController extends EventEmitter {
    * and subscribes to account changes.
    */
   setupMultichainDataAndSubscriptions() {
+    if (this.#isAssetsUnifyStateEnabled()) {
+      return;
+    }
+
     this.controllerMessenger.subscribe(
       'AccountsController:selectedAccountChange',
       (selectedAccount) => {
@@ -2549,10 +2570,6 @@ export default class MetamaskController extends EventEmitter {
           assetsController.setSelectedCurrency(currencyCode);
         }
       },
-      // @deprecated Use setAvatarType instead
-      setUseBlockie: preferencesController.setUseBlockie.bind(
-        preferencesController,
-      ),
       setAvatarType: (avatarType) =>
         preferencesController.setPreference('avatarType', avatarType),
       setUsePhishDetect: preferencesController.setUsePhishDetect.bind(
@@ -3260,20 +3277,20 @@ export default class MetamaskController extends EventEmitter {
         multichainNetworkController,
       }),
 
-      // snaps
+      // Snaps
       disableSnap: this.controllerMessenger.call.bind(
         this.controllerMessenger,
-        'SnapController:disable',
+        'SnapController:disableSnap',
       ),
       enableSnap: this.controllerMessenger.call.bind(
         this.controllerMessenger,
-        'SnapController:enable',
+        'SnapController:enableSnap',
       ),
       updateSnap: (origin, requestedSnaps) => {
         // We deliberately do not await this promise as that would mean waiting for the update to complete
         // Instead we return null to signal to the UI that it is safe to redirect to the update flow
         this.controllerMessenger.call(
-          'SnapController:install',
+          'SnapController:installSnaps',
           origin,
           requestedSnaps,
         );
@@ -3281,12 +3298,12 @@ export default class MetamaskController extends EventEmitter {
       },
       removeSnap: this.controllerMessenger.call.bind(
         this.controllerMessenger,
-        'SnapController:remove',
+        'SnapController:removeSnap',
       ),
       handleSnapRequest: this.handleSnapRequest.bind(this),
       revokeDynamicSnapPermissions: this.controllerMessenger.call.bind(
         this.controllerMessenger,
-        'SnapController:revokeDynamicPermissions',
+        'SnapController:revokeDynamicSnapPermissions',
       ),
       disconnectOriginFromSnap: this.controllerMessenger.call.bind(
         this.controllerMessenger,
@@ -3303,6 +3320,9 @@ export default class MetamaskController extends EventEmitter {
 
         return phishingController.test(website);
       },
+      scanUrlForPhishing: async (origin) => {
+        return phishingController.scanUrl(origin);
+      },
       deleteInterface: this.controllerMessenger.call.bind(
         this.controllerMessenger,
         'SnapInterfaceController:deleteInterface',
@@ -6131,7 +6151,7 @@ export default class MetamaskController extends EventEmitter {
 
   getNonEvmSupportedMethods(scope) {
     return this.controllerMessenger.call(
-      'MultichainRouter:getSupportedMethods',
+      'MultichainRoutingService:getSupportedMethods',
       scope,
     );
   }
@@ -6427,15 +6447,7 @@ export default class MetamaskController extends EventEmitter {
   }) => {
     switch (type) {
       case ERC20: {
-        const assetsUnifyFlag =
-          this.remoteFeatureFlagController.state.remoteFeatureFlags
-            ?.assetsUnifyState;
-        const unifyWatchAsset =
-          getIsAssetsUnifiedStateIncludedInBuild() &&
-          isAssetsUnifyStateFeatureEnabled(
-            assetsUnifyFlag,
-            ASSETS_UNIFY_STATE_VERSION_1,
-          );
+        const unifyWatchAsset = this.#isAssetsUnifyStateEnabled();
         if (unifyWatchAsset) {
           this.#validateUnifiedWatchAssetRequest(asset, networkClientId);
         }
@@ -7248,7 +7260,7 @@ export default class MetamaskController extends EventEmitter {
       actions: [
         'KeyringController:getKeyringForAccount',
         'KeyringController:getState',
-        'SnapController:get',
+        'SnapController:getSnap',
         'AccountsController:getSelectedAccount',
       ],
     });
@@ -7408,7 +7420,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getSnaps: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:getPermitted',
+          'SnapController:getPermittedSnaps',
           origin,
         ),
         requestPermissions: async (requestedPermissions) =>
@@ -7422,7 +7434,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getSnapFile: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:getFile',
+          'SnapController:getSnapFile',
           origin,
         ),
         getSnapState: this.controllerMessenger.call.bind(
@@ -7437,7 +7449,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         installSnaps: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:install',
+          'SnapController:installSnaps',
           origin,
         ),
         invokeSnap: this.permissionController.executeRestrictedMethod.bind(
@@ -7491,7 +7503,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getSnap: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:get',
+          'SnapController:getSnap',
         ),
         trackError: (error) => {
           // `captureException` imported from `@sentry/browser` does not seem to
@@ -7504,7 +7516,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getAllSnaps: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:getAll',
+          'SnapController:getAllSnaps',
         ),
         openWebSocket: this.controllerMessenger.call.bind(
           this.controllerMessenger,
@@ -7527,8 +7539,9 @@ export default class MetamaskController extends EventEmitter {
           origin,
         ),
         getCurrencyRate: (currency) => {
-          const rate = this.multichainRatesController.state.rates[currency];
-          const { fiatCurrency } = this.multichainRatesController.state;
+          const state = this._getMetaMaskState();
+          const fiatCurrency = getRatesControllerFiatCurrency(state);
+          const rate = getRatesControllerRates(state)[currency];
 
           if (!rate) {
             return undefined;
@@ -7675,7 +7688,7 @@ export default class MetamaskController extends EventEmitter {
       actions: [
         'KeyringController:getKeyringForAccount',
         'KeyringController:getState',
-        'SnapController:get',
+        'SnapController:getSnap',
         'AccountsController:getSelectedAccount',
       ],
     });
@@ -7733,16 +7746,19 @@ export default class MetamaskController extends EventEmitter {
         getNonEvmSupportedMethods: this.getNonEvmSupportedMethods.bind(this),
         isNonEvmScopeSupported: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'MultichainRouter:isSupportedScope',
+          'MultichainRoutingService:isSupportedScope',
         ),
         handleNonEvmRequestForOrigin: (params) =>
-          this.controllerMessenger.call('MultichainRouter:handleRequest', {
-            ...params,
-            origin,
-          }),
+          this.controllerMessenger.call(
+            'MultichainRoutingService:handleRequest',
+            {
+              ...params,
+              origin,
+            },
+          ),
         getNonEvmAccountAddresses: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'MultichainRouter:getSupportedAccounts',
+          'MultichainRoutingService:getSupportedAccounts',
         ),
         trackSessionCreatedEvent: (approvedCaip25CaveatValue) =>
           this.metaMetricsController.trackEvent({
@@ -7755,6 +7771,8 @@ export default class MetamaskController extends EventEmitter {
               ),
             },
           }),
+        sortAccountIdsByLastSelected:
+          this.sortAccountIdsByLastSelected.bind(this),
       }),
     );
 
@@ -8317,7 +8335,7 @@ export default class MetamaskController extends EventEmitter {
       actions: [
         'KeyringController:getKeyringForAccount',
         'KeyringController:getState',
-        'SnapController:get',
+        'SnapController:getSnap',
         'AccountsController:getSelectedAccount',
       ],
     });
@@ -8818,21 +8836,56 @@ export default class MetamaskController extends EventEmitter {
   }
 
   async _notifyAuthorizationChange(origin, newAuthorization) {
+    const sessionScopes = getSessionScopes(newAuthorization, {
+      getNonEvmSupportedMethods: this.getNonEvmSupportedMethods.bind(this),
+      sortAccountIdsByLastSelected:
+        this.sortAccountIdsByLastSelected.bind(this),
+    });
+
     this.notifyConnections(
       origin,
       {
         method: MultichainApiNotifications.sessionChanged,
         params: {
-          sessionScopes: getSessionScopes(newAuthorization, {
-            getNonEvmSupportedMethods:
-              this.getNonEvmSupportedMethods.bind(this),
-          }),
+          sessionScopes,
         },
       },
       API_TYPE.CAIP_MULTICHAIN,
     );
   }
 
+  /**
+   * Sorts CAIP account IDs by the associated account address lastSelected value.
+   *
+   * @param {string[]} accountIds - CAIP account IDs to sort.
+   * @returns {string[]} Sorted CAIP account IDs.
+   */
+  sortAccountIdsByLastSelected(accountIds) {
+    if (accountIds.length < 2) {
+      return accountIds;
+    }
+
+    const addressByCaipAccountId = new Map(
+      accountIds.map((caipAccountId) => {
+        const { address } = parseCaipAccountId(caipAccountId);
+        return [caipAccountId, address];
+      }),
+    );
+
+    const addresses = [...new Set(addressByCaipAccountId.values())];
+    const sortedAddresses =
+      this.sortMultichainAccountsByLastSelected(addresses);
+    const rankByAddress = new Map(
+      sortedAddresses.map((address, index) => [address, index]),
+    );
+
+    return [...accountIds].sort(
+      (firstAccountId, secondAccountId) =>
+        rankByAddress.get(addressByCaipAccountId.get(firstAccountId)) -
+        rankByAddress.get(addressByCaipAccountId.get(secondAccountId)),
+    );
+  }
+
   /**
    * Gets the selected account address from a caveat value for the given scopes.
    *
@@ -9411,4 +9464,16 @@ export default class MetamaskController extends EventEmitter {
       upgradeContractAddress,
     };
   }
+
+  #isAssetsUnifyStateEnabled() {
+    const assetsUnifyFlag =
+      this.remoteFeatureFlagController?.state?.remoteFeatureFlags
+        ?.assetsUnifyState;
+    return (
+      isAssetsUnifyStateFeatureEnabled(
+        assetsUnifyFlag,
+        ASSETS_UNIFY_STATE_VERSION_1,
+      ) && getIsAssetsUnifiedStateIncludedInBuild()
+    );
+  }
 }
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 3537089664f0..84e2c1416131 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -78,6 +78,7 @@ import * as metamaskControllerUtils from '../../shared/lib/metamask-controller-u
 import { ReferralStatus } from './controllers/preferences-controller';
 import { METAMASK_COOKIE_HANDLER } from './constants/stream';
 import {
+  getAuthorizedScopesByOrigin,
   getOriginsWithSessionProperty,
   getPermittedAccountsForScopesByOrigin,
 } from './controllers/permissions';
@@ -308,6 +309,7 @@ jest.mock('../../shared/lib/mv3.utils', () => ({
 
 jest.mock('./controllers/permissions', () => ({
   ...jest.requireActual('./controllers/permissions'),
+  getAuthorizedScopesByOrigin: jest.fn(() => new Map()),
   getOriginsWithSessionProperty: jest.fn(),
   getPermittedAccountsForScopesByOrigin: jest.fn(() => new Map()),
 }));
@@ -2180,6 +2182,109 @@ describe('MetaMaskController', () => {
       });
     });
 
+    describe('#sortAccountIdsByLastSelected', () => {
+      const setupParseMock = (mapping) => {
+        jest.mocked(parseCaipAccountId).mockImplementation((id) => mapping[id]);
+      };
+
+      it('returns the input as-is when there is one account or less', () => {
+        expect(
+          metamaskController.sortAccountIdsByLastSelected(['eip155:1:0xaaa']),
+        ).toStrictEqual(['eip155:1:0xaaa']);
+
+        expect(
+          metamaskController.sortAccountIdsByLastSelected([]),
+        ).toStrictEqual([]);
+      });
+
+      it('sorts CAIP account IDs by their address lastSelected value', () => {
+        setupParseMock({
+          'eip155:1:0xaaa': { address: '0xaaa' },
+          'eip155:1:0xccc': { address: '0xccc' },
+          'eip155:1:0xbbb': { address: '0xbbb' },
+        });
+        jest
+          .spyOn(metamaskController, 'sortMultichainAccountsByLastSelected')
+          .mockReturnValue(['0xccc', '0xbbb', '0xaaa']);
+
+        const result = metamaskController.sortAccountIdsByLastSelected([
+          'eip155:1:0xaaa',
+          'eip155:1:0xccc',
+          'eip155:1:0xbbb',
+        ]);
+
+        expect(
+          metamaskController.sortMultichainAccountsByLastSelected,
+        ).toHaveBeenCalledWith(['0xaaa', '0xccc', '0xbbb']);
+
+        expect(result).toStrictEqual([
+          'eip155:1:0xccc',
+          'eip155:1:0xbbb',
+          'eip155:1:0xaaa',
+        ]);
+      });
+
+      it('deduplicates addresses across different chains before sorting', () => {
+        setupParseMock({
+          'eip155:1:0xaaa': { address: '0xaaa' },
+          'eip155:137:0xaaa': { address: '0xaaa' },
+          'eip155:1:0xbbb': { address: '0xbbb' },
+        });
+        const sortSpy = jest
+          .spyOn(metamaskController, 'sortMultichainAccountsByLastSelected')
+          .mockImplementation((addresses) => addresses);
+
+        metamaskController.sortAccountIdsByLastSelected([
+          'eip155:1:0xaaa',
+          'eip155:137:0xaaa',
+          'eip155:1:0xbbb',
+        ]);
+
+        expect(sortSpy).toHaveBeenCalledWith(['0xaaa', '0xbbb']);
+      });
+
+      it('preserves relative order of account IDs sharing the same address', () => {
+        setupParseMock({
+          'eip155:1:0xaaa': { address: '0xaaa' },
+          'eip155:137:0xaaa': { address: '0xaaa' },
+          'eip155:1:0xbbb': { address: '0xbbb' },
+          'eip155:137:0xbbb': { address: '0xbbb' },
+        });
+        jest
+          .spyOn(metamaskController, 'sortMultichainAccountsByLastSelected')
+          .mockReturnValue(['0xbbb', '0xaaa']);
+
+        const result = metamaskController.sortAccountIdsByLastSelected([
+          'eip155:1:0xaaa',
+          'eip155:137:0xaaa',
+          'eip155:1:0xbbb',
+          'eip155:137:0xbbb',
+        ]);
+
+        expect(result).toStrictEqual([
+          'eip155:1:0xbbb',
+          'eip155:137:0xbbb',
+          'eip155:1:0xaaa',
+          'eip155:137:0xaaa',
+        ]);
+      });
+
+      it('does not mutate the original array', () => {
+        setupParseMock({
+          'eip155:1:0xaaa': { address: '0xaaa' },
+          'eip155:1:0xbbb': { address: '0xbbb' },
+        });
+        jest
+          .spyOn(metamaskController, 'sortMultichainAccountsByLastSelected')
+          .mockReturnValue(['0xbbb', '0xaaa']);
+
+        const original = ['eip155:1:0xaaa', 'eip155:1:0xbbb'];
+        metamaskController.sortAccountIdsByLastSelected(original);
+
+        expect(original).toStrictEqual(['eip155:1:0xaaa', 'eip155:1:0xbbb']);
+      });
+    });
+
     describe('NetworkConfiguration is removed', () => {
       it('should remove the permitted chain from all existing permissions', () => {
         jest
@@ -5585,6 +5690,9 @@ describe('MetaMaskController', () => {
         firstTimeFlowType: FirstTimeFlowType.socialImport,
       });
 
+      // Allow async subscription handler to run
+      await new Promise((resolve) => setImmediate(resolve));
+
       expect(
         metamaskController._importAccountsWithBalances,
       ).toHaveBeenCalledTimes(1);
@@ -5688,6 +5796,76 @@ describe('MetaMaskController', () => {
     });
   });
 
+  describe('selectedAccountGroupChange subscription for wallet_sessionChanged', () => {
+    let metamaskController;
+
+    beforeEach(() => {
+      metamaskController = new MetaMaskController({
+        showUserConfirmation: noop,
+        encryptor: mockEncryptor,
+        initState: cloneDeep(firstTimeState),
+        initLangCode: 'en_US',
+        platform: {
+          showTransactionNotification: () => undefined,
+          getVersion: () => 'foo',
+          switchToAnotherURL: jest.fn(),
+        },
+        browser: browserPolyfillMock,
+        infuraProjectId: 'foo',
+        isFirstMetaMaskControllerSetup: true,
+        cronjobControllerStorageManager:
+          createMockCronjobControllerStorageManager(),
+        controllerMessenger: new Messenger({
+          namespace: MOCK_ANY_NAMESPACE,
+        }),
+      });
+    });
+
+    it('notifies wallet_sessionChanged for each authorized origin', () => {
+      jest.useFakeTimers();
+
+      const authA = {
+        requiredScopes: {},
+        optionalScopes: {},
+        sessionProperties: {},
+      };
+      const authB = {
+        requiredScopes: {},
+        optionalScopes: {},
+        sessionProperties: {},
+      };
+
+      jest.mocked(getAuthorizedScopesByOrigin).mockReturnValue(
+        new Map([
+          ['https://a.example', authA],
+          ['https://b.example', authB],
+        ]),
+      );
+      jest
+        .spyOn(metamaskController, '_notifyAuthorizationChange')
+        .mockImplementation(() => undefined);
+
+      metamaskController.controllerMessenger.publish(
+        'AccountTreeController:selectedAccountGroupChange',
+        'group-1',
+      );
+      // TODO: Remove this setTimeout once https://github.com/MetaMask/core/pull/8261 is released
+      jest.advanceTimersByTime(1000);
+
+      expect(
+        metamaskController._notifyAuthorizationChange,
+      ).toHaveBeenCalledWith('https://a.example', authA);
+      expect(
+        metamaskController._notifyAuthorizationChange,
+      ).toHaveBeenCalledWith('https://b.example', authB);
+      expect(
+        metamaskController._notifyAuthorizationChange,
+      ).toHaveBeenCalledTimes(2);
+
+      jest.useRealTimers();
+    });
+  });
+
   describe('selectedAccountGroupChange subscription for Solana', () => {
     let metamaskController;
 
diff --git a/app/scripts/migrations/201.test.ts b/app/scripts/migrations/201.test.ts
new file mode 100644
index 000000000000..619a2d66e971
--- /dev/null
+++ b/app/scripts/migrations/201.test.ts
@@ -0,0 +1,68 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './201';
+
+const VERSION = version;
+const OLD_VERSION = VERSION - 1;
+
+describe(`migration #${VERSION}`, () => {
+  it('moves `SnapsRegistry` state to `SnapRegistryController`', async () => {
+    const oldStorage = {
+      meta: { version: OLD_VERSION },
+      data: {
+        SnapsRegistry: {
+          some: 'data',
+        },
+      },
+    };
+
+    const versionedData = cloneDeep(oldStorage);
+    const changedControllers = new Set<string>();
+
+    await migrate(versionedData, changedControllers);
+
+    expect(versionedData.meta.version).toBe(VERSION);
+    expect(versionedData.data).toStrictEqual({
+      SnapRegistryController: {
+        some: 'data',
+      },
+    });
+
+    expect(changedControllers).toStrictEqual(
+      new Set(['SnapRegistryController', 'SnapsRegistry']),
+    );
+  });
+
+  it('does nothing if `SnapsRegistry` is not present', async () => {
+    const oldStorage = {
+      meta: { version: OLD_VERSION },
+      data: {},
+    };
+
+    const versionedData = cloneDeep(oldStorage);
+    const changedControllers = new Set<string>();
+
+    await migrate(versionedData, changedControllers);
+
+    expect(versionedData.meta.version).toBe(VERSION);
+    expect(versionedData.data).toStrictEqual(oldStorage.data);
+    expect(changedControllers.size).toBe(0);
+  });
+
+  it('does nothing if `SnapsRegistry` is not an object', async () => {
+    const oldStorage = {
+      meta: { version: OLD_VERSION },
+      data: {
+        SnapsRegistry: 'not an object',
+      },
+    };
+
+    const versionedData = cloneDeep(oldStorage);
+    const changedControllers = new Set<string>();
+
+    await migrate(versionedData, changedControllers);
+
+    expect(versionedData.meta.version).toBe(VERSION);
+    expect(versionedData.data).toStrictEqual(oldStorage.data);
+    expect(changedControllers.size).toBe(0);
+  });
+});
diff --git a/app/scripts/migrations/201.ts b/app/scripts/migrations/201.ts
new file mode 100644
index 000000000000..62396e3f9c80
--- /dev/null
+++ b/app/scripts/migrations/201.ts
@@ -0,0 +1,33 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import type { Migrate } from './types';
+
+export const version = 201;
+
+/**
+ * This migration replaces `SnapsRegistry` with `SnapRegistryController`.
+ *
+ * @param versionedData - The versioned data object to migrate.
+ * @param changedControllers - A set used to record controllers that were
+ * modified.
+ */
+export const migrate = (async (versionedData, changedControllers) => {
+  versionedData.meta.version = version;
+  transformState(versionedData.data, changedControllers);
+}) satisfies Migrate;
+
+function transformState(
+  state: Record<string, unknown>,
+  changedControllers: Set<string>,
+): void {
+  if (!hasProperty(state, 'SnapsRegistry') || !isObject(state.SnapsRegistry)) {
+    return;
+  }
+
+  const { SnapsRegistry } = state;
+
+  state.SnapRegistryController = SnapsRegistry;
+  delete state.SnapsRegistry;
+
+  changedControllers.add('SnapRegistryController');
+  changedControllers.add('SnapsRegistry');
+}
diff --git a/app/scripts/migrations/202.test.ts b/app/scripts/migrations/202.test.ts
new file mode 100644
index 000000000000..fa0355c42329
--- /dev/null
+++ b/app/scripts/migrations/202.test.ts
@@ -0,0 +1,54 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './202';
+
+const VERSION = version;
+const OLD_VERSION = VERSION - 1;
+
+describe(`migration #${VERSION}`, () => {
+  it('removes useBlockie from PreferencesController', async () => {
+    const oldStorage = {
+      meta: { version: OLD_VERSION },
+      data: {
+        PreferencesController: {
+          useBlockie: true,
+          currentLocale: 'en',
+        },
+      },
+    };
+
+    const versionedData = cloneDeep(oldStorage);
+    const changedControllers = new Set<string>();
+
+    await migrate(versionedData, changedControllers);
+
+    expect(versionedData.meta.version).toBe(VERSION);
+    expect(versionedData.data).toStrictEqual({
+      PreferencesController: {
+        currentLocale: 'en',
+      },
+    });
+    expect(changedControllers).toStrictEqual(
+      new Set(['PreferencesController']),
+    );
+  });
+
+  it('does nothing when useBlockie is missing', async () => {
+    const oldStorage = {
+      meta: { version: OLD_VERSION },
+      data: {
+        PreferencesController: {
+          currentLocale: 'en',
+        },
+      },
+    };
+
+    const versionedData = cloneDeep(oldStorage);
+    const changedControllers = new Set<string>();
+
+    await migrate(versionedData, changedControllers);
+
+    expect(versionedData.meta.version).toBe(VERSION);
+    expect(versionedData.data).toStrictEqual(oldStorage.data);
+    expect(changedControllers.size).toBe(0);
+  });
+});
diff --git a/app/scripts/migrations/202.ts b/app/scripts/migrations/202.ts
new file mode 100644
index 000000000000..5b8c98bc9e6f
--- /dev/null
+++ b/app/scripts/migrations/202.ts
@@ -0,0 +1,26 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import type { Migrate } from './types';
+
+export const version = 202;
+
+/**
+ * Removes the deprecated `useBlockie` property from PreferencesController.
+ *
+ * @param versionedData - The versioned data object to migrate.
+ * @param changedControllers - A set used to record controllers that were modified.
+ */
+export const migrate = (async (versionedData, changedControllers) => {
+  versionedData.meta.version = version;
+
+  if (
+    !hasProperty(versionedData.data, 'PreferencesController') ||
+    !isObject(versionedData.data.PreferencesController)
+  ) {
+    return;
+  }
+
+  if (hasProperty(versionedData.data.PreferencesController, 'useBlockie')) {
+    delete versionedData.data.PreferencesController.useBlockie;
+    changedControllers.add('PreferencesController');
+  }
+}) satisfies Migrate;
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index e710fa176922..7463c1069726 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -236,6 +236,8 @@ const migrations = [
   require('./198'),
   require('./199'),
   require('./200'),
+  require('./201'),
+  require('./202'),
 ];
 
 export default migrations;
diff --git a/babel.config.js b/babel.config.js
index 525b3b44b77f..4432cafbabc7 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -9,7 +9,7 @@ module.exports = function (api) {
       strictMode: true,
     },
     targets: {
-      browsers: ['chrome >= 89', 'firefox >= 89'],
+      browsers: ['chrome >= 113', 'firefox >= 115'],
     },
     overrides: [
       {
@@ -22,9 +22,12 @@ module.exports = function (api) {
     ],
     plugins: [
       // `browserify` is old and busted, and doesn't support `??=` (and other
-      // logical assignment operators). This plugin lets us target es2020-level
-      // browsers (except we do still end up with transpiled logical assignment
-      // operators 😭)
+      // logical assignment operators) or private class features. Keep these
+      // syntax transforms enabled even when our browser support floor is high
+      // enough to run them natively.
+      '@babel/plugin-transform-class-properties',
+      '@babel/plugin-transform-private-methods',
+      '@babel/plugin-transform-private-property-in-object',
       '@babel/plugin-transform-logical-assignment-operators',
       [
         path.resolve(
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 3e3e44b5aa3d..4c0df3236bd1 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -961,6 +961,8 @@ function setupBundlerDefaults(
             // Charting library (ESM-only)
             './**/node_modules/lightweight-charts',
             './**/node_modules/fancy-canvas',
+            // Web Vitals (ESM — "type": "module" in package.json)
+            './**/node_modules/web-vitals',
             // Perps controller ESM dependencies
             './**/node_modules/valibot',
             './**/node_modules/@nktkas',
diff --git a/development/metamaskbot-build-announce/artifacts.test.ts b/development/metamaskbot-build-announce/artifacts.test.ts
index 211f25b2b65c..903aaf6eb85c 100644
--- a/development/metamaskbot-build-announce/artifacts.test.ts
+++ b/development/metamaskbot-build-announce/artifacts.test.ts
@@ -1,11 +1,4 @@
-import {
-  getArtifactLinks,
-  getBuildLinks,
-  formatBuildLinks,
-  artifactExists,
-  discoverBundleArtifacts,
-  buildArtifactsBody,
-} from './artifacts';
+import { getArtifactLinks, buildArtifactsBody } from './artifacts';
 
 const HOST = 'https://ci.example.com';
 const VERSION = '12.0.0';
@@ -37,138 +30,6 @@ describe('getArtifactLinks', () => {
   });
 });
 
-describe('getBuildLinks', () => {
-  it('returns browserify and webpack build URLs', () => {
-    const builds = getBuildLinks({ hostUrl: HOST, version: VERSION });
-
-    expect(builds.browserify.main.chrome).toContain(
-      `metamask-chrome-${VERSION}.zip`,
-    );
-    expect(builds.browserify.main.firefox).toContain(
-      `metamask-firefox-${VERSION}.zip`,
-    );
-    expect(builds.browserify.flask.chrome).toContain('flask');
-  });
-
-  it('includes all six build variants for each bundler', () => {
-    const builds = getBuildLinks({ hostUrl: HOST, version: VERSION });
-    const expected = [
-      'main',
-      'beta',
-      'experimental',
-      'flask',
-      'test',
-      'test-flask',
-    ];
-
-    expect(Object.keys(builds.browserify)).toStrictEqual(expected);
-    expect(Object.keys(builds.webpack)).toStrictEqual(expected);
-  });
-
-  it('uses correct artifact names for webpack builds', () => {
-    const builds = getBuildLinks({ hostUrl: HOST, version: VERSION });
-
-    expect(builds.webpack.main.chrome).toContain('build-dist-webpack');
-    expect(builds.webpack.main.chrome).toContain(
-      `metamask-chrome-${VERSION}.zip`,
-    );
-    expect(builds.webpack.main.firefox).toContain('build-dist-mv2-webpack');
-    expect(builds.webpack.flask.chrome).toContain('flask');
-  });
-});
-
-describe('formatBuildLinks', () => {
-  it('renders rows for both browserify and webpack builds', () => {
-    const buildLinks = getBuildLinks({ hostUrl: HOST, version: VERSION });
-    const rows = formatBuildLinks(buildLinks);
-
-    // 5 build types (excluding experimental) × 2 bundlers = 10 rows
-    expect(rows).toHaveLength(10);
-    expect(rows[0]).toMatch(
-      /^builds: <a href=".*">chrome<\/a>, <a href=".*">firefox<\/a>$/u,
-    );
-  });
-
-  it('uses "builds" prefix for browserify and "webpack builds" for webpack', () => {
-    const buildLinks = getBuildLinks({ hostUrl: HOST, version: VERSION });
-    const rows = formatBuildLinks(buildLinks);
-
-    expect(rows[0]).toContain('builds:');
-    expect(rows[1]).toContain('builds (beta):');
-    expect(rows[5]).toContain('webpack builds:');
-    expect(rows[6]).toContain('webpack builds (beta):');
-  });
-});
-
-describe('artifactExists', () => {
-  const mockFetch = jest.fn();
-
-  beforeEach(() => {
-    global.fetch = mockFetch;
-  });
-
-  afterEach(() => {
-    mockFetch.mockReset();
-  });
-
-  it('returns true when the HEAD request succeeds', async () => {
-    mockFetch.mockResolvedValue({ ok: true } as Response);
-
-    expect(await artifactExists('https://example.com/file.html')).toBe(true);
-    expect(mockFetch).toHaveBeenCalledWith('https://example.com/file.html', {
-      method: 'HEAD',
-    });
-  });
-
-  it('returns false when the HEAD request fails', async () => {
-    mockFetch.mockResolvedValue({ ok: false } as Response);
-
-    expect(await artifactExists('https://example.com/missing.html')).toBe(
-      false,
-    );
-  });
-});
-
-describe('discoverBundleArtifacts', () => {
-  const mockFetch = jest.fn();
-
-  beforeEach(() => {
-    global.fetch = mockFetch;
-    jest.spyOn(console, 'log').mockImplementation();
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-    mockFetch.mockReset();
-  });
-
-  it('returns a list with links for each found artifact', async () => {
-    // FILE_ROOTS = [background, common, ui, content-script, offscreen]
-    // background-0 found, background-1 not found, then all others not found
-    mockFetch
-      .mockResolvedValueOnce({ ok: true } as Response) // background-0 found
-      .mockResolvedValueOnce({ ok: false } as Response) // background-1 not found → stop
-      .mockResolvedValueOnce({ ok: false } as Response) // common-0 not found
-      .mockResolvedValueOnce({ ok: false } as Response) // ui-0 not found
-      .mockResolvedValueOnce({ ok: false } as Response) // content-script-0 not found
-      .mockResolvedValueOnce({ ok: false } as Response); // offscreen-0 not found
-
-    const result = await discoverBundleArtifacts(HOST);
-
-    expect(result).toContain('<a href=');
-    expect(result).toContain('background');
-  });
-
-  it('returns empty list items when no artifacts are found', async () => {
-    mockFetch.mockResolvedValue({ ok: false } as Response);
-
-    const result = await discoverBundleArtifacts(HOST);
-
-    expect(result).toContain('<ul>');
-    expect(result).not.toContain('<a href=');
-  });
-});
-
 describe('buildArtifactsBody', () => {
   const mockFetch = jest.fn();
 
diff --git a/development/metamaskbot-build-announce/artifacts.ts b/development/metamaskbot-build-announce/artifacts.ts
index dd3d0d60f65a..125fe486f2bd 100644
--- a/development/metamaskbot-build-announce/artifacts.ts
+++ b/development/metamaskbot-build-announce/artifacts.ts
@@ -2,13 +2,18 @@
  * Artifact link construction and PR "Builds ready" section builder.
  */
 
+import {
+  BENCHMARK_PLATFORMS,
+  BENCHMARK_BUILD_TYPES,
+} from '../../shared/constants/benchmarks';
+
 /**
  * Check whether an artifact exists.
  *
  * @param url - The URL of the artifact to check.
  * @returns True if the artifact exists, false if it doesn't.
  */
-export async function artifactExists(url: string): Promise<boolean> {
+async function artifactExists(url: string): Promise<boolean> {
   const response = await fetch(url, { method: 'HEAD' });
   return response.ok;
 }
@@ -54,7 +59,7 @@ export function getArtifactLinks(
       label: 'Bundle Size Stats',
     },
     interactionStats: {
-      url: `${hostUrl}/benchmarks/benchmark-chrome-browserify-interactionUserActions.json`,
+      url: `${hostUrl}/benchmarks/benchmark-${BENCHMARK_PLATFORMS.CHROME}-${BENCHMARK_BUILD_TYPES.BROWSERIFY}-interactionUserActions.json`,
       label: 'Interaction Stats',
     },
     storybook: {
@@ -179,7 +184,7 @@ export function getBuildLinks({
  * @param buildLinks - BuildLinks from getBuildLinks.
  * @returns Array of HTML strings, one per bundler/build type combination.
  */
-export function formatBuildLinks(buildLinks: BuildLinks): string[] {
+function formatBuildLinks(buildLinks: BuildLinks): string[] {
   return Object.entries(buildLinks).flatMap(([bundler, types]) => {
     const prefix = bundler === 'browserify' ? 'builds' : 'webpack builds';
     return (
@@ -213,9 +218,7 @@ const FILE_ROOTS = [
  * @param hostUrl - Base URL for hosted artifacts.
  * @returns HTML `<ul>` string of discovered bundle links.
  */
-export async function discoverBundleArtifacts(
-  hostUrl: string,
-): Promise<string> {
+async function discoverBundleArtifacts(hostUrl: string): Promise<string> {
   const bundles: Record<string, string[]> = {};
 
   for (const fileRoot of FILE_ROOTS) {
diff --git a/development/metamaskbot-build-announce/compare-benchmarks.test.ts b/development/metamaskbot-build-announce/compare-benchmarks.test.ts
index a195bdc6481e..34c197907498 100644
--- a/development/metamaskbot-build-announce/compare-benchmarks.test.ts
+++ b/development/metamaskbot-build-announce/compare-benchmarks.test.ts
@@ -1,14 +1,23 @@
 import { promises as fs } from 'fs';
 import type { BenchmarkResults } from '../../shared/constants/benchmarks';
+import { THRESHOLD_SEVERITY } from '../../shared/constants/benchmarks';
 import {
-  resolveThresholdConfig,
   runComparison,
+  buildMetricLines,
   loadCurrentBenchmarks,
-  loadBaseline,
   printReport,
 } from './compare-benchmarks';
+import { COMPARISON_SEVERITY } from './comparison-utils';
+import type { BenchmarkEntryComparison } from './comparison-utils';
 import * as historicalComparison from './historical-comparison';
 
+jest.mock('fs', () => ({
+  promises: {
+    readdir: jest.fn(),
+    readFile: jest.fn(),
+  },
+}));
+
 function makeBenchmarkResults(
   overrides: Partial<BenchmarkResults> = {},
 ): BenchmarkResults {
@@ -26,26 +35,6 @@ function makeBenchmarkResults(
 }
 
 describe('compare-benchmarks', () => {
-  describe('resolveThresholdConfig', () => {
-    it('resolves camelCase benchmark names', () => {
-      const config = resolveThresholdConfig('onboardingImportWallet');
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('importWalletToSocialScreen');
-    });
-
-    it('resolves startup benchmarks with platform prefix', () => {
-      const config = resolveThresholdConfig(
-        'chrome-browserify-startupStandardHome',
-      );
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('uiStartup');
-    });
-
-    it('returns undefined for unknown benchmarks', () => {
-      expect(resolveThresholdConfig('non-existent-benchmark')).toBeUndefined();
-    });
-  });
-
   describe('runComparison', () => {
     beforeEach(() => {
       jest.spyOn(console, 'warn').mockImplementation();
@@ -108,23 +97,36 @@ describe('compare-benchmarks', () => {
 
       const baseline = {
         'userJourneyOnboardingImport/onboardingImportWallet': {
-          importWalletToSocialScreen: { mean: 1100, p75: 1400, p95: 1900 },
+          importWalletToSocialScreen: {
+            mean: 1100,
+            stdDev: 50,
+            p75: 1400,
+            p95: 1900,
+          },
         },
       };
 
       const result = runComparison(benchmarks, baseline);
       const comparison = result.comparisons[0];
       expect(comparison.relativeMetrics.length).toBeGreaterThan(0);
-      expect(comparison.relativeMetrics[0].percentile).toBe('p75');
-      expect(comparison.relativeMetrics[0].baseline).toBe(1400);
+      const meanMetric = comparison.relativeMetrics.find(
+        (m) => m.percentile === 'mean',
+      );
+      const p75Metric = comparison.relativeMetrics.find(
+        (m) => m.percentile === 'p75',
+      );
+      expect(meanMetric).toBeDefined();
+      expect(meanMetric?.baseline).toBe(1100);
+      expect(p75Metric).toBeDefined();
+      expect(p75Metric?.baseline).toBe(1400);
     });
 
-    it('resolves page-load baseline by stripping benchmark- prefix from filename', () => {
+    it('resolves page-load baseline for startup benchmarks', () => {
       const benchmarks = [
         {
           name: 'benchmark-chrome-browserify-startupStandardHome',
           data: {
-            standardHome: makeBenchmarkResults({
+            startupStandardHome: makeBenchmarkResults({
               p75: { uiStartup: 1800 },
               p95: { uiStartup: 2200 },
               mean: { uiStartup: 1500 },
@@ -134,15 +136,22 @@ describe('compare-benchmarks', () => {
       ];
 
       const baseline = {
-        'pageLoad/chrome-browserify-startupStandardHome': {
-          uiStartup: { mean: 1400, p75: 1700, p95: 2100 },
+        'pageLoad/startupStandardHome': {
+          uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 },
         },
       };
 
       const result = runComparison(benchmarks, baseline);
       const comparison = result.comparisons[0];
       expect(comparison.relativeMetrics.length).toBeGreaterThan(0);
-      expect(comparison.relativeMetrics[0].baseline).toBe(1700);
+      expect(
+        comparison.relativeMetrics.find((m) => m.percentile === 'mean')
+          ?.baseline,
+      ).toBe(1400);
+      expect(
+        comparison.relativeMetrics.find((m) => m.percentile === 'p75')
+          ?.baseline,
+      ).toBe(1700);
     });
 
     it('skips entries with no matching threshold config', () => {
@@ -159,418 +168,405 @@ describe('compare-benchmarks', () => {
       expect(result.comparisons).toHaveLength(0);
     });
   });
+});
 
-  describe('resolveThresholdConfig (additional)', () => {
-    it('resolves camelCase entry name via kebab conversion', () => {
-      const config = resolveThresholdConfig('onboardingImportWallet');
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('importWalletToSocialScreen');
-    });
+describe('loadCurrentBenchmarks', () => {
+  const mockReaddir = fs.readdir as jest.Mock;
+  const mockReadFile = fs.readFile as jest.Mock;
 
-    it('strips firefox-browserify prefix', () => {
-      const config = resolveThresholdConfig(
-        'benchmark-firefox-browserify-swap',
-      );
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('openSwapPageFromHome');
-    });
+  afterEach(() => {
+    mockReaddir.mockReset();
+    mockReadFile.mockReset();
+  });
 
-    it('strips chrome-webpack prefix', () => {
-      const config = resolveThresholdConfig('benchmark-chrome-webpack-swap');
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('openSwapPageFromHome');
-    });
+  it('reads all JSON files in the directory and parses them', async () => {
+    const payload: Record<string, BenchmarkResults> = {
+      standardHome: {
+        testTitle: 'standard-home',
+        persona: 'standard',
+        mean: { uiStartup: 1500 },
+        min: { uiStartup: 1000 },
+        max: { uiStartup: 2000 },
+        stdDev: { uiStartup: 200 },
+        p75: { uiStartup: 1800 },
+        p95: { uiStartup: 2200 },
+      },
+    };
+
+    mockReaddir.mockResolvedValue(['benchmark-chrome.json', 'other.txt']);
+    mockReadFile.mockResolvedValue(JSON.stringify(payload));
+
+    const results = await loadCurrentBenchmarks('/tmp/benchmarks');
+
+    expect(results).toHaveLength(1);
+    expect(results[0].name).toBe('benchmark-chrome');
+    expect(results[0].data).toStrictEqual(payload);
+  });
 
-    it('strips prefix then converts to kebab-case', () => {
-      const config = resolveThresholdConfig(
-        'benchmark-chrome-browserify-onboardingImportWallet',
-      );
-      expect(config).toBeDefined();
-      expect(config).toHaveProperty('importWalletToSocialScreen');
-    });
+  it('returns an empty array when no JSON files are present', async () => {
+    mockReaddir.mockResolvedValue(['README.md', 'data.txt']);
+
+    const results = await loadCurrentBenchmarks('/tmp/benchmarks');
+    expect(results).toHaveLength(0);
   });
+});
+
+const makeComparison = (
+  overrides: Partial<BenchmarkEntryComparison> = {},
+): BenchmarkEntryComparison => ({
+  benchmarkName: 'standardHome',
+  relativeMetrics: [],
+  absoluteViolations: [],
+  hasRegression: false,
+  hasWarning: false,
+  absoluteFailed: false,
+  ...overrides,
+});
 
-  describe('loadCurrentBenchmarks', () => {
-    it('loads JSON files from a directory', async () => {
-      jest
-        .spyOn(fs, 'readdir')
-        .mockResolvedValue([
-          'bench-a.json',
-          'bench-b.json',
-          'readme.txt',
-        ] as never);
-      jest
-        .spyOn(fs, 'readFile')
-        .mockResolvedValue(JSON.stringify({ entry: makeBenchmarkResults() }));
-
-      const results = await loadCurrentBenchmarks('/fake/dir');
-
-      expect(results).toHaveLength(2);
-      expect(results[0].name).toBe('bench-a');
-      expect(results[1].name).toBe('bench-b');
+describe('printReport', () => {
+  let consoleSpy: jest.SpyInstance;
 
-      jest.restoreAllMocks();
-    });
+  beforeEach(() => {
+    consoleSpy = jest.spyOn(console, 'log').mockImplementation();
   });
 
-  describe('loadBaseline', () => {
-    it('returns empty object when fetch returns null', async () => {
-      jest
-        .spyOn(historicalComparison, 'fetchHistoricalPerformanceData')
-        .mockResolvedValue(null);
+  afterEach(() => {
+    consoleSpy.mockRestore();
+  });
 
-      const result = await loadBaseline();
+  it('prints PASS result when no comparison failed', () => {
+    printReport({ comparisons: [], anyFailed: false });
 
-      expect(result).toStrictEqual({});
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('PASS — all benchmarks within constant limits'),
+    );
+  });
 
-      jest.restoreAllMocks();
+  it('prints FAIL result when anyFailed is true', () => {
+    printReport({
+      comparisons: [
+        makeComparison({
+          benchmarkName: 'standardHome',
+          absoluteFailed: true,
+        }),
+      ],
+      anyFailed: true,
     });
 
-    it('returns baseline data when fetch succeeds', async () => {
-      const mockBaseline = {
-        'test/metric': { uiStartup: { mean: 100, p75: 110, p95: 130 } },
-      };
-      jest
-        .spyOn(historicalComparison, 'fetchHistoricalPerformanceData')
-        .mockResolvedValue(mockBaseline);
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('FAIL — at least one benchmark'),
+    );
+    expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('FAIL'));
+  });
 
-      const result = await loadBaseline();
+  it('prints the benchmark name and PASS status for a passing comparison', () => {
+    printReport({
+      comparisons: [
+        makeComparison({
+          benchmarkName: 'loadNewAccount',
+          absoluteFailed: false,
+        }),
+      ],
+      anyFailed: false,
+    });
 
-      expect(result).toBe(mockBaseline);
+    const allCalls = consoleSpy.mock.calls.flat().join('\n');
+    expect(allCalls).toContain('loadNewAccount');
+    expect(allCalls).toContain('PASS');
+  });
 
-      jest.restoreAllMocks();
+  it('prints the benchmark name and FAIL status for a failing comparison', () => {
+    printReport({
+      comparisons: [
+        makeComparison({
+          benchmarkName: 'loadNewAccount',
+          absoluteFailed: true,
+        }),
+      ],
+      anyFailed: true,
     });
-  });
 
-  describe('printReport', () => {
-    let logSpy: jest.SpyInstance;
+    const allCalls = consoleSpy.mock.calls.flat().join('\n');
+    expect(allCalls).toContain('loadNewAccount');
+    expect(allCalls).toContain('FAIL');
+  });
 
-    beforeEach(() => {
-      logSpy = jest.spyOn(console, 'log').mockImplementation();
+  it('prints (no historical baseline data) when comparison has no metric lines', () => {
+    printReport({
+      comparisons: [
+        makeComparison({ relativeMetrics: [], absoluteViolations: [] }),
+      ],
+      anyFailed: false,
     });
 
-    afterEach(() => {
-      jest.restoreAllMocks();
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('no historical baseline data'),
+    );
+  });
+
+  it('prints pass icon with [Show logs] when all metrics pass', () => {
+    const { COMPARISON_SEVERITY: SEV } = jest.requireActual(
+      './comparison-utils',
+    ) as typeof import('./comparison-utils');
+    printReport({
+      comparisons: [
+        makeComparison({
+          relativeMetrics: [
+            {
+              metric: 'uiStartup',
+              percentile: 'p95',
+              current: 1400,
+              baseline: 1400,
+              delta: 0,
+              deltaPercent: 0,
+              severity: SEV.Pass.value,
+              indication: SEV.Pass.icon,
+            },
+          ],
+        }),
+      ],
+      anyFailed: false,
     });
 
-    it('prints PASS when no benchmarks failed', () => {
-      printReport({ comparisons: [], anyFailed: false });
+    const allCalls = consoleSpy.mock.calls.flat().join('\n');
+    expect(allCalls).toContain('[Show logs]');
+  });
 
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('RESULT: PASS');
+  it('prints issue metric lines for comparisons with violations', () => {
+    const { COMPARISON_SEVERITY: SEV } = jest.requireActual(
+      './comparison-utils',
+    ) as typeof import('./comparison-utils');
+    const { THRESHOLD_SEVERITY: TS } = jest.requireActual(
+      '../../shared/constants/benchmarks',
+    ) as typeof import('../../shared/constants/benchmarks');
+    printReport({
+      comparisons: [
+        makeComparison({
+          benchmarkName: 'standardHome',
+          absoluteFailed: true,
+          absoluteViolations: [
+            {
+              metricId: 'uiStartup',
+              percentile: 'p95',
+              value: 6000,
+              threshold: 4800,
+              severity: TS.Fail,
+            },
+          ],
+        }),
+      ],
+      anyFailed: true,
     });
 
-    it('prints FAIL when a benchmark failed', () => {
-      printReport({
-        comparisons: [
-          {
-            benchmarkName: 'test-bench',
-            relativeMetrics: [],
-            absoluteViolations: [],
-            hasRegression: false,
-            hasWarning: false,
-            absoluteFailed: true,
-          },
-        ],
-        anyFailed: true,
-      });
+    const allCalls = consoleSpy.mock.calls.flat().join('\n');
+    expect(allCalls).toContain('uiStartup');
+    expect(allCalls).toContain(SEV.Regression.icon);
+  });
 
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('FAIL  test-bench');
-      expect(output).toContain('RESULT: FAIL');
+  it('reports correct total counts for failed and warned comparisons', () => {
+    const { THRESHOLD_SEVERITY: TS } = jest.requireActual(
+      '../../shared/constants/benchmarks',
+    ) as typeof import('../../shared/constants/benchmarks');
+    printReport({
+      comparisons: [
+        makeComparison({ benchmarkName: 'A', absoluteFailed: true }),
+        makeComparison({
+          benchmarkName: 'B',
+          absoluteFailed: false,
+          absoluteViolations: [
+            {
+              metricId: 'uiStartup',
+              percentile: 'p75',
+              value: 2100,
+              threshold: 2000,
+              severity: TS.Warn,
+            },
+          ],
+        }),
+        makeComparison({ benchmarkName: 'C', absoluteFailed: false }),
+      ],
+      anyFailed: true,
     });
 
-    it('shows (no historical baseline data) when no relative metrics', () => {
-      printReport({
-        comparisons: [
+    const allCalls = consoleSpy.mock.calls.flat().join('\n');
+    expect(allCalls).toContain('3 benchmarks');
+    expect(allCalls).toContain('1 failed');
+    expect(allCalls).toContain('1 warnings');
+  });
+});
+
+describe('buildMetricLines', () => {
+  it('returns empty array when comparison has no metrics or violations', () => {
+    expect(buildMetricLines(makeComparison())).toHaveLength(0);
+  });
+
+  it('formats a metric with baseline using relative delta and warn icon when has issue', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [
           {
-            benchmarkName: 'test-bench',
-            relativeMetrics: [],
-            absoluteViolations: [],
-            hasRegression: false,
-            hasWarning: false,
-            absoluteFailed: false,
+            metric: 'uiStartup',
+            percentile: 'p95',
+            current: 1500,
+            baseline: 1400,
+            delta: 100,
+            deltaPercent: 0.071,
+            severity: COMPARISON_SEVERITY.Warn.value,
+            indication: COMPARISON_SEVERITY.Warn.icon,
           },
         ],
-        anyFailed: false,
-      });
-
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('(no historical baseline data)');
-    });
+      }),
+    );
+
+    expect(lines).toHaveLength(1);
+    expect(lines[0].metric).toBe('uiStartup');
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Warn.icon);
+    expect(lines[0].hasIssue).toBe(true);
+    expect(lines[0].details).toContain('1500ms');
+    expect(lines[0].details).toContain('p95');
+  });
 
-    it('groups p75 and p95 on same line with indications', () => {
-      printReport({
-        comparisons: [
+  it('overrides icon with 🔴 when absolute Fail violation matches the metric', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [
           {
-            benchmarkName: 'test-bench',
-            relativeMetrics: [
-              {
-                metric: 'uiStartup',
-                percentile: 'p75',
-                current: 1100,
-                baseline: 1000,
-                delta: 100,
-                deltaPercent: 0.1,
-                direction: 'slower',
-                severity: 'regression',
-                indication: '🔺',
-              },
-              {
-                metric: 'uiStartup',
-                percentile: 'p95',
-                current: 1300,
-                baseline: 1200,
-                delta: 100,
-                deltaPercent: 0.083,
-                direction: 'slower',
-                severity: 'warn',
-                indication: '🟡⬆️',
-              },
-            ],
-            absoluteViolations: [],
-            hasRegression: true,
-            hasWarning: true,
-            absoluteFailed: false,
+            metric: 'uiStartup',
+            percentile: 'p95',
+            current: 6000,
+            baseline: 1400,
+            delta: 4600,
+            deltaPercent: 3.28,
+            severity: COMPARISON_SEVERITY.Regression.value,
+            indication: COMPARISON_SEVERITY.Regression.icon,
           },
         ],
-        anyFailed: false,
-      });
-
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('uiStartup:');
-      expect(output).toContain('🟡⬆️ p75: 1100ms');
-      expect(output).toContain('🟡⬆️ p95: 1300ms');
-    });
-
-    it('uses 🔻 for absolute fail violations when metric is faster', () => {
-      printReport({
-        comparisons: [
+        absoluteViolations: [
           {
-            benchmarkName: 'faster-but-failing',
-            relativeMetrics: [
-              {
-                metric: 'uiStartup',
-                percentile: 'p75',
-                current: 7200,
-                baseline: 11164,
-                delta: -3964,
-                deltaPercent: -0.355,
-                direction: 'faster',
-                severity: 'improvement',
-                indication: '🟢⬇️',
-              },
-            ],
-            absoluteViolations: [
-              {
-                metricId: 'uiStartup',
-                percentile: 'p75',
-                value: 7200,
-                threshold: 4500,
-                severity: 'fail',
-              },
-            ],
-            hasRegression: false,
-            hasWarning: false,
-            absoluteFailed: true,
+            metricId: 'uiStartup',
+            percentile: 'p95',
+            value: 6000,
+            threshold: 4800,
+            severity: THRESHOLD_SEVERITY.Fail,
           },
         ],
-        anyFailed: true,
-      });
+      }),
+    );
 
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('🔻 p75: 7200ms (-35.5%)');
-    });
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Regression.icon);
+    expect(lines[0].hasIssue).toBe(true);
+  });
 
-    it('overrides indication with 🔺 for absolute fail violations', () => {
-      printReport({
-        comparisons: [
+  it('overrides icon with 🟡 when absolute Warn violation matches the metric', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [
           {
-            benchmarkName: 'test-bench',
-            relativeMetrics: [
-              {
-                metric: 'uiStartup',
-                percentile: 'p75',
-                current: 99999,
-                baseline: 1000,
-                delta: 98999,
-                deltaPercent: 98.999,
-                direction: 'slower',
-                severity: 'regression',
-                indication: '🔺',
-              },
-              {
-                metric: 'uiStartup',
-                percentile: 'p95',
-                current: 99999,
-                baseline: 1200,
-                delta: 98799,
-                deltaPercent: 82.33,
-                direction: 'slower',
-                severity: 'regression',
-                indication: '🔺',
-              },
-            ],
-            absoluteViolations: [
-              {
-                metricId: 'uiStartup',
-                percentile: 'p75',
-                value: 99999,
-                threshold: 5000,
-                severity: 'fail',
-              },
-            ],
-            hasRegression: true,
-            hasWarning: false,
-            absoluteFailed: true,
+            metric: 'uiStartup',
+            percentile: 'p75',
+            current: 3200,
+            baseline: 1400,
+            delta: 1800,
+            deltaPercent: 1.28,
+            severity: COMPARISON_SEVERITY.Regression.value,
+            indication: COMPARISON_SEVERITY.Regression.icon,
           },
         ],
-        anyFailed: true,
-      });
-
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('🔺 p75: 99999ms');
-    });
-
-    it('shows absolute violations when no baseline data is available', () => {
-      printReport({
-        comparisons: [
+        absoluteViolations: [
           {
-            benchmarkName: 'no-baseline-bench',
-            relativeMetrics: [],
-            absoluteViolations: [
-              {
-                metricId: 'uiStartup',
-                percentile: 'p75',
-                value: 9000,
-                threshold: 5000,
-                severity: 'fail',
-              },
-              {
-                metricId: 'uiStartup',
-                percentile: 'p95',
-                value: 6000,
-                threshold: 5500,
-                severity: 'warn',
-              },
-            ],
-            hasRegression: false,
-            hasWarning: true,
-            absoluteFailed: true,
+            metricId: 'uiStartup',
+            percentile: 'p75',
+            value: 3200,
+            threshold: 3000,
+            severity: THRESHOLD_SEVERITY.Warn,
           },
         ],
-        anyFailed: true,
-      });
+      }),
+    );
 
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('FAIL  no-baseline-bench');
-      expect(output).toContain(
-        'uiStartup: 🔺 p75: 9000ms (no baseline) | 🟡⬆️ p95: 6000ms (no baseline)',
-      );
-      expect(output).not.toContain('(no historical baseline data)');
-    });
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Warn.icon);
+    expect(lines[0].hasIssue).toBe(true);
+  });
 
-    it('shows violations for metrics missing from baseline when other metrics have baseline', () => {
-      printReport({
-        comparisons: [
+  it('shows violation value with (no baseline) when no relative metric exists for the key', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        absoluteViolations: [
           {
-            benchmarkName: 'partial-baseline',
-            relativeMetrics: [
-              {
-                metric: 'metricA',
-                percentile: 'p75',
-                current: 1100,
-                baseline: 1000,
-                delta: 100,
-                deltaPercent: 0.1,
-                direction: 'slower',
-                severity: 'regression',
-                indication: '🔺',
-              },
-            ],
-            absoluteViolations: [
-              {
-                metricId: 'metricB',
-                percentile: 'p75',
-                value: 9000,
-                threshold: 5000,
-                severity: 'fail',
-              },
-            ],
-            hasRegression: true,
-            hasWarning: false,
-            absoluteFailed: true,
+            metricId: 'uiStartup',
+            percentile: 'p95',
+            value: 6000,
+            threshold: 4800,
+            severity: THRESHOLD_SEVERITY.Fail,
           },
         ],
-        anyFailed: true,
-      });
+      }),
+    );
+
+    expect(lines).toHaveLength(1);
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Regression.icon);
+    expect(lines[0].hasIssue).toBe(true);
+    expect(lines[0].details).toContain('no baseline');
+    expect(lines[0].details).toContain('6000ms');
+  });
 
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('metricA:');
-      expect(output).toContain('metricB: 🔺 p75: 9000ms (no baseline)');
-    });
+  it('shows 🟢 with (no baseline) for a violation-free metric absent from relative metrics', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [],
+        absoluteViolations: [],
+      }),
+    );
+    expect(lines).toHaveLength(0);
+  });
 
-    it('groups p75 and p95 violations on one line for metrics without baseline', () => {
-      printReport({
-        comparisons: [
+  it('shows only icon when metric passes (no timing details)', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [
           {
-            benchmarkName: 'no-baseline-grouped',
-            relativeMetrics: [],
-            absoluteViolations: [
-              {
-                metricId: 'load',
-                percentile: 'p75',
-                value: 8000,
-                threshold: 5000,
-                severity: 'fail',
-              },
-              {
-                metricId: 'load',
-                percentile: 'p95',
-                value: 12000,
-                threshold: 8000,
-                severity: 'fail',
-              },
-            ],
-            hasRegression: false,
-            hasWarning: false,
-            absoluteFailed: true,
+            metric: 'uiStartup',
+            percentile: 'p95',
+            current: 1450,
+            baseline: 1400,
+            delta: 50,
+            deltaPercent: 0.036, // +3.6% → pass
+            severity: COMPARISON_SEVERITY.Pass.value,
+            indication: COMPARISON_SEVERITY.Pass.icon,
           },
         ],
-        anyFailed: true,
-      });
-
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain(
-        'load: 🔺 p75: 8000ms (no baseline) | 🔺 p95: 12000ms (no baseline)',
-      );
-    });
+        absoluteViolations: [],
+      }),
+    );
+
+    expect(lines).toHaveLength(1);
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Pass.icon);
+    expect(lines[0].hasIssue).toBe(false);
+    expect(lines[0].details).toBeUndefined();
+  });
 
-    it('counts warnings for benchmarks with warn-level violations', () => {
-      printReport({
-        comparisons: [
+  it('shows 🟡 when relative regression exists but no absolute violation', () => {
+    const lines = buildMetricLines(
+      makeComparison({
+        relativeMetrics: [
           {
-            benchmarkName: 'warn-bench',
-            relativeMetrics: [],
-            absoluteViolations: [
-              {
-                metricId: 'uiStartup',
-                percentile: 'p75',
-                value: 5000,
-                threshold: 4500,
-                severity: 'warn',
-              },
-            ],
-            hasRegression: false,
-            hasWarning: true,
-            absoluteFailed: false,
+            metric: 'uiStartup',
+            percentile: 'p95',
+            current: 1560,
+            baseline: 1400,
+            delta: 160,
+            deltaPercent: 0.114, // +11.4% → regression
+            severity: COMPARISON_SEVERITY.Regression.value,
+            indication: COMPARISON_SEVERITY.Regression.icon,
           },
         ],
-        anyFailed: false,
-      });
-
-      const output = logSpy.mock.calls.map((c: unknown[]) => c[0]).join('\n');
-      expect(output).toContain('1 warnings');
-    });
+        absoluteViolations: [],
+      }),
+    );
+
+    expect(lines).toHaveLength(1);
+    expect(lines[0].icon).toBe(COMPARISON_SEVERITY.Warn.icon);
+    expect(lines[0].hasIssue).toBe(true);
+    expect(lines[0].details).toContain('1560ms');
   });
 });
diff --git a/development/metamaskbot-build-announce/compare-benchmarks.ts b/development/metamaskbot-build-announce/compare-benchmarks.ts
index 639ced730fd0..beb0ea52d5cb 100644
--- a/development/metamaskbot-build-announce/compare-benchmarks.ts
+++ b/development/metamaskbot-build-announce/compare-benchmarks.ts
@@ -19,26 +19,23 @@
 import { promises as fs } from 'fs';
 import path from 'path';
 import { parseArgs } from 'util';
-import {
-  ThresholdSeverity,
-  PercentileKey,
-} from '../../shared/constants/benchmarks';
+
+import { THRESHOLD_SEVERITY } from '../../shared/constants/benchmarks';
 import type {
+  ThresholdSeverity,
+  ComparisonKey,
   BenchmarkResults,
-  ThresholdConfig,
 } from '../../shared/constants/benchmarks';
-import { toKebabCase } from '../../shared/lib/string-utils';
 import { THRESHOLD_REGISTRY } from '../../test/e2e/benchmarks/utils/constants';
+import { fetchHistoricalPerformanceDataFromMain } from './historical-comparison';
+import type { HistoricalBaselineReference } from './historical-comparison';
 import {
   compareBenchmarkEntries,
   formatDeltaPercent,
-  getTrafficLightIndication,
-  ComparisonSeverity,
-  ComparisonDirection,
+  COMPARISON_SEVERITY,
   type BenchmarkEntryComparison,
 } from './comparison-utils';
-import type { HistoricalBaselineReference } from './historical-comparison';
-import { fetchHistoricalPerformanceData } from './historical-comparison';
+import { resolveBaselineFromArtifactName } from './utils';
 
 type LoadedBenchmark = {
   name: string;
@@ -66,81 +63,12 @@ export async function loadCurrentBenchmarks(
   return results;
 }
 
-/**
- * Resolves the ThresholdConfig for a benchmark.
- * Tries direct match, then strips common prefixes (and converts to kebab-case),
- * then converts original name to kebab-case.
- *
- * @param benchmarkName - Benchmark name (from JSON filename).
- */
-export function resolveThresholdConfig(
-  benchmarkName: string,
-): ThresholdConfig | undefined {
-  if (THRESHOLD_REGISTRY[benchmarkName]) {
-    return THRESHOLD_REGISTRY[benchmarkName];
-  }
-
-  const prefixPattern = /^benchmark-[a-z]+-[a-z]+-/u;
-  const stripped = benchmarkName.replace(prefixPattern, '');
-  if (stripped !== benchmarkName) {
-    if (THRESHOLD_REGISTRY[stripped]) {
-      return THRESHOLD_REGISTRY[stripped];
-    }
-    const strippedKebab = toKebabCase(stripped);
-    if (strippedKebab && THRESHOLD_REGISTRY[strippedKebab]) {
-      return THRESHOLD_REGISTRY[strippedKebab];
-    }
-  }
-
-  // Convert original name to kebab-case
-  const kebab = toKebabCase(benchmarkName);
-  if (kebab && THRESHOLD_REGISTRY[kebab]) {
-    return THRESHOLD_REGISTRY[kebab];
-  }
-
-  return undefined;
-}
-
 /**
  * Loads the historical baseline.
  */
-export async function loadBaseline(): Promise<HistoricalBaselineReference> {
-  const result = await fetchHistoricalPerformanceData();
-  return result ?? {};
-}
-
-/**
- * Resolves baseline metrics for a benchmark entry.
- * Historical keys use "preset/entryName" format (e.g.
- * "userJourneyOnboardingImport/onboardingImportWallet"),
- * so we try direct match first, then suffix match.
- *
- * @param baseline - Historical baseline reference.
- * @param entryName - Benchmark entry name from JSON.
- * @param fileName - Benchmark file name (without extension).
- */
-function resolveBaseline(
-  baseline: HistoricalBaselineReference,
-  entryName: string,
-  fileName: string,
-): HistoricalBaselineReference[string] | undefined {
-  const strippedFileName = fileName.replace(/^benchmark-/u, '');
-
-  const candidates = [entryName, strippedFileName, fileName];
-
-  for (const candidate of candidates) {
-    if (baseline[candidate]) {
-      return baseline[candidate];
-    }
-    const suffixMatch = Object.keys(baseline).find((key) =>
-      key.endsWith(`/${candidate}`),
-    );
-    if (suffixMatch) {
-      return baseline[suffixMatch];
-    }
-  }
-
-  return undefined;
+async function loadBaseline(): Promise<HistoricalBaselineReference> {
+  const result = await fetchHistoricalPerformanceDataFromMain();
+  return result?.baseline ?? {};
 }
 
 /**
@@ -158,17 +86,20 @@ export function runComparison(
 
   for (const { name, data } of benchmarks) {
     for (const [entryName, results] of Object.entries(data)) {
-      const thresholdConfig =
-        resolveThresholdConfig(entryName) ?? resolveThresholdConfig(name);
+      const thresholdConfig = THRESHOLD_REGISTRY[entryName];
 
       if (!thresholdConfig) {
         console.warn(
-          `No threshold config for "${entryName}" (file: ${name}). Skipping.`,
+          `No threshold config for benchmark "${entryName}" in file "${name}". Add an entry to THRESHOLD_REGISTRY in constants.ts.`,
         );
         continue;
       }
 
-      const baselineMetrics = resolveBaseline(baseline, entryName, name);
+      const baselineMetrics = resolveBaselineFromArtifactName(
+        baseline,
+        entryName,
+        name,
+      );
 
       const comparison = compareBenchmarkEntries(
         entryName,
@@ -189,23 +120,26 @@ export function runComparison(
 }
 
 function violationIcon(severity: ThresholdSeverity): string {
-  const mapped =
-    severity === ThresholdSeverity.Fail
-      ? ComparisonSeverity.Regression
-      : ComparisonSeverity.Warn;
-  return getTrafficLightIndication(mapped, ComparisonDirection.Slower);
+  return severity === THRESHOLD_SEVERITY.Fail
+    ? COMPARISON_SEVERITY.Regression.icon
+    : COMPARISON_SEVERITY.Warn.icon;
 }
 
-type MetricLine = { metric: string; parts: string[] };
+export type MetricLine = {
+  metric: string;
+  icon: string;
+  hasIssue: boolean;
+  details?: string;
+};
 
 /**
  * Builds display lines for a single benchmark comparison.
- * Metrics with baseline show relative deltas; metrics without show "(no baseline)".
- * Absolute violations override the indication icon with the appropriate indicator.
  *
  * @param comparison - A single benchmark entry comparison result.
  */
-function buildMetricLines(comparison: BenchmarkEntryComparison): MetricLine[] {
+export function buildMetricLines(
+  comparison: BenchmarkEntryComparison,
+): MetricLine[] {
   const violationsByKey = new Map(
     comparison.absoluteViolations.map((v) => [
       `${v.metricId}:${v.percentile}`,
@@ -217,7 +151,7 @@ function buildMetricLines(comparison: BenchmarkEntryComparison): MetricLine[] {
     comparison.relativeMetrics.map((m) => [`${m.metric}:${m.percentile}`, m]),
   );
 
-  const allMetrics = new Map<string, PercentileKey[]>();
+  const allMetrics = new Map<string, ComparisonKey[]>();
   for (const m of comparison.relativeMetrics) {
     const list = allMetrics.get(m.metric) ?? [];
     list.push(m.percentile);
@@ -231,47 +165,90 @@ function buildMetricLines(comparison: BenchmarkEntryComparison): MetricLine[] {
     allMetrics.set(v.metricId, list);
   }
 
+  // Helper function to update displayIcon to track worst severity
+  const updateDisplayIcon = (
+    icon: string,
+    currentDisplayIcon: string,
+  ): string => {
+    switch (icon) {
+      case COMPARISON_SEVERITY.Regression.icon:
+        return COMPARISON_SEVERITY.Regression.icon;
+      case COMPARISON_SEVERITY.Warn.icon:
+        return currentDisplayIcon === COMPARISON_SEVERITY.Pass.icon
+          ? COMPARISON_SEVERITY.Warn.icon
+          : currentDisplayIcon;
+      default:
+        return currentDisplayIcon;
+    }
+  };
+
   return [...allMetrics.entries()].map(([metric, percentiles]) => {
-    const parts = percentiles.map((pKey) => {
+    let displayIcon: string = COMPARISON_SEVERITY.Pass.icon;
+    let hasIssue = false;
+    const details: string[] = [];
+
+    for (const pKey of percentiles) {
       const key = `${metric}:${pKey}`;
       const rel = relativeByKey.get(key);
+      const absoluteSeverity = violationsByKey.get(key);
+
+      let icon: string;
+      let isIssue = false;
+
       if (rel) {
-        const delta = formatDeltaPercent(rel.deltaPercent, rel.direction);
-        const absoluteSeverity = violationsByKey.get(key);
-        let icon: string;
-        if (absoluteSeverity === ThresholdSeverity.Fail) {
-          icon = getTrafficLightIndication(
-            ComparisonSeverity.Regression,
-            rel.direction,
-          );
-        } else if (absoluteSeverity === ThresholdSeverity.Warn) {
-          icon = getTrafficLightIndication(
-            ComparisonSeverity.Warn,
-            rel.direction,
-          );
-        } else if (rel.severity === ComparisonSeverity.Regression) {
-          icon = getTrafficLightIndication(
-            ComparisonSeverity.Warn,
-            rel.direction,
-          );
+        if (absoluteSeverity) {
+          switch (absoluteSeverity) {
+            case THRESHOLD_SEVERITY.Fail:
+              icon = COMPARISON_SEVERITY.Regression.icon;
+              isIssue = true;
+              break;
+            case THRESHOLD_SEVERITY.Warn:
+              icon = COMPARISON_SEVERITY.Warn.icon;
+              isIssue = true;
+              break;
+            default:
+              icon = rel.indication;
+          }
         } else {
-          icon = rel.indication;
+          switch (rel.severity) {
+            case COMPARISON_SEVERITY.Regression.value:
+            case COMPARISON_SEVERITY.Warn.value:
+              icon = COMPARISON_SEVERITY.Warn.icon;
+              isIssue = true;
+              break;
+            default:
+              icon = rel.indication;
+          }
         }
-        return `${icon} ${pKey}: ${rel.current.toFixed(0)}ms (${delta})`;
-      }
-      const violation = comparison.absoluteViolations.find(
-        (v) => v.metricId === metric && v.percentile === pKey,
-      );
-      const icon = violation
-        ? violationIcon(violation.severity)
-        : getTrafficLightIndication(
-            ComparisonSeverity.Neutral,
-            ComparisonDirection.Same,
+
+        if (isIssue) {
+          const delta = formatDeltaPercent(rel.deltaPercent);
+          details.push(`${pKey}: ${rel.current.toFixed(0)}ms (${delta})`);
+          hasIssue = true;
+          displayIcon = updateDisplayIcon(icon, displayIcon);
+        }
+      } else {
+        const violation = comparison.absoluteViolations.find(
+          (v) => v.metricId === metric && v.percentile === pKey,
+        );
+        if (violation) {
+          icon = violationIcon(violation.severity);
+          isIssue = true;
+          details.push(
+            `${pKey}: ${violation.value.toFixed(0)}ms (no baseline)`,
           );
-      const value = violation?.value ?? 0;
-      return `${icon} ${pKey}: ${value.toFixed(0)}ms (no baseline)`;
-    });
-    return { metric, parts };
+          hasIssue = true;
+          displayIcon = updateDisplayIcon(icon, displayIcon);
+        }
+      }
+    }
+
+    return {
+      metric,
+      icon: displayIcon,
+      hasIssue,
+      details: hasIssue ? details.join(' | ') : undefined,
+    };
   });
 }
 
@@ -298,9 +275,16 @@ export function printReport(result: {
 
     if (lines.length === 0) {
       console.log('    (no historical baseline data)');
-    }
-    for (const { metric, parts } of lines) {
-      console.log(`    ${metric}: ${parts.join(' | ')}`);
+    } else {
+      const issueLines = lines.filter((line) => line.hasIssue);
+      if (issueLines.length === 0) {
+        console.log(`${COMPARISON_SEVERITY.Pass.icon} [Show logs]`);
+      } else {
+        for (const line of issueLines) {
+          const details = line.details ? ` | ${line.details}` : '';
+          console.log(`${line.icon} ${line.metric}${details}`);
+        }
+      }
     }
   }
 
@@ -308,7 +292,7 @@ export function printReport(result: {
   const warnCount = result.comparisons.filter(
     (c) =>
       !c.absoluteFailed &&
-      c.absoluteViolations.some((v) => v.severity === ThresholdSeverity.Warn),
+      c.absoluteViolations.some((v) => v.severity === THRESHOLD_SEVERITY.Warn),
   ).length;
 
   console.log('\n───────────────────────────────────────');
diff --git a/development/metamaskbot-build-announce/comparison-utils.test.ts b/development/metamaskbot-build-announce/comparison-utils.test.ts
index a2e356cc667e..fdc3bd8e640b 100644
--- a/development/metamaskbot-build-announce/comparison-utils.test.ts
+++ b/development/metamaskbot-build-announce/comparison-utils.test.ts
@@ -3,14 +3,16 @@ import type {
   ThresholdConfig,
 } from '../../shared/constants/benchmarks';
 import { DEFAULT_RELATIVE_THRESHOLDS } from '../../shared/constants/benchmarks';
+import {
+  BENCHMARK_PERSONA,
+  THRESHOLD_REGISTRY,
+} from '../../test/e2e/benchmarks/utils/constants';
 
 import {
   compareMetric,
   compareBenchmarkEntries,
-  getTrafficLightIndication,
   formatDeltaPercent,
-  ComparisonSeverity,
-  ComparisonDirection,
+  COMPARISON_SEVERITY,
 } from './comparison-utils';
 
 describe('benchmark-comparison', () => {
@@ -23,14 +25,13 @@ describe('benchmark-comparison', () => {
         1000,
         DEFAULT_RELATIVE_THRESHOLDS,
       );
-      expect(result.severity).toBe(ComparisonSeverity.Regression);
-      expect(result.direction).toBe(ComparisonDirection.Slower);
-      expect(result.indication).toBe('🔺');
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Regression.value);
+      expect(result.indication).toBe(COMPARISON_SEVERITY.Regression.icon);
       expect(result.deltaPercent).toBeCloseTo(0.1);
       expect(result.percentile).toBe('p75');
     });
 
-    it('classifies a >10% improvement', () => {
+    it('classifies a >10% improvement as pass', () => {
       const result = compareMetric(
         'uiStartup',
         'p75',
@@ -38,9 +39,8 @@ describe('benchmark-comparison', () => {
         1000,
         DEFAULT_RELATIVE_THRESHOLDS,
       );
-      expect(result.severity).toBe(ComparisonSeverity.Improvement);
-      expect(result.direction).toBe(ComparisonDirection.Faster);
-      expect(result.indication).toBe('🟢⬇️');
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Pass.value);
+      expect(result.indication).toBe(COMPARISON_SEVERITY.Pass.icon);
     });
 
     it('classifies 5-10% as warn', () => {
@@ -51,13 +51,12 @@ describe('benchmark-comparison', () => {
         1000,
         DEFAULT_RELATIVE_THRESHOLDS,
       );
-      expect(result.severity).toBe(ComparisonSeverity.Warn);
-      expect(result.direction).toBe(ComparisonDirection.Slower);
-      expect(result.indication).toBe('🟡⬆️');
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Warn.value);
+      expect(result.indication).toBe(COMPARISON_SEVERITY.Warn.icon);
       expect(result.percentile).toBe('p95');
     });
 
-    it('classifies <5% as neutral', () => {
+    it('classifies <5% change as pass', () => {
       const result = compareMetric(
         'uiStartup',
         'p75',
@@ -65,8 +64,20 @@ describe('benchmark-comparison', () => {
         1000,
         DEFAULT_RELATIVE_THRESHOLDS,
       );
-      expect(result.severity).toBe(ComparisonSeverity.Neutral);
-      expect(result.indication).toBe('➡️');
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Pass.value);
+      expect(result.indication).toBe(COMPARISON_SEVERITY.Pass.icon);
+    });
+
+    it('classifies a 5-10% improvement as pass', () => {
+      const result = compareMetric(
+        'uiStartup',
+        'p75',
+        940,
+        1000,
+        DEFAULT_RELATIVE_THRESHOLDS,
+      );
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Pass.value);
+      expect(result.indication).toBe(COMPARISON_SEVERITY.Pass.icon);
     });
 
     it('handles identical values', () => {
@@ -77,8 +88,7 @@ describe('benchmark-comparison', () => {
         1000,
         DEFAULT_RELATIVE_THRESHOLDS,
       );
-      expect(result.severity).toBe(ComparisonSeverity.Neutral);
-      expect(result.direction).toBe(ComparisonDirection.Same);
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Pass.value);
       expect(result.delta).toBe(0);
     });
 
@@ -91,7 +101,7 @@ describe('benchmark-comparison', () => {
         DEFAULT_RELATIVE_THRESHOLDS,
       );
       expect(result.deltaPercent).toBe(0);
-      expect(result.severity).toBe(ComparisonSeverity.Neutral);
+      expect(result.severity).toBe(COMPARISON_SEVERITY.Pass.value);
     });
   });
 
@@ -107,7 +117,7 @@ describe('benchmark-comparison', () => {
     it('passes when within thresholds', () => {
       const results = {
         testTitle: 'test',
-        persona: 'standard' as const,
+        persona: BENCHMARK_PERSONA.STANDARD,
         mean: { uiStartup: 1500 },
         min: { uiStartup: 1000 },
         max: { uiStartup: 2000 },
@@ -129,7 +139,7 @@ describe('benchmark-comparison', () => {
     it('fails when p75 exceeds fail threshold', () => {
       const results = {
         testTitle: 'test',
-        persona: 'standard' as const,
+        persona: BENCHMARK_PERSONA.STANDARD,
         mean: { uiStartup: 2600 },
         min: { uiStartup: 2000 },
         max: { uiStartup: 3000 },
@@ -151,7 +161,7 @@ describe('benchmark-comparison', () => {
     it('warns but does not fail when p75 exceeds warn but not fail', () => {
       const results = {
         testTitle: 'test',
-        persona: 'standard' as const,
+        persona: BENCHMARK_PERSONA.STANDARD,
         mean: { uiStartup: 2100 },
         min: { uiStartup: 1800 },
         max: { uiStartup: 2400 },
@@ -168,13 +178,15 @@ describe('benchmark-comparison', () => {
 
       expect(comparison.absoluteFailed).toBe(false);
       expect(comparison.absoluteViolations.length).toBeGreaterThan(0);
-      expect(comparison.absoluteViolations[0].severity).toBe('warn');
+      expect(comparison.absoluteViolations[0].severity).toBe(
+        COMPARISON_SEVERITY.Warn.value,
+      );
     });
 
     it('includes relative metrics when baseline is provided', () => {
       const results = {
         testTitle: 'test',
-        persona: 'standard' as const,
+        persona: BENCHMARK_PERSONA.STANDARD,
         mean: { uiStartup: 1500 },
         min: { uiStartup: 1000 },
         max: { uiStartup: 2000 },
@@ -183,7 +195,7 @@ describe('benchmark-comparison', () => {
         p95: { uiStartup: 2200 },
       };
       const baseline = {
-        uiStartup: { mean: 1400, p75: 1700, p95: 2100 },
+        uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 },
       };
 
       const comparison = compareBenchmarkEntries(
@@ -193,18 +205,21 @@ describe('benchmark-comparison', () => {
         baseline,
       );
 
-      expect(comparison.relativeMetrics).toHaveLength(2);
+      // stdDev is intentionally excluded from relative metrics (item 18).
+      expect(comparison.relativeMetrics).toHaveLength(3);
       expect(comparison.relativeMetrics[0].metric).toBe('uiStartup');
-      expect(comparison.relativeMetrics[0].percentile).toBe('p75');
+      expect(comparison.relativeMetrics[0].percentile).toBe('mean');
       expect(comparison.relativeMetrics[0].delta).toBeCloseTo(100);
-      expect(comparison.relativeMetrics[1].percentile).toBe('p95');
+      expect(comparison.relativeMetrics[1].percentile).toBe('p75');
       expect(comparison.relativeMetrics[1].delta).toBeCloseTo(100);
+      expect(comparison.relativeMetrics[2].percentile).toBe('p95');
+      expect(comparison.relativeMetrics[2].delta).toBeCloseTo(100);
     });
 
     it('omits relative metrics when no baseline', () => {
       const results = {
         testTitle: 'test',
-        persona: 'standard' as const,
+        persona: BENCHMARK_PERSONA.STANDARD,
         mean: { uiStartup: 1500 },
         min: { uiStartup: 1000 },
         max: { uiStartup: 2000 },
@@ -239,7 +254,7 @@ describe('benchmark-comparison', () => {
         p95: {},
       };
       const baseline = {
-        uiStartup: { mean: 1400, p75: 1700, p95: 2100 },
+        uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 },
       };
 
       const comparison = compareBenchmarkEntries(
@@ -249,82 +264,127 @@ describe('benchmark-comparison', () => {
         baseline,
       );
 
-      expect(comparison.relativeMetrics).toHaveLength(1);
-      expect(comparison.relativeMetrics[0].percentile).toBe('p75');
+      expect(comparison.relativeMetrics).toHaveLength(2);
+      expect(comparison.relativeMetrics[0].percentile).toBe('mean');
+      expect(comparison.relativeMetrics[1].percentile).toBe('p75');
     });
-  });
 
-  describe('getTrafficLightIndication', () => {
-    it('returns 🔺 for regression slower', () => {
-      expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Regression,
-          ComparisonDirection.Slower,
-        ),
-      ).toBe('🔺');
-    });
+    it('skips a stat key when its results map is missing (line 159)', () => {
+      const results = {
+        p75: { uiStartup: 1800 },
+        p95: { uiStartup: 2200 },
+      } as unknown as BenchmarkResults;
 
-    it('returns 🔻 for regression faster', () => {
-      expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Regression,
-          ComparisonDirection.Faster,
-        ),
-      ).toBe('🔻');
-    });
+      const comparison = compareBenchmarkEntries(
+        'standard-home',
+        results,
+        thresholdConfig,
+        { uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 } },
+      );
 
-    it('returns 🟡⬆️ for warn slower', () => {
       expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Warn,
-          ComparisonDirection.Slower,
-        ),
-      ).toBe('🟡⬆️');
-    });
-
-    it('returns 🟡⬇️ for warn faster', () => {
+        comparison.relativeMetrics.some((m) => m.percentile === 'mean'),
+      ).toBe(false);
       expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Warn,
-          ComparisonDirection.Faster,
-        ),
-      ).toBe('🟡⬇️');
+        comparison.relativeMetrics.some((m) => m.percentile === 'p75'),
+      ).toBe(true);
     });
 
-    it('returns 🟢⬇️ for improvement faster', () => {
+    it('skips a metric when its baseline value for a specific percentile is absent (line 166)', () => {
+      const results: BenchmarkResults = {
+        testTitle: 'test',
+        persona: 'standard',
+        mean: { uiStartup: 1500 },
+        min: { uiStartup: 1000 },
+        max: { uiStartup: 2000 },
+        stdDev: { uiStartup: 200 },
+        p75: { uiStartup: 1800 },
+        p95: { uiStartup: 2200 },
+      };
+
+      const comparison = compareBenchmarkEntries(
+        'standard-home',
+        results,
+        thresholdConfig,
+        {
+          uiStartup: { mean: 1400, stdDev: 80, p75: 1700 },
+        } as unknown as Parameters<typeof compareBenchmarkEntries>[3],
+      );
+
       expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Improvement,
-          ComparisonDirection.Faster,
-        ),
-      ).toBe('🟢⬇️');
+        comparison.relativeMetrics.some((m) => m.percentile === 'p95'),
+      ).toBe(false);
+      expect(
+        comparison.relativeMetrics.some((m) => m.percentile === 'p75'),
+      ).toBe(true);
     });
+  });
 
-    it('returns ➡️ for neutral', () => {
-      expect(
-        getTrafficLightIndication(
-          ComparisonSeverity.Neutral,
-          ComparisonDirection.Same,
-        ),
-      ).toBe('➡️');
+  describe('compareBenchmarkEntries — no p75 in results', () => {
+    it('skips relative metrics when results.p75 is absent but baseline is provided', () => {
+      const p95OnlyConfig: import('../../shared/constants/benchmarks').ThresholdConfig =
+        {
+          uiStartup: { p95: { warn: 2500, fail: 3200 }, ciMultiplier: 1 },
+        };
+      const results = {
+        testTitle: 'test',
+        persona: 'standard',
+        mean: { uiStartup: 1500 },
+        min: { uiStartup: 1000 },
+        max: { uiStartup: 2000 },
+        stdDev: { uiStartup: 200 },
+        p95: { uiStartup: 2200 },
+      } as unknown as import('../../shared/constants/benchmarks').BenchmarkResults;
+
+      const comparison = compareBenchmarkEntries(
+        'no-p75',
+        results,
+        p95OnlyConfig,
+        { uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 } },
+      );
+      expect(comparison.relativeMetrics).toHaveLength(0);
     });
   });
 
   describe('formatDeltaPercent', () => {
-    it('formats slower as positive', () => {
-      expect(formatDeltaPercent(0.15, ComparisonDirection.Slower)).toBe(
-        '+15.0%',
-      );
+    it('formats a positive delta as +X%', () => {
+      expect(formatDeltaPercent(0.15)).toBe('+15%');
     });
 
-    it('formats faster as negative', () => {
-      expect(formatDeltaPercent(-0.08, ComparisonDirection.Faster)).toBe(
-        '-8.0%',
-      );
+    it('formats a negative delta as -X%', () => {
+      expect(formatDeltaPercent(-0.08)).toBe('-8%');
     });
 
-    it('formats same as 0.0%', () => {
-      expect(formatDeltaPercent(0, ComparisonDirection.Same)).toBe('0.0%');
+    it('formats zero as 0.0%', () => {
+      expect(formatDeltaPercent(0)).toBe('0.0%');
     });
   });
 });
+
+describe('THRESHOLD_REGISTRY', () => {
+  it('has platform-agnostic keys for interaction (runs on 4 combos)', () => {
+    expect(THRESHOLD_REGISTRY.loadNewAccount).toBeDefined();
+    expect(THRESHOLD_REGISTRY.confirmTx).toBeDefined();
+    expect(THRESHOLD_REGISTRY.bridgeUserActions).toBeDefined();
+    expect(
+      THRESHOLD_REGISTRY['chrome-browserify-loadNewAccount'],
+    ).toBeUndefined();
+  });
+
+  it('has platform-agnostic keys for user journey (chrome-browserify + chrome-webpack)', () => {
+    expect(THRESHOLD_REGISTRY.onboardingImportWallet).toBeDefined();
+    expect(THRESHOLD_REGISTRY.swap).toBeDefined();
+    expect(THRESHOLD_REGISTRY['chrome-webpack-swap']).toBeUndefined();
+  });
+
+  it('has startup benchmarks without platform prefixes', () => {
+    expect(THRESHOLD_REGISTRY.startupStandardHome).toBeDefined();
+    expect(THRESHOLD_REGISTRY.startupPowerUserHome).toBeDefined();
+    expect(
+      THRESHOLD_REGISTRY['chrome-browserify-startupStandardHome'],
+    ).toBeUndefined();
+    expect(
+      THRESHOLD_REGISTRY['firefox-webpack-startupPowerUserHome'],
+    ).toBeUndefined();
+  });
+});
diff --git a/development/metamaskbot-build-announce/comparison-utils.ts b/development/metamaskbot-build-announce/comparison-utils.ts
index e753da89a5e3..04a070b62831 100644
--- a/development/metamaskbot-build-announce/comparison-utils.ts
+++ b/development/metamaskbot-build-announce/comparison-utils.ts
@@ -3,7 +3,7 @@
  *
  * Two-layer approach:
  *
- * 1. Absolute gate: validates p75/p95 against constant limits in THRESHOLD_REGISTRY.
+ * 1. Absolute gate: validates p75/p95 against constant limits.
  * This is the primary pass/fail authority that prevents performance drift.
  * Reuses validateResultThresholds from the benchmark statistics module.
  *
@@ -14,42 +14,35 @@
 
 import type {
   BenchmarkResults,
+  HistoricalBaselineMetrics,
   ThresholdConfig,
   ThresholdViolation,
   RelativeThresholds,
+  ComparisonKey,
 } from '../../shared/constants/benchmarks';
 import {
-  PercentileKey,
-  ThresholdSeverity,
+  PERCENTILE_KEY,
+  STAT_KEY,
+  THRESHOLD_SEVERITY,
   DEFAULT_RELATIVE_THRESHOLDS,
 } from '../../shared/constants/benchmarks';
 import { validateResultThresholds } from '../../test/e2e/benchmarks/utils/statistics';
 
-export const ComparisonSeverity = {
-  Regression: 'regression',
-  Warn: 'warn',
-  Improvement: 'improvement',
-  Neutral: 'neutral',
+export const COMPARISON_SEVERITY = {
+  Regression: { value: 'regression' as const, icon: '🔴' },
+  Warn: { value: 'warn' as const, icon: '🟡' },
+  Pass: { value: 'pass' as const, icon: '🟢' },
 } as const;
 export type ComparisonSeverity =
-  (typeof ComparisonSeverity)[keyof typeof ComparisonSeverity];
-
-export const ComparisonDirection = {
-  Faster: 'faster',
-  Slower: 'slower',
-  Same: 'same',
-} as const;
-export type ComparisonDirection =
-  (typeof ComparisonDirection)[keyof typeof ComparisonDirection];
+  (typeof COMPARISON_SEVERITY)[keyof typeof COMPARISON_SEVERITY]['value'];
 
 export type MetricComparison = {
   metric: string;
-  percentile: PercentileKey;
+  percentile: ComparisonKey;
   current: number;
   baseline: number;
   delta: number;
   deltaPercent: number;
-  direction: ComparisonDirection;
   severity: ComparisonSeverity;
   indication: string;
 };
@@ -63,97 +56,53 @@ export type BenchmarkEntryComparison = {
   absoluteFailed: boolean;
 };
 
-/**
- * Returns a traffic-light indication based on comparison severity + direction.
- *
- * @param severity - The comparison severity.
- * @param direction - The comparison direction.
- */
-export function getTrafficLightIndication(
-  severity: ComparisonSeverity,
-  direction: ComparisonDirection,
-): string {
-  if (severity === ComparisonSeverity.Regression) {
-    return direction === ComparisonDirection.Slower ? '🔺' : '🔻';
-  }
-  if (severity === ComparisonSeverity.Warn) {
-    return direction === ComparisonDirection.Slower ? '🟡⬆️' : '🟡⬇️';
-  }
-  if (severity === ComparisonSeverity.Improvement) {
-    return direction === ComparisonDirection.Faster ? '🟢⬇️' : '🟢⬆️';
-  }
-  return '➡️';
-}
+const iconForSeverity = (severity: ComparisonSeverity): string =>
+  Object.values(COMPARISON_SEVERITY).find((s) => s.value === severity)?.icon ??
+  COMPARISON_SEVERITY.Pass.icon;
 
 /**
  * Formats a delta percentage as a human-readable string.
+ * Sign is derived from the value: positive = slower (+X%), negative = faster (-X%).
  *
- * @param deltaPercent - Delta as a fraction (0.1 = 10%).
- * @param direction - Direction of the change.
+ * @param deltaPercent - Delta as a fraction (0.1 = 10%, -0.08 = -8%).
  */
-export function formatDeltaPercent(
-  deltaPercent: number,
-  direction: ComparisonDirection,
-): string {
-  const pct = Math.abs(deltaPercent * 100).toFixed(1);
-  if (direction === ComparisonDirection.Slower) {
-    return `+${pct}%`;
-  }
-  if (direction === ComparisonDirection.Faster) {
-    return `-${pct}%`;
+export function formatDeltaPercent(deltaPercent: number): string {
+  const pct = Number((deltaPercent * 100).toFixed(1));
+  if (pct === 0) {
+    return '0.0%';
   }
-  return '0.0%';
-}
-
-function deltaToDirection(delta: number): ComparisonDirection {
-  if (delta > 0) {
-    return ComparisonDirection.Slower;
-  }
-  if (delta < 0) {
-    return ComparisonDirection.Faster;
-  }
-  return ComparisonDirection.Same;
+  const sign = pct > 0 ? '+' : '';
+  return `${sign}${pct}%`;
 }
 
 /**
- * Compares a single metric value against a baseline and returns
- * severity, direction, and traffic-light indication.
+ * Compares a single metric value against a baseline and returns severity
+ * and traffic-light indication. delta > 0 means slower (regression direction).
  *
  * @param metric - Metric name.
- * @param percentile - Which percentile this comparison is for.
+ * @param percentile - Which stat key this comparison is for.
  * @param current - Current value (ms).
  * @param baseline - Baseline value (ms).
  * @param thresholds - Relative thresholds for severity classification.
  */
 export function compareMetric(
   metric: string,
-  percentile: PercentileKey,
+  percentile: ComparisonKey,
   current: number,
   baseline: number,
   thresholds: RelativeThresholds,
 ): MetricComparison {
   const delta = current - baseline;
   const deltaPercent = baseline === 0 ? 0 : delta / baseline;
-
-  const direction = deltaToDirection(delta);
-
-  let severity: ComparisonSeverity;
   const absDelta = Math.abs(deltaPercent);
 
-  if (
-    direction === ComparisonDirection.Slower &&
-    absDelta >= thresholds.regressionPercent
-  ) {
-    severity = ComparisonSeverity.Regression;
-  } else if (
-    direction === ComparisonDirection.Faster &&
-    absDelta >= thresholds.improvementPercent
-  ) {
-    severity = ComparisonSeverity.Improvement;
-  } else if (absDelta >= thresholds.warnPercent) {
-    severity = ComparisonSeverity.Warn;
-  } else {
-    severity = ComparisonSeverity.Neutral;
+  let severity: ComparisonSeverity = COMPARISON_SEVERITY.Pass.value;
+  if (delta > 0) {
+    if (absDelta >= thresholds.regressionPercent) {
+      severity = COMPARISON_SEVERITY.Regression.value;
+    } else if (absDelta >= thresholds.warnPercent) {
+      severity = COMPARISON_SEVERITY.Warn.value;
+    }
   }
 
   return {
@@ -163,17 +112,52 @@ export function compareMetric(
     baseline,
     delta,
     deltaPercent,
-    direction,
     severity,
-    indication: getTrafficLightIndication(severity, direction),
+    indication: iconForSeverity(severity),
   };
 }
 
-type BaselineMetrics = {
-  mean: number;
-  p75: number;
-  p95: number;
-};
+/**
+ * Collects per-metric comparisons of current stats vs baseline (mean, p75, p95).
+ *
+ * @param results - Current benchmark results (must have p75/p95 maps).
+ * @param baselineData - Historical baseline values per metric.
+ * @param relativeThresholds - Relative thresholds for traffic lights.
+ */
+function collectRelativeMetrics(
+  results: BenchmarkResults,
+  baselineData: Record<string, HistoricalBaselineMetrics>,
+  relativeThresholds: RelativeThresholds,
+): MetricComparison[] {
+  const metrics: MetricComparison[] = [];
+  const comparisonKeys: ComparisonKey[] = [
+    STAT_KEY.Mean,
+    PERCENTILE_KEY.P75,
+    PERCENTILE_KEY.P95,
+  ];
+  for (const key of comparisonKeys) {
+    const currentMap = results[key];
+    if (!currentMap) {
+      continue;
+    }
+    for (const [metric, currentValue] of Object.entries(currentMap)) {
+      const baselineVal = baselineData[metric]?.[key];
+      if (baselineVal === undefined) {
+        continue;
+      }
+      metrics.push(
+        compareMetric(
+          metric,
+          key,
+          currentValue,
+          baselineVal,
+          relativeThresholds,
+        ),
+      );
+    }
+  }
+  return metrics;
+}
 
 /**
  * Compares a full benchmark entry against thresholds and baseline.
@@ -193,7 +177,7 @@ export function compareBenchmarkEntries(
   benchmarkName: string,
   results: BenchmarkResults,
   thresholdConfig: ThresholdConfig,
-  baselineData?: Record<string, BaselineMetrics>,
+  baselineData?: Record<string, HistoricalBaselineMetrics>,
   relativeThresholds: RelativeThresholds = DEFAULT_RELATIVE_THRESHOLDS,
 ): BenchmarkEntryComparison {
   const { violations, passed } = validateResultThresholds(
@@ -201,42 +185,24 @@ export function compareBenchmarkEntries(
     thresholdConfig,
   );
 
-  const relativeMetrics: MetricComparison[] = [];
-  if (baselineData && results.p75) {
-    const percentiles = [PercentileKey.P75, PercentileKey.P95] as const;
-    for (const percentile of percentiles) {
-      const currentMap = results[percentile];
-      if (!currentMap) {
-        continue;
-      }
-      for (const [metric, currentValue] of Object.entries(currentMap)) {
-        const baselineEntry = baselineData[metric];
-        if (baselineEntry !== undefined) {
-          relativeMetrics.push(
-            compareMetric(
-              metric,
-              percentile,
-              currentValue,
-              baselineEntry[percentile],
-              relativeThresholds,
-            ),
-          );
-        }
-      }
-    }
-  }
+  const relativeMetrics =
+    baselineData && results.p75
+      ? collectRelativeMetrics(results, baselineData, relativeThresholds)
+      : [];
 
   return {
     benchmarkName,
     relativeMetrics,
     absoluteViolations: violations,
     hasRegression: relativeMetrics.some(
-      (m) => m.severity === ComparisonSeverity.Regression,
+      (m) => m.severity === COMPARISON_SEVERITY.Regression.value,
     ),
     hasWarning:
-      relativeMetrics.some((m) => m.severity === ComparisonSeverity.Warn) ||
+      relativeMetrics.some(
+        (m) => m.severity === COMPARISON_SEVERITY.Warn.value,
+      ) ||
       violations.some(
-        (v: ThresholdViolation) => v.severity === ThresholdSeverity.Warn,
+        (v: ThresholdViolation) => v.severity === THRESHOLD_SEVERITY.Warn,
       ),
     absoluteFailed: !passed,
   };
diff --git a/development/metamaskbot-build-announce/historical-comparison.test.ts b/development/metamaskbot-build-announce/historical-comparison.test.ts
index edbcc6175455..bb3c67c60c3c 100644
--- a/development/metamaskbot-build-announce/historical-comparison.test.ts
+++ b/development/metamaskbot-build-announce/historical-comparison.test.ts
@@ -1,6 +1,7 @@
 import {
   aggregateHistoricalData,
-  fetchHistoricalPerformanceData,
+  aggregateHistoricalDataWithCommit,
+  fetchHistoricalPerformanceDataFromMain,
   type HistoricalPerformanceFile,
 } from './historical-comparison';
 
@@ -63,16 +64,40 @@ describe('aggregateHistoricalData', () => {
     jest.restoreAllMocks();
   });
 
-  it('uses the most recent commit only', () => {
-    // def456 is the last key → most recent when reversed
+  it('averages across the 3 most recent commits', () => {
     const result = aggregateHistoricalData(mockFile);
 
-    expect(result['pageLoad/standardHome']?.uiStartup?.mean).toBe(2000);
-    expect(result['pageLoad/standardHome']?.uiStartup?.p75).toBe(2200);
-    expect(result['pageLoad/standardHome']?.uiStartup?.p95).toBe(2600);
-    expect(result['pageLoad/standardHome']?.load?.mean).toBe(600);
-    expect(result['pageLoad/standardHome']?.load?.p75).toBe(660);
-    expect(result['pageLoad/standardHome']?.load?.p95).toBe(780);
+    expect(result['pageLoad/standardHome']?.uiStartup?.mean).toBe(1500);
+    expect(result['pageLoad/standardHome']?.uiStartup?.p75).toBe(1650);
+    expect(result['pageLoad/standardHome']?.uiStartup?.p95).toBe(1950);
+    expect(result['pageLoad/standardHome']?.load?.mean).toBe(550);
+    expect(result['pageLoad/standardHome']?.load?.p75).toBe(605);
+    expect(result['pageLoad/standardHome']?.load?.p95).toBe(715);
+  });
+
+  it('includes data from older commits when latest is incomplete', () => {
+    const data: HistoricalPerformanceFile = {
+      old: makeCommit({ timestamp: 1_700_000_000 }),
+      newest: {
+        timestamp: 1_700_000_002,
+        presets: {
+          userActions: {
+            loadNewAccount: {
+              mean: { loadNewAccount: 400 },
+              p75: { loadNewAccount: 440 },
+              p95: { loadNewAccount: 500 },
+            },
+          },
+        },
+      },
+    };
+
+    const result = aggregateHistoricalData(data);
+
+    expect(result['pageLoad/standardHome']?.uiStartup?.mean).toBe(1000);
+    expect(result['userActions/loadNewAccount']?.loadNewAccount?.mean).toBe(
+      350,
+    );
   });
 
   it('returns empty object when data has no commits', () => {
@@ -142,56 +167,107 @@ describe('aggregateHistoricalData', () => {
     expect(result['pageLoad/entry']?.bad).toBeUndefined();
   });
 
-  it('parses string-encoded metric values', () => {
+  it('skips commits where presets is missing', () => {
+    const data = asHistoricalFile({
+      c1: { timestamp: 1 },
+    });
+
+    const result = aggregateHistoricalData(data);
+
+    expect(result).toStrictEqual({});
+  });
+
+  it('skips preset entries that are not objects', () => {
     const data = asHistoricalFile({
       c1: {
         timestamp: 1,
         presets: {
-          pageLoad: {
-            entry: {
-              mean: { uiStartup: '1234.5' },
-              p75: { uiStartup: '1350.0' },
-              p95: { uiStartup: '1600.0' },
-            },
-          },
+          pageLoad: 'not-an-object',
+          userActions: makeCommit().presets.userActions,
         },
       },
     });
 
     const result = aggregateHistoricalData(data);
 
-    expect(result['pageLoad/entry']?.uiStartup?.mean).toBe(1234.5);
-    expect(result['pageLoad/entry']?.uiStartup?.p75).toBe(1350);
-    expect(result['pageLoad/entry']?.uiStartup?.p95).toBe(1600);
+    expect(result['pageLoad/standardHome']).toBeUndefined();
+    expect(result['userActions/loadNewAccount']?.loadNewAccount?.mean).toBe(
+      300,
+    );
   });
 
-  it('skips commits where presets is missing', () => {
+  it('includes stdDev in the baseline when stdDev data is present', () => {
     const data = asHistoricalFile({
-      c1: { timestamp: 1 },
+      c1: {
+        timestamp: 1,
+        presets: {
+          pageLoad: {
+            entry: {
+              mean: { metric: 500 },
+              stdDev: { metric: 30 },
+              p75: { metric: 550 },
+              p95: { metric: 650 },
+            },
+          },
+        },
+      },
+      c2: {
+        timestamp: 2,
+        presets: {
+          pageLoad: {
+            entry: {
+              mean: { metric: 600 },
+              stdDev: { metric: 40 },
+              p75: { metric: 660 },
+              p95: { metric: 760 },
+            },
+          },
+        },
+      },
     });
 
     const result = aggregateHistoricalData(data);
 
-    expect(result).toStrictEqual({});
+    // stdDev true-branch: result should include a stdDev field
+    expect(result['pageLoad/entry']?.metric).toHaveProperty('stdDev');
+    expect(result['pageLoad/entry']?.metric?.stdDev).toBeCloseTo(35);
   });
 
-  it('skips preset entries that are not objects', () => {
+  it('skips entries where mean values average to NaN (e.g. Infinity + -Infinity)', () => {
+    // Infinity and -Infinity are valid numbers and not NaN, so they pass the
+    // typeof/isNaN guard in collectMetrics.  But mean([Infinity, -Infinity]) = NaN,
+    // which must be caught by the NaN guard in buildMetricBaselines.
     const data = asHistoricalFile({
       c1: {
         timestamp: 1,
         presets: {
-          pageLoad: 'not-an-object',
-          userActions: makeCommit().presets.userActions,
+          pageLoad: {
+            nanEntry: {
+              mean: { metric: Infinity },
+              p75: { metric: Infinity },
+              p95: { metric: Infinity },
+            },
+          },
+        },
+      },
+      c2: {
+        timestamp: 2,
+        presets: {
+          pageLoad: {
+            nanEntry: {
+              mean: { metric: -Infinity },
+              p75: { metric: -Infinity },
+              p95: { metric: -Infinity },
+            },
+          },
         },
       },
     });
 
     const result = aggregateHistoricalData(data);
 
-    expect(result['pageLoad/standardHome']).toBeUndefined();
-    expect(result['userActions/loadNewAccount']?.loadNewAccount?.mean).toBe(
-      300,
-    );
+    // mean([Infinity, -Infinity]) = NaN → entry must be skipped
+    expect(result['pageLoad/nanEntry']).toBeUndefined();
   });
 
   it('falls back to mean when p75/p95 data is missing', () => {
@@ -222,320 +298,226 @@ describe('aggregateHistoricalData', () => {
   });
 });
 
-describe('fetchHistoricalPerformanceData', () => {
-  const mockFetch = jest.fn();
+describe('aggregateHistoricalDataWithCommit', () => {
+  it('returns baseline data with latest commit hash and timestamp', () => {
+    const data: HistoricalPerformanceFile = {
+      abc123: makeCommit({ timestamp: 1_700_000_000 }),
+      def456: makeCommit({ timestamp: 1_700_000_001 }),
+      ghi789: makeCommit({ timestamp: 1_700_000_002 }),
+    };
 
-  beforeEach(() => {
-    global.fetch = mockFetch;
-    jest.spyOn(console, 'log').mockImplementation();
-    jest.spyOn(console, 'warn').mockImplementation();
-  });
+    const result = aggregateHistoricalDataWithCommit(data);
 
-  afterEach(() => {
-    jest.restoreAllMocks();
-    mockFetch.mockReset();
+    expect(result.latestCommit).toBe('ghi789');
+    expect(result.latestTimestamp).toBe(1_700_000_002);
+    expect(result.baseline).toBeDefined();
+    expect(result.baseline['pageLoad/standardHome']).toBeDefined();
   });
 
-  const makeOkResponse = (body: unknown) =>
-    Promise.resolve({
-      ok: true,
-      json: () => Promise.resolve(body),
-    } as Response);
-
-  const makeNotFoundResponse = () => Promise.resolve({ ok: false } as Response);
+  it('returns empty string and 0 timestamp when data is empty', () => {
+    const data: HistoricalPerformanceFile = {};
 
-  it('returns aggregated data when target branch has history', async () => {
-    mockFetch.mockReturnValue(makeOkResponse(mockFile));
+    const result = aggregateHistoricalDataWithCommit(data);
 
-    const result = await fetchHistoricalPerformanceData('main');
-
-    expect(result).not.toBeNull();
-    expect(result?.['pageLoad/standardHome']?.uiStartup?.mean).toBe(2000);
-    // Should fetch the target branch file directly
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('main/performance_data.json'),
-    );
+    expect(result.latestCommit).toBe('');
+    expect(result.latestTimestamp).toBe(0);
+    expect(result.baseline).toStrictEqual({});
   });
 
-  it('sanitizes branch names with slashes', async () => {
-    mockFetch.mockReturnValue(makeOkResponse(mockFile));
+  it('returns the most recent commit when commits are out of order', () => {
+    const data: HistoricalPerformanceFile = {
+      old: makeCommit({ timestamp: 1_700_000_000 }),
+      newest: makeCommit({ timestamp: 1_700_000_003 }),
+      middle: makeCommit({ timestamp: 1_700_000_001 }),
+    };
 
-    await fetchHistoricalPerformanceData('release/12.5.0');
+    const result = aggregateHistoricalDataWithCommit(data);
 
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('release-12.5.0/performance_data.json'),
-    );
+    expect(result.latestCommit).toBe('newest');
+    expect(result.latestTimestamp).toBe(1_700_000_003);
   });
 
-  it('falls back to latest release branch when target has no data', async () => {
-    const releaseDirs = [
-      { name: 'release-12.5.0', type: 'dir' },
-      { name: 'release-12.4.0', type: 'dir' },
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch: no data
-      .mockReturnValueOnce(makeOkResponse(releaseDirs)) // GitHub API listing
-      .mockReturnValueOnce(makeOkResponse(mockFile)); // release-12.5.0 data
+  it('filters out commits without timestamps', () => {
+    const data = asHistoricalFile({
+      valid: makeCommit({ timestamp: 1_700_000_001 }),
+      noTimestamp: { presets: {} },
+      nullTimestamp: { timestamp: null, presets: {} },
+    });
 
-    const result = await fetchHistoricalPerformanceData('main');
+    const result = aggregateHistoricalDataWithCommit(data);
 
-    expect(result).not.toBeNull();
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('release-12.5.0/performance_data.json'),
-    );
+    expect(result.latestCommit).toBe('valid');
+    expect(result.latestTimestamp).toBe(1_700_000_001);
   });
 
-  it('sorts release branches by descending semver and tries the latest first', async () => {
-    const releaseDirs = [
-      { name: 'release-12.4.0', type: 'dir' },
-      { name: 'release-12.10.0', type: 'dir' },
-      { name: 'release-12.5.0', type: 'dir' },
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch
-      .mockReturnValueOnce(makeOkResponse(releaseDirs)) // listing
-      .mockReturnValueOnce(makeOkResponse(mockFile)); // first tried: release-12.10.0
+  it('aggregates baseline from the same commits used to find latest', () => {
+    const data: HistoricalPerformanceFile = {
+      commit1: makeCommit({
+        timestamp: 1_700_000_000,
+        presets: {
+          pageLoad: {
+            standardHome: {
+              mean: { uiStartup: 1000 },
+              p75: { uiStartup: 1100 },
+              p95: { uiStartup: 1200 },
+            },
+          },
+        },
+      }),
+      commit2: makeCommit({
+        timestamp: 1_700_000_001,
+        presets: {
+          pageLoad: {
+            standardHome: {
+              mean: { uiStartup: 2000 },
+              p75: { uiStartup: 2200 },
+              p95: { uiStartup: 2400 },
+            },
+          },
+        },
+      }),
+      commit3: makeCommit({
+        timestamp: 1_700_000_002,
+        presets: {
+          pageLoad: {
+            standardHome: {
+              mean: { uiStartup: 3000 },
+              p75: { uiStartup: 3300 },
+              p95: { uiStartup: 3600 },
+            },
+          },
+        },
+      }),
+    };
 
-    await fetchHistoricalPerformanceData('main');
+    const result = aggregateHistoricalDataWithCommit(data);
 
-    const calls = mockFetch.mock.calls.map((c: [string]) => c[0]);
-    const releaseCall = calls.find(
-      (url: string) =>
-        url.includes('release-') && url.includes('performance_data.json'),
+    expect(result.latestCommit).toBe('commit3');
+    expect(result.latestTimestamp).toBe(1_700_000_002);
+    // Should average across all 3 commits
+    expect(result.baseline['pageLoad/standardHome']?.uiStartup?.mean).toBe(
+      2000,
     );
-    expect(releaseCall).toContain('release-12.10.0');
   });
+});
 
-  it('returns null when no branch has any data', async () => {
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch
-      .mockReturnValueOnce(makeOkResponse([])); // empty listing
-
-    const result = await fetchHistoricalPerformanceData('main');
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when the GitHub API listing returns a non-OK response', async () => {
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch
-      .mockReturnValueOnce(makeNotFoundResponse()); // listing API non-OK
-
-    const result = await fetchHistoricalPerformanceData('main');
+describe('fetchHistoricalPerformanceDataFromMain', () => {
+  const mockFetch = jest.fn();
 
-    expect(result).toBeNull();
+  beforeEach(() => {
+    global.fetch = mockFetch;
+    jest.spyOn(console, 'warn').mockImplementation();
   });
 
-  it('treats two release branches with identical versions as equal (stable sort)', async () => {
-    const releaseDirs = [
-      { name: 'release-12.5.0', type: 'dir' },
-      { name: 'release-12.5.0', type: 'dir' }, // duplicate — sort returns 0
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch
-      .mockReturnValueOnce(makeOkResponse(releaseDirs)) // listing
-      .mockReturnValueOnce(makeOkResponse(mockFile)); // first release
-
-    const result = await fetchHistoricalPerformanceData('main');
-
-    expect(result).not.toBeNull();
+  afterEach(() => {
+    jest.restoreAllMocks();
+    mockFetch.mockReset();
   });
 
-  it('returns null when fetch throws', async () => {
-    mockFetch.mockRejectedValue(new Error('network error'));
-
-    const result = await fetchHistoricalPerformanceData('main');
+  const makeOkResponse = (body: unknown) =>
+    Promise.resolve({
+      ok: true,
+      json: () => Promise.resolve(body),
+    } as Response);
 
-    expect(result).toBeNull();
-  });
+  const makeNotFoundResponse = () => Promise.resolve({ ok: false } as Response);
 
-  it('uses GITHUB_BASE_REF env var when called with no arguments', async () => {
-    process.env.GITHUB_BASE_REF = 'release/12.5.0';
-    mockFetch.mockReturnValue(makeOkResponse(mockFile));
+  it('fetches from main and returns aggregated data with commit info', async () => {
+    mockFetch.mockReturnValueOnce(makeOkResponse(mockFile));
 
-    const result = await fetchHistoricalPerformanceData();
+    const result = await fetchHistoricalPerformanceDataFromMain();
 
-    expect(result).not.toBeNull();
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('release-12.5.0/performance_data.json'),
+    expect(result?.baseline['pageLoad/standardHome']?.uiStartup?.mean).toBe(
+      1500,
     );
-
-    delete process.env.GITHUB_BASE_REF;
-  });
-
-  it('falls back to "main" when GITHUB_BASE_REF is not set and no arguments given', async () => {
-    delete process.env.GITHUB_BASE_REF;
-    mockFetch.mockReturnValue(makeOkResponse(mockFile));
-
-    const result = await fetchHistoricalPerformanceData();
-
-    expect(result).not.toBeNull();
+    expect(result?.latestCommit).toBe('def456');
+    expect(result?.latestTimestamp).toBe(1_700_000_001);
     expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('main/performance_data.json'),
+      expect.stringContaining('stats/main/performance_data.json'),
     );
   });
 
-  it('skips a release branch that returns an empty object', async () => {
-    const releaseDirs = [
-      { name: 'release-12.5.0', type: 'dir' },
-      { name: 'release-12.4.0', type: 'dir' },
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // target branch
-      .mockReturnValueOnce(makeOkResponse(releaseDirs)) // listing
-      .mockReturnValueOnce(makeOkResponse({})) // release-12.5.0: empty object
-      .mockReturnValueOnce(makeOkResponse(mockFile)); // release-12.4.0: has data
+  it('returns null when main has no data', async () => {
+    mockFetch.mockReturnValueOnce(makeNotFoundResponse());
 
-    const result = await fetchHistoricalPerformanceData('main');
+    const result = await fetchHistoricalPerformanceDataFromMain();
 
-    expect(result).not.toBeNull();
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('release-12.4.0/performance_data.json'),
-    );
-  });
-
-  it('sorts release versions with unequal segment counts correctly', async () => {
-    // Three entries so both av[i]??0 and bv[i]??0 branches are exercised:
-    // release-12.5 (2 parts) compared against release-12.5.1 (3 parts) and vice-versa
-    const releaseDirs = [
-      { name: 'release-12.5', type: 'dir' }, // 2-part
-      { name: 'release-12.5.1', type: 'dir' }, // 3-part, higher
-      { name: 'release-12.4.0', type: 'dir' }, // 3-part, lower
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse())
-      .mockReturnValueOnce(makeOkResponse(releaseDirs))
-      .mockReturnValueOnce(makeOkResponse(mockFile));
-
-    await fetchHistoricalPerformanceData('main');
-
-    // release-12.5.1 should be tried first (highest version)
-    const calls = mockFetch.mock.calls.map((c: [string]) => c[0]);
-    const releaseCall = calls.find(
-      (url: string) =>
-        url.includes('release-') && url.includes('performance_data.json'),
-    );
-    expect(releaseCall).toContain('release-12.5.1');
-  });
-
-  it('skips non-directory entries in the GitHub API listing', async () => {
-    const items = [
-      { name: 'release-12.5.0', type: 'dir' },
-      { name: 'README.md', type: 'file' },
-      { name: 'main', type: 'dir' },
-    ];
-
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse())
-      .mockReturnValueOnce(makeOkResponse(items))
-      .mockReturnValueOnce(makeOkResponse(mockFile));
-
-    await fetchHistoricalPerformanceData('other-branch');
-
-    // README.md and main (not release-*) should not be fetched
-    const fetchedUrls = mockFetch.mock.calls.map((c: [string]) => c[0]);
-    expect(fetchedUrls.some((u: string) => u.includes('README'))).toBe(false);
-    // 'main' is a dir entry but doesn't start with 'release-', so it should not
-    // be fetched as a stats branch (note: STATS_REPO_BASE itself contains '/main/'
-    // so we check for the data file path specifically)
-    expect(
-      fetchedUrls.some(
-        (u: string) =>
-          u.includes('/main/performance_data.json') &&
-          !u.includes('other-branch'),
-      ),
-    ).toBe(false);
+    expect(result).toBeNull();
   });
 
-  it('skips the target branch in the fallback loop to avoid double-fetching', async () => {
-    const releaseDirs = [{ name: 'release-12.5.0', type: 'dir' }];
-
-    // release-12.5.0 is also the sanitized target branch
-    mockFetch
-      .mockReturnValueOnce(makeNotFoundResponse()) // release-12.5.0 (target)
-      .mockReturnValueOnce(makeOkResponse(releaseDirs)); // listing // no 3rd call expected since it was already tried
+  it('returns null when main returns an empty object', async () => {
+    mockFetch.mockReturnValueOnce(makeOkResponse({}));
 
-    const result = await fetchHistoricalPerformanceData('release/12.5.0');
+    const result = await fetchHistoricalPerformanceDataFromMain();
 
     expect(result).toBeNull();
-    // Only 2 fetch calls — target + listing; release-12.5.0 not re-fetched
-    expect(mockFetch).toHaveBeenCalledTimes(2);
   });
 
-  it('falls back to release branch when target has entries but aggregation is empty', async () => {
-    const invalidData = asHistoricalFile({
+  it('uses mean as fallback p75 when p75 data is absent from all commits', async () => {
+    // Only mean and p95 provided — no p75 in the benchmark results
+    const data = asHistoricalFile({
       commit1: {
-        timestamp: 0,
+        timestamp: 1_700_000_000,
         presets: {
           pageLoad: {
-            entry: { mean: null },
+            standardHome: {
+              mean: { uiStartup: 1000 },
+              p95: { uiStartup: 1300 },
+            },
           },
         },
       },
     });
 
-    const releaseDirs = [{ name: 'release-12.5.0', type: 'dir' }];
-
-    mockFetch
-      .mockReturnValueOnce(makeOkResponse(invalidData))
-      .mockReturnValueOnce(makeOkResponse(releaseDirs))
-      .mockReturnValueOnce(makeOkResponse(mockFile));
-
-    const result = await fetchHistoricalPerformanceData('main');
+    const result = aggregateHistoricalData(data);
 
-    expect(result).not.toBeNull();
-    expect(result?.['pageLoad/standardHome']?.uiStartup?.mean).toBe(2000);
+    expect(result['pageLoad/standardHome']?.uiStartup?.p75).toBe(1000);
+    expect(result['pageLoad/standardHome']?.uiStartup?.p95).toBe(1300);
   });
 
-  it('returns null when all branches produce empty aggregation', async () => {
-    const invalidData = asHistoricalFile({
+  it('uses mean as fallback p95 when p95 data is absent from all commits', async () => {
+    // Only mean and p75 provided — no p95 in the benchmark results
+    const data = asHistoricalFile({
       commit1: {
-        timestamp: 0,
+        timestamp: 1_700_000_000,
         presets: {
           pageLoad: {
-            entry: { mean: null },
+            standardHome: {
+              mean: { uiStartup: 1000 },
+              p75: { uiStartup: 1100 },
+              // p95 intentionally absent
+            },
           },
         },
       },
     });
 
-    const releaseDirs = [{ name: 'release-12.5.0', type: 'dir' }];
+    const result = aggregateHistoricalData(data);
+
+    // p95 should fall back to the mean value (1000)
+    expect(result['pageLoad/standardHome']?.uiStartup?.p95).toBe(1000);
+    expect(result['pageLoad/standardHome']?.uiStartup?.p75).toBe(1100);
+  });
 
-    mockFetch
-      .mockReturnValueOnce(makeOkResponse(invalidData))
-      .mockReturnValueOnce(makeOkResponse(releaseDirs))
-      .mockReturnValueOnce(makeOkResponse(invalidData));
+  it('returns null when aggregation produces no valid metrics', async () => {
+    const invalidData = asHistoricalFile({
+      commit1: {
+        timestamp: 0,
+        presets: { pageLoad: { entry: { mean: null } } },
+      },
+    });
+    mockFetch.mockReturnValueOnce(makeOkResponse(invalidData));
 
-    const result = await fetchHistoricalPerformanceData('main');
+    const result = await fetchHistoricalPerformanceDataFromMain();
 
     expect(result).toBeNull();
   });
 
-  it('includes Authorization header when GITHUB_TOKEN is set', async () => {
-    process.env.GITHUB_TOKEN = 'test-token-123';
-    try {
-      mockFetch
-        .mockReturnValueOnce(makeNotFoundResponse())
-        .mockReturnValueOnce(makeOkResponse([]));
-
-      await fetchHistoricalPerformanceData('main');
-
-      const apiCall = mockFetch.mock.calls.find(
-        (c: [string, RequestInit?]) =>
-          typeof c[0] === 'string' && c[0].includes('api.github.com'),
-      );
-      expect(apiCall).toBeDefined();
-      expect((apiCall as [string, RequestInit])[1]?.headers).toHaveProperty(
-        'Authorization',
-        'token test-token-123',
-      );
-    } finally {
-      delete process.env.GITHUB_TOKEN;
-    }
+  it('returns null when fetch throws', async () => {
+    mockFetch.mockRejectedValue(new Error('network error'));
+
+    const result = await fetchHistoricalPerformanceDataFromMain();
+
+    expect(result).toBeNull();
   });
 });
diff --git a/development/metamaskbot-build-announce/historical-comparison.ts b/development/metamaskbot-build-announce/historical-comparison.ts
index 72d2713c1395..ada13b001353 100644
--- a/development/metamaskbot-build-announce/historical-comparison.ts
+++ b/development/metamaskbot-build-announce/historical-comparison.ts
@@ -4,24 +4,13 @@
  * Retrieves benchmark data from MetaMask/extension_benchmark_stats
  * and aggregates it into a mean-of-means reference for PR comment comparisons.
  */
+import mean from 'lodash/mean';
+import { STAT_KEY } from '../../shared/constants/benchmarks';
 import type {
   BenchmarkResults,
   HistoricalBaselineMetrics,
 } from '../../shared/constants/benchmarks';
 
-const STATS_REPO_BASE =
-  'https://raw.githubusercontent.com/MetaMask/extension_benchmark_stats/main/stats';
-
-/**
- * All presets in performance_data.json share the same nested shape:
- * preset name → benchmark name → benchmark result.
- *
- * - startupStandardHome:        { "uiStartup": { "mean": {...} }, ... }
- * - startupPowerUserHome:       { "uiStartup": { "mean": {...} }, ... }
- * - interactionUserActions:     { "loadNewAccount": { "mean": {...} }, "confirmTx": { "mean": {...} } }
- * - userJourneyAssets:          { "assetClickToPriceChart": { "mean": {...} }, ... }
- * - pageLoad (legacy group):    { "chrome-browserify-standardHome": { "mean": {...} }, ... }
- */
 type NestedPresetEntry = Record<string, Partial<BenchmarkResults>>;
 
 type HistoricalCommitEntry = {
@@ -36,214 +25,151 @@ export type HistoricalBaselineReference = Record<
   Record<string, HistoricalBaselineMetrics>
 >;
 
-// Must specify ?ref=main explicitly — the stats repo's default branch is gh-pages,
-// so an unqualified API call would list gh-pages content instead of main.
-const STATS_REPO_API =
-  'https://api.github.com/repos/MetaMask/extension_benchmark_stats/contents/stats?ref=main';
-
-/**
- * Sanitizes a branch name for use as a URL path segment.
- * Mirrors the sed transform in benchmark-stats-commit.sh:
- * "release/12.x" → "release-12.x", "main" → "main"
- *
- * @param branch - Raw branch name.
- * @returns URL-safe branch slug.
- */
-function sanitizeBranch(branch: string): string {
-  return branch.replace(/\//gu, '-');
-}
+export type HistoricalBaselineResult = {
+  baseline: HistoricalBaselineReference;
+  latestCommit: string;
+  latestTimestamp: number;
+};
 
 /**
- * Fetches and parses performance_data.json for a given sanitized branch slug.
- * Returns null if the file does not exist or cannot be parsed.
+ * Fetches historical performance data from the `main` branch of
+ * extension_benchmark_stats.
  *
- * @param safeBranch - Sanitized branch name (e.g. "release-12.5.0").
- * @returns Parsed file contents or null.
+ * @returns Reference map (benchmarkName -> metric -> baseline) with latest commit info, or null if unavailable.
  */
-async function fetchPerformanceFile(
-  safeBranch: string,
-): Promise<HistoricalPerformanceFile | null> {
+export async function fetchHistoricalPerformanceDataFromMain(): Promise<HistoricalBaselineResult | null> {
   try {
-    const response = await fetch(
-      `${STATS_REPO_BASE}/${safeBranch}/performance_data.json`,
-    );
+    const STATS_PERFORMANCE_DATA_URL =
+      'https://raw.githubusercontent.com/MetaMask/extension_benchmark_stats/main/stats/main/performance_data.json';
+    const response = await fetch(STATS_PERFORMANCE_DATA_URL);
     if (!response.ok) {
       return null;
     }
-    return (await response.json()) as HistoricalPerformanceFile;
+    const data = (await response.json()) as HistoricalPerformanceFile;
+    if (Object.keys(data).length === 0) {
+      return null;
+    }
+    const { baseline, latestCommit, latestTimestamp } =
+      aggregateHistoricalDataWithCommit(data);
+    return Object.keys(baseline).length > 0
+      ? { baseline, latestCommit, latestTimestamp }
+      : null;
   } catch {
     return null;
   }
 }
 
-/**
- * Lists all release branch slugs stored in extension_benchmark_stats,
- * sorted descending by semantic version (latest first).
- * Returns slugs in their sanitized form (e.g. "release-12.5.0").
- */
-async function listReleaseBranchesByVersion(): Promise<string[]> {
-  try {
-    const headers: Record<string, string> = {
-      Accept: 'application/vnd.github.v3+json',
-    };
-    if (process.env.GITHUB_TOKEN) {
-      headers.Authorization = `token ${process.env.GITHUB_TOKEN}`;
-    }
-    const response = await fetch(STATS_REPO_API, { headers });
-    if (!response.ok) {
-      return [];
-    }
-    const items = (await response.json()) as { name: string; type: string }[];
-
-    const releaseDirs = items
-      .filter((item) => item.type === 'dir' && item.name.startsWith('release-'))
-      .map((item) => item.name);
-
-    releaseDirs.sort((a, b) => {
-      const parse = (s: string) =>
-        s
-          .replace(/^release-/u, '')
-          .split('.')
-          .map(Number);
-      const av = parse(a);
-      const bv = parse(b);
-      for (let i = 0; i < Math.max(av.length, bv.length); i++) {
-        const diff = (bv[i] ?? 0) - (av[i] ?? 0);
-        if (diff !== 0) {
-          return diff;
-        }
-      }
-      return 0;
-    });
+type CollectedMetricValues = {
+  [K in keyof HistoricalBaselineMetrics]: number[];
+};
 
-    return releaseDirs;
-  } catch {
-    return [];
-  }
-}
+type CollectedData = Record<string, Record<string, CollectedMetricValues>>;
 
 /**
- * Fetches historical performance data from extension_benchmark_stats,
- * always resolving to the latest release branch that has data.
- *
- * Strategy (in order):
- * 1. Try the current PR target branch (GITHUB_BASE_REF).
- * 2. If no data yet (e.g. newly cut release branch), walk release branches
- * in descending semver order and use the first one that has data.
- * 3. Return null if nothing is found.
- *
- * This ensures every PR compares against the most recently released baseline,
- * even on a brand-new release branch with no history yet.
+ * Collects metric values from a single benchmark result into the accumulator.
  *
- * @param baseBranch - PR target branch (e.g. "release/12.6.0").
- * Defaults to GITHUB_BASE_REF, falling back to "main".
- * @returns Reference map (benchmarkName → metric → mean), or null if unavailable.
+ * @param key - Accumulator key (`presetName/benchmarkName`).
+ * @param result - The benchmark entry to read from.
+ * @param collected - Mutable accumulator map.
  */
-export async function fetchHistoricalPerformanceData(
-  baseBranch: string = process.env.GITHUB_BASE_REF || 'main',
-): Promise<HistoricalBaselineReference | null> {
-  const safeBranch = sanitizeBranch(baseBranch);
-
-  // 1. Try the target branch first
-  const currentData = await fetchPerformanceFile(safeBranch);
-  if (currentData && Object.keys(currentData).length > 0) {
-    const result = aggregateHistoricalData(currentData);
-    if (Object.keys(result).length > 0) {
-      return result;
-    }
+function collectMetrics(
+  key: string,
+  result: Partial<BenchmarkResults>,
+  collected: CollectedData,
+): void {
+  if (!result.mean || typeof result.mean !== 'object') {
+    return;
   }
-
-  // 2. No data on this branch yet — find the latest release branch with data
-  const releaseBranches = await listReleaseBranchesByVersion();
-
-  for (const branch of releaseBranches) {
-    if (branch === safeBranch) {
-      continue;
+  if (!collected[key]) {
+    collected[key] = {};
+  }
+  for (const metricName of Object.keys(result.mean)) {
+    if (!collected[key][metricName]) {
+      collected[key][metricName] = { mean: [], stdDev: [], p75: [], p95: [] };
     }
-    const data = await fetchPerformanceFile(branch);
-    if (data && Object.keys(data).length > 0) {
-      const result = aggregateHistoricalData(data);
-      if (Object.keys(result).length > 0) {
-        return result;
+    const bucket = collected[key][metricName];
+    for (const statKey of Object.values(STAT_KEY)) {
+      const raw = (result[statKey] as Record<string, unknown> | undefined)?.[
+        metricName
+      ];
+      const arr = bucket[statKey];
+      if (typeof raw === 'number' && !Number.isNaN(raw) && arr !== undefined) {
+        arr.push(raw);
       }
     }
   }
-
-  return null;
 }
 
 /**
- * Collects metric values from a single benchmark result into the accumulator.
+ * Accumulates metric values for all presets in a single commit.
  *
- * @param benchmarkName - Key to accumulate under.
- * @param result - The benchmark entry to read from.
+ * @param commitData - The commit entry to process.
  * @param collected - Mutable accumulator map.
  */
-type CollectedMetricValues = {
-  [K in keyof HistoricalBaselineMetrics]: number[];
-};
-
-function collectMetrics(
-  benchmarkName: string,
-  result: Partial<BenchmarkResults>,
-  collected: Record<string, Record<string, CollectedMetricValues>>,
+function collectCommitPresets(
+  commitData: HistoricalCommitEntry,
+  collected: CollectedData,
 ): void {
-  if (!result.mean || typeof result.mean !== 'object') {
+  if (!commitData.presets) {
     return;
   }
-
-  if (!collected[benchmarkName]) {
-    collected[benchmarkName] = {};
-  }
-
-  const toNumber = (value: unknown): number | undefined => {
-    if (typeof value === 'number') {
-      return isNaN(value) ? undefined : value;
+  for (const [presetName, presetEntry] of Object.entries(commitData.presets)) {
+    if (!presetEntry || typeof presetEntry !== 'object') {
+      continue;
     }
-    const parsed = parseFloat(String(value));
-    return isNaN(parsed) ? undefined : parsed;
-  };
-
-  for (const metricName of Object.keys(result.mean)) {
-    if (!collected[benchmarkName][metricName]) {
-      collected[benchmarkName][metricName] = { mean: [], p75: [], p95: [] };
+    for (const [benchmarkName, result] of Object.entries(presetEntry)) {
+      collectMetrics(`${presetName}/${benchmarkName}`, result, collected);
     }
-    const bucket = collected[benchmarkName][metricName];
+  }
+}
 
-    const meanVal = toNumber(
-      (result.mean as Record<string, unknown>)[metricName],
-    );
-    if (meanVal !== undefined) {
-      bucket.mean.push(meanVal);
+/**
+ * Converts averaged CollectedMetricValues for one benchmark key into
+ * HistoricalBaselineMetrics entries, skipping metrics with no valid data.
+ *
+ * @param name - Benchmark key (used only for warning messages).
+ * @param metrics - Collected arrays of values per metric.
+ * @returns Map of metric name → baseline metrics.
+ */
+function buildMetricBaselines(
+  name: string,
+  metrics: Record<string, CollectedMetricValues>,
+): Record<string, HistoricalBaselineMetrics> {
+  const result: Record<string, HistoricalBaselineMetrics> = {};
+  for (const [metric, values] of Object.entries(metrics)) {
+    if (values.mean.length === 0) {
+      continue;
     }
-
-    const p75Val = toNumber(
-      (result.p75 as Record<string, unknown> | undefined)?.[metricName],
-    );
-    if (p75Val !== undefined) {
-      bucket.p75.push(p75Val);
+    const meanVal = mean(values.mean);
+    if (Number.isNaN(meanVal)) {
+      continue;
     }
-
-    const p95Val = toNumber(
-      (result.p95 as Record<string, unknown> | undefined)?.[metricName],
-    );
-    if (p95Val !== undefined) {
-      bucket.p95.push(p95Val);
+    if (values.p75.length === 0) {
+      console.warn(`No p75 data for ${name}/${metric}, using mean as fallback`);
+    }
+    if (values.p95.length === 0) {
+      console.warn(`No p95 data for ${name}/${metric}, using mean as fallback`);
     }
+    result[metric] = {
+      mean: meanVal,
+      ...(values.stdDev?.length ? { stdDev: mean(values.stdDev) } : {}),
+      p75: values.p75.length > 0 ? mean(values.p75) : meanVal,
+      p95: values.p95.length > 0 ? mean(values.p95) : meanVal,
+    };
   }
-}
-
-function average(values: number[]): number {
-  return values.length === 0
-    ? 0
-    : values.reduce((sum, v) => sum + v, 0) / values.length;
+  return result;
 }
 
 /**
- * Aggregates historical benchmark data from the most recent commit
+ * Aggregates historical benchmark data from the most recent commits
  * into a baseline reference keyed by benchmark name and metric,
  * with mean, p75, and p95 values.
  *
+ * Uses a window of 5 commits so that a single incomplete CI run
+ * (e.g. missing the `pageLoad` preset) doesn't wipe out the entire
+ * startup baseline, and to smooth out run-to-run variance.
+ * Values from all commits are averaged together.
+ *
  * @param data - Full historical data file contents.
  * @returns Aggregated reference map.
  */
@@ -253,63 +179,45 @@ export function aggregateHistoricalData(
   const latestCommits = Object.keys(data)
     .filter((hash) => data[hash]?.timestamp)
     .sort((a, b) => data[b].timestamp - data[a].timestamp)
-    .slice(0, 1);
-
-  const collected: Record<string, Record<string, CollectedMetricValues>> = {};
+    .slice(0, 5);
 
+  const collected: CollectedData = {};
   for (const hash of latestCommits) {
-    const commitData = data[hash];
-    if (!commitData?.presets) {
-      continue;
-    }
-
-    for (const [presetName, presetEntry] of Object.entries(
-      commitData.presets,
-    )) {
-      if (!presetEntry || typeof presetEntry !== 'object') {
-        continue;
-      }
-      for (const [benchmarkName, result] of Object.entries(presetEntry)) {
-        const key = `${presetName}/${benchmarkName}`;
-        collectMetrics(key, result, collected);
-      }
+    if (data[hash]) {
+      collectCommitPresets(data[hash], collected);
     }
   }
 
   const reference: HistoricalBaselineReference = {};
-
   for (const [name, metrics] of Object.entries(collected)) {
-    reference[name] = {};
-    for (const [metric, values] of Object.entries(metrics)) {
-      // Skip metrics where we have no valid data (all NaN)
-      if (values.mean.length === 0) {
-        continue;
-      }
-
-      const meanVal = average(values.mean);
-      // Skip if mean itself is NaN
-      if (Number.isNaN(meanVal)) {
-        continue;
-      }
-
-      if (values.p75.length === 0) {
-        console.warn(
-          `No p75 data for ${name}/${metric}, using mean as fallback`,
-        );
-      }
-      if (values.p95.length === 0) {
-        console.warn(
-          `No p95 data for ${name}/${metric}, using mean as fallback`,
-        );
-      }
-
-      reference[name][metric] = {
-        mean: meanVal,
-        p75: values.p75.length > 0 ? average(values.p75) : meanVal,
-        p95: values.p95.length > 0 ? average(values.p95) : meanVal,
-      };
+    const baselines = buildMetricBaselines(name, metrics);
+    if (Object.keys(baselines).length > 0) {
+      reference[name] = baselines;
     }
   }
-
   return reference;
 }
+
+/**
+ * Aggregates historical data and returns the baseline along with the latest commit info.
+ *
+ * @param data - Full historical data file contents.
+ * @returns Aggregated reference map with latest commit hash and timestamp.
+ */
+export function aggregateHistoricalDataWithCommit(
+  data: HistoricalPerformanceFile,
+): {
+  baseline: HistoricalBaselineReference;
+  latestCommit: string;
+  latestTimestamp: number;
+} {
+  const sortedCommits = Object.keys(data)
+    .filter((hash) => data[hash]?.timestamp)
+    .sort((a, b) => data[b].timestamp - data[a].timestamp);
+
+  const latestCommit = sortedCommits[0] || '';
+  const latestTimestamp = data[latestCommit]?.timestamp || 0;
+  const baseline = aggregateHistoricalData(data);
+
+  return { baseline, latestCommit, latestTimestamp };
+}
diff --git a/development/metamaskbot-build-announce/index.test.ts b/development/metamaskbot-build-announce/index.test.ts
index d21acdf2c48b..4a5aba6ec1e4 100644
--- a/development/metamaskbot-build-announce/index.test.ts
+++ b/development/metamaskbot-build-announce/index.test.ts
@@ -1,14 +1,3 @@
-/**
- * Tests for index.ts (the `start()` entry point).
- *
- * `start()` is immediately invoked when the module is loaded. Each test:
- * 1. Sets the required environment variables.
- * 2. Calls `jest.resetModules()` so the module loads fresh.
- * 3. Requires (dynamically) `./index` which triggers `start()`.
- * 4. Flushes the microtask queue so `start()` has time to finish.
- * 5. Asserts via the stable jest.mock references.
- */
-
 jest.mock('./artifacts');
 jest.mock('./bundle-size');
 jest.mock('./dapp-benchmarks');
diff --git a/development/metamaskbot-build-announce/index.ts b/development/metamaskbot-build-announce/index.ts
index 32352b488052..2fbb0d53268d 100644
--- a/development/metamaskbot-build-announce/index.ts
+++ b/development/metamaskbot-build-announce/index.ts
@@ -3,6 +3,7 @@ import { getArtifactLinks, buildArtifactsBody } from './artifacts';
 import { buildBundleSizeDiffSection } from './bundle-size';
 import { getDappBenchmarkComment } from './dapp-benchmarks';
 import { buildPerformanceBenchmarksSection } from './performance-benchmarks';
+import { buildTestPlanSection } from './test-plan';
 import { buildSectionWithFallback, postCommentWithMetamaskBot } from './utils';
 
 start().catch(console.error);
@@ -73,10 +74,10 @@ async function start(): Promise<void> {
 
   // Add AI-generated test plan section when a test plan was generated.
   if (TEST_PLAN_VERSION) {
-    const testPlanFileName = `test-plan-${TEST_PLAN_VERSION}.json`;
-    const testPlanUrl = `${HOST_URL}/build-test-plan/builds/${testPlanFileName}`;
-    const testPlanLink = `<a href="${testPlanUrl}">${testPlanFileName}</a>`;
-    commentBody += `AI generated test plan: ${testPlanLink}\n\n`;
+    commentBody += await buildSectionWithFallback(
+      () => buildTestPlanSection(HOST_URL, TEST_PLAN_VERSION),
+      'AI Test Plan',
+    );
   }
 
   await postCommentWithMetamaskBot({
@@ -85,6 +86,5 @@ async function start(): Promise<void> {
     repository: REPOSITORY,
     prNumber: PR_NUMBER,
     commentToken: PR_COMMENT_TOKEN,
-    optionalLog: `Announcement:\n${commentBody}`,
   });
 }
diff --git a/development/metamaskbot-build-announce/performance-benchmarks.test.ts b/development/metamaskbot-build-announce/performance-benchmarks.test.ts
index f2ba6c338b18..174181baa8e9 100644
--- a/development/metamaskbot-build-announce/performance-benchmarks.test.ts
+++ b/development/metamaskbot-build-announce/performance-benchmarks.test.ts
@@ -1,385 +1,337 @@
+import { readFile } from 'fs/promises';
 import type { BenchmarkResults } from '../../shared/constants/benchmarks';
+import * as historicalComparison from './historical-comparison';
+import { COMPARISON_SEVERITY } from './comparison-utils';
 import {
-  buildTableRows,
   buildBenchmarkSection,
   extractEntries,
+  fetchBenchmarkJson,
   fetchBenchmarkEntries,
   buildPerformanceBenchmarksSection,
+  computeEntryHealth,
+  EntryHealth,
+  getUserJourneyBenchmarkBuildTypesForCurrentRun,
   type FetchBenchmarkResult,
+  type BenchmarkEntry,
 } from './performance-benchmarks';
 
-const mockUserActionsJson: Record<string, BenchmarkResults> = {
+jest.mock('fs/promises');
+
+const makeEntry = (
+  overrides: Partial<BenchmarkEntry> = {},
+): BenchmarkEntry => ({
+  benchmarkName: 'loadNewAccount',
+  presetName: 'interactionUserActions',
+  platform: 'chrome',
+  buildType: 'browserify',
+  mean: { loadNewAccount: 523 },
+  stdDev: { loadNewAccount: 45 },
+  p75: { loadNewAccount: 550 },
+  p95: { loadNewAccount: 612 },
+  ...overrides,
+});
+
+const withEntries = (entries: BenchmarkEntry[]): FetchBenchmarkResult => ({
+  entries,
+  missingPresets: [],
+});
+
+const BASELINE_METRICS_PASS = {
+  loadNewAccount: { mean: 540, stdDev: 45, p75: 560, p95: 620 },
+};
+const BASELINE_PASS = {
+  'interactionUserActions/loadNewAccount': BASELINE_METRICS_PASS,
+};
+
+const BASELINE_600 = {
+  'interactionUserActions/loadNewAccount': {
+    loadNewAccount: { mean: 540, stdDev: 30, p75: 540, p95: 600 },
+  },
+};
+
+describe('getUserJourneyBenchmarkBuildTypesForCurrentRun', () => {
+  const originalEvent = process.env.GITHUB_EVENT_NAME;
+  const originalRef = process.env.GITHUB_REF;
+
+  afterEach(() => {
+    if (originalEvent === undefined) {
+      delete process.env.GITHUB_EVENT_NAME;
+    } else {
+      process.env.GITHUB_EVENT_NAME = originalEvent;
+    }
+    if (originalRef === undefined) {
+      delete process.env.GITHUB_REF;
+    } else {
+      process.env.GITHUB_REF = originalRef;
+    }
+  });
+
+  it('returns browserify only when env is unset (local / tests)', () => {
+    delete process.env.GITHUB_EVENT_NAME;
+    delete process.env.GITHUB_REF;
+
+    expect(getUserJourneyBenchmarkBuildTypesForCurrentRun()).toStrictEqual([
+      'browserify',
+    ]);
+  });
+
+  it('returns browserify only on pull_request (no webpack user-journey artifacts)', () => {
+    process.env.GITHUB_EVENT_NAME = 'pull_request';
+    process.env.GITHUB_REF = 'refs/pull/42/merge';
+
+    expect(getUserJourneyBenchmarkBuildTypesForCurrentRun()).toStrictEqual([
+      'browserify',
+    ]);
+  });
+
+  it('returns browserify only on push to a feature branch', () => {
+    process.env.GITHUB_EVENT_NAME = 'push';
+    process.env.GITHUB_REF = 'refs/heads/chore/foo';
+
+    expect(getUserJourneyBenchmarkBuildTypesForCurrentRun()).toStrictEqual([
+      'browserify',
+    ]);
+  });
+
+  it('returns browserify and webpack on push to main (benchmarks-webpack-perf runs)', () => {
+    process.env.GITHUB_EVENT_NAME = 'push';
+    process.env.GITHUB_REF = 'refs/heads/main';
+
+    expect(getUserJourneyBenchmarkBuildTypesForCurrentRun()).toStrictEqual([
+      'browserify',
+      'webpack',
+    ]);
+  });
+
+  it('returns browserify and webpack on push to release branch', () => {
+    process.env.GITHUB_EVENT_NAME = 'push';
+    process.env.GITHUB_REF = 'refs/heads/release/12.0.0';
+
+    expect(getUserJourneyBenchmarkBuildTypesForCurrentRun()).toStrictEqual([
+      'browserify',
+      'webpack',
+    ]);
+  });
+});
+
+const MOCK_PAYLOAD: Record<string, BenchmarkResults> = {
   loadNewAccount: {
-    testTitle: 'benchmark-user-actions-load-new-account',
+    testTitle: 'benchmark-load-new-account',
     persona: 'standard',
-    mean: { loadNewAccount: 523.4 },
+    mean: { loadNewAccount: 523 },
     min: { loadNewAccount: 480 },
     max: { loadNewAccount: 620 },
-    stdDev: { loadNewAccount: 45.2 },
+    stdDev: { loadNewAccount: 45 },
     p75: { loadNewAccount: 550 },
     p95: { loadNewAccount: 612 },
   },
-  confirmTx: {
-    testTitle: 'benchmark-user-actions-confirm-tx',
-    persona: 'standard',
-    mean: { confirmTx: 3456.7 },
-    min: { confirmTx: 3100 },
-    max: { confirmTx: 3900 },
-    stdDev: { confirmTx: 210.3 },
-    p75: { confirmTx: 3600 },
-    p95: { confirmTx: 3812 },
-  },
-  bridgeUserActions: {
-    testTitle: 'benchmark-user-actions-bridge',
-    persona: 'standard',
-    mean: { bridgePageLoad: 200.1, bridgeTokenSwitch: 150.8 },
-    min: { bridgePageLoad: 180, bridgeTokenSwitch: 130 },
-    max: { bridgePageLoad: 260, bridgeTokenSwitch: 190 },
-    stdDev: { bridgePageLoad: 18.5, bridgeTokenSwitch: 12.3 },
-    p75: { bridgePageLoad: 215, bridgeTokenSwitch: 160 },
-    p95: { bridgePageLoad: 245, bridgeTokenSwitch: 178 },
-  },
-};
-
-const mockPerformanceOnboardingJson: Record<string, BenchmarkResults> = {
-  onboardingImportWallet: {
-    testTitle: 'benchmark-onboarding-import-wallet',
-    persona: 'standard',
-    mean: {
-      importWalletToSocialScreen: 209,
-      srpButtonToSrpForm: 53,
-      confirmSrpToPasswordForm: 150,
-      doneButtonToHomeScreen: 8500,
-    },
-    min: {
-      importWalletToSocialScreen: 170,
-      srpButtonToSrpForm: 40,
-      confirmSrpToPasswordForm: 120,
-      doneButtonToHomeScreen: 7500,
-    },
-    max: {
-      importWalletToSocialScreen: 310,
-      srpButtonToSrpForm: 80,
-      confirmSrpToPasswordForm: 210,
-      doneButtonToHomeScreen: 11000,
-    },
-    stdDev: {
-      importWalletToSocialScreen: 32,
-      srpButtonToSrpForm: 8,
-      confirmSrpToPasswordForm: 20,
-      doneButtonToHomeScreen: 600,
-    },
-    p75: {
-      importWalletToSocialScreen: 230,
-      srpButtonToSrpForm: 58,
-      confirmSrpToPasswordForm: 165,
-      doneButtonToHomeScreen: 9000,
-    },
-    p95: {
-      importWalletToSocialScreen: 280,
-      srpButtonToSrpForm: 70,
-      confirmSrpToPasswordForm: 195,
-      doneButtonToHomeScreen: 10200,
-    },
-  },
-};
-
-const mockPerformanceAssetsJson: Record<string, BenchmarkResults> = {
-  assetDetails: {
-    testTitle: 'benchmark-asset-details',
-    persona: 'powerUser',
-    mean: { assetClickToPriceChart: 4200 },
-    min: { assetClickToPriceChart: 3800 },
-    max: { assetClickToPriceChart: 5500 },
-    stdDev: { assetClickToPriceChart: 350 },
-    p75: { assetClickToPriceChart: 4500 },
-    p95: { assetClickToPriceChart: 5100 },
-  },
 };
 
 describe('extractEntries', () => {
-  it('maps all entries from the data object', () => {
-    const entries = extractEntries(mockUserActionsJson);
-    expect(entries).toHaveLength(Object.keys(mockUserActionsJson).length);
-    expect(entries.map((e) => e.benchmarkName)).toContain('loadNewAccount');
-    expect(entries.map((e) => e.benchmarkName)).toContain('confirmTx');
+  it('maps entries, propagating presetName, platform, and buildType', () => {
+    const [entry] = extractEntries(
+      MOCK_PAYLOAD,
+      'interactionUserActions',
+      'chrome',
+      'browserify',
+    );
+
+    expect(entry.benchmarkName).toBe('loadNewAccount');
+    expect(entry.presetName).toBe('interactionUserActions');
+    expect(entry.platform).toBe('chrome');
+    expect(entry.buildType).toBe('browserify');
   });
 
-  it('extracts all statistical fields', () => {
-    const entries = extractEntries({
-      loadNewAccount: mockUserActionsJson.loadNewAccount,
-    });
+  it('includes mean/stdDev/p75/p95 and excludes min/max', () => {
+    const [entry] = extractEntries(MOCK_PAYLOAD);
 
-    expect(entries).toHaveLength(1);
-    expect(entries[0].mean).toStrictEqual({ loadNewAccount: 523.4 });
-    expect(entries[0].min).toStrictEqual({ loadNewAccount: 480 });
-    expect(entries[0].max).toStrictEqual({ loadNewAccount: 620 });
-    expect(entries[0].stdDev).toStrictEqual({ loadNewAccount: 45.2 });
-    expect(entries[0].p75).toStrictEqual({ loadNewAccount: 550 });
-    expect(entries[0].p95).toStrictEqual({ loadNewAccount: 612 });
+    expect(entry.mean).toStrictEqual({ loadNewAccount: 523 });
+    expect(entry.stdDev).toStrictEqual({ loadNewAccount: 45 });
+    expect(entry.p75).toStrictEqual({ loadNewAccount: 550 });
+    expect(entry.p95).toStrictEqual({ loadNewAccount: 612 });
+    expect(entry).not.toHaveProperty('min');
+    expect(entry).not.toHaveProperty('max');
   });
 
-  it('filters out entries with null mean', () => {
-    const entries = extractEntries({
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      nullMean: { ...mockUserActionsJson.loadNewAccount, mean: null as any },
-      loadNewAccount: mockUserActionsJson.loadNewAccount,
-    });
+  it('defaults presetName, platform, and buildType to empty string', () => {
+    const [entry] = extractEntries(MOCK_PAYLOAD);
 
-    expect(entries).toHaveLength(1);
-    expect(entries[0].benchmarkName).toBe('loadNewAccount');
+    expect(entry.presetName).toBe('');
+    expect(entry.platform).toBe('');
+    expect(entry.buildType).toBe('');
   });
 
-  it('filters out entries with undefined mean', () => {
+  it('filters out null entries', () => {
     const entries = extractEntries({
-      undefinedMean: {
-        ...mockUserActionsJson.loadNewAccount,
-        mean: undefined as unknown as BenchmarkResults['mean'],
-      },
-      loadNewAccount: mockUserActionsJson.loadNewAccount,
+      nullEntry: null,
+      valid: MOCK_PAYLOAD.loadNewAccount,
     });
 
     expect(entries).toHaveLength(1);
-    expect(entries[0].benchmarkName).toBe('loadNewAccount');
+    expect(entries[0].benchmarkName).toBe('valid');
   });
 });
 
-describe('buildTableRows', () => {
-  it('produces one row per metric with correct cell values', () => {
-    const entries = extractEntries(mockUserActionsJson);
-    const rows = buildTableRows(entries);
-
-    expect(rows).toHaveLength(4);
+describe('computeEntryHealth', () => {
+  it('returns pass when no baseline is provided', () => {
+    expect(computeEntryHealth(makeEntry(), undefined)).toBe(EntryHealth.Pass);
   });
 
-  it('renders loadNewAccount row with correct rounded values', () => {
-    const entries = extractEntries({
-      loadNewAccount: mockUserActionsJson.loadNewAccount,
-    });
-    const [row] = buildTableRows(entries);
-
-    expect(row).toContain('Load New Account');
-    expect(row).toContain('loadNewAccount');
-    expect(row).toContain('>523<');
-    expect(row).toContain('>480<');
-    expect(row).toContain('>620<');
-    expect(row).toContain('>45<');
-    expect(row).toContain('>550<');
-    expect(row).toContain('>612<');
+  it('returns pass when metrics are within threshold', () => {
+    expect(computeEntryHealth(makeEntry(), BASELINE_METRICS_PASS)).toBe(
+      EntryHealth.Pass,
+    );
   });
 
-  it('renders confirmTx row with correct rounded values', () => {
-    const entries = extractEntries({
-      confirmTx: mockUserActionsJson.confirmTx,
-    });
-    const [row] = buildTableRows(entries);
-
-    expect(row).toContain('Confirm Tx');
-    expect(row).toContain('confirmTx');
-    expect(row).toContain('>3457<');
-    expect(row).toContain('>3100<');
-    expect(row).toContain('>3900<');
-    expect(row).toContain('>210<');
-    expect(row).toContain('>3600<');
-    expect(row).toContain('>3812<');
+  it('returns pass when p95 is above baseline but within absolute threshold', () => {
+    expect(
+      computeEntryHealth(
+        makeEntry({ p95: { loadNewAccount: 636 } }),
+        BASELINE_600['interactionUserActions/loadNewAccount'],
+      ),
+    ).toBe(EntryHealth.Pass);
   });
 
-  it('renders multi-metric entry with rowspan on first row only', () => {
-    const entries = extractEntries({
-      bridgeUserActions: mockUserActionsJson.bridgeUserActions,
-    });
-    const rows = buildTableRows(entries);
-
-    expect(rows).toHaveLength(2);
-
-    expect(rows[0]).toContain('rowspan="2"');
-    expect(rows[0]).toContain('Bridge User Actions');
-    expect(rows[0]).toContain('bridgePageLoad');
-    expect(rows[0]).toContain('>200<');
-    expect(rows[0]).toContain('>180<');
-    expect(rows[0]).toContain('>260<');
-    expect(rows[0]).toContain('>19<');
-    expect(rows[0]).toContain('>215<');
-    expect(rows[0]).toContain('>245<');
-
-    expect(rows[1]).not.toContain('Bridge User Actions');
-    expect(rows[1]).toContain('bridgeTokenSwitch');
-    expect(rows[1]).toContain('>151<');
-    expect(rows[1]).toContain('>130<');
-    expect(rows[1]).toContain('>190<');
-    expect(rows[1]).toContain('>12<');
-    expect(rows[1]).toContain('>160<');
-    expect(rows[1]).toContain('>178<');
-  });
-
-  it('renders performance metrics with correct values per row', () => {
-    const entries = extractEntries(mockPerformanceOnboardingJson);
-    const rows = buildTableRows(entries);
-
-    expect(rows).toHaveLength(4);
-
-    expect(rows[0]).toContain('rowspan="4"');
-    expect(rows[0]).toContain('Onboarding Import Wallet');
-    expect(rows[0]).toContain('importWalletToSocialScreen');
-    expect(rows[0]).toContain('>209<');
-    expect(rows[0]).toContain('>170<');
-    expect(rows[0]).toContain('>310<');
-    expect(rows[0]).toContain('>32<');
-    expect(rows[0]).toContain('>230<');
-    expect(rows[0]).toContain('>280<');
-
-    expect(rows[1]).toContain('srpButtonToSrpForm');
-    expect(rows[1]).toContain('>53<');
-    expect(rows[1]).toContain('>40<');
-    expect(rows[1]).toContain('>80<');
-    expect(rows[1]).toContain('>8<');
-    expect(rows[1]).toContain('>58<');
-    expect(rows[1]).toContain('>70<');
-
-    expect(rows[2]).toContain('confirmSrpToPasswordForm');
-    expect(rows[2]).toContain('>150<');
-    expect(rows[2]).toContain('>120<');
-    expect(rows[2]).toContain('>210<');
-    expect(rows[2]).toContain('>20<');
-    expect(rows[2]).toContain('>165<');
-    expect(rows[2]).toContain('>195<');
-
-    expect(rows[3]).toContain('doneButtonToHomeScreen');
-    expect(rows[3]).toContain('>8500<');
-    expect(rows[3]).toContain('>7500<');
-    expect(rows[3]).toContain('>11000<');
-    expect(rows[3]).toContain('>600<');
-    expect(rows[3]).toContain('>9000<');
-    expect(rows[3]).toContain('>10200<');
-  });
-
-  it('renders dash when a metric key is missing from a stats field', () => {
-    const rows = buildTableRows([
-      {
-        benchmarkName: 'partialStats',
-        mean: { myMetric: 100 },
-        min: {},
-        max: {},
-        stdDev: {},
-        p75: {},
-        p95: {},
-      },
-    ]);
+  it('returns pass even when p95 is >10% above baseline with no registered threshold', () => {
+    expect(
+      computeEntryHealth(
+        makeEntry({ p95: { loadNewAccount: 672 } }),
+        BASELINE_600['interactionUserActions/loadNewAccount'],
+      ),
+    ).toBe(EntryHealth.Pass);
+  });
 
-    expect(rows).toHaveLength(1);
-    expect(rows[0]).toContain('>100<');
-    const dashes = rows[0].match(/>-</gu);
-    expect(dashes).toHaveLength(5);
+  it('returns pass when the metric key is absent from baseline', () => {
+    expect(
+      computeEntryHealth(makeEntry(), {
+        differentMetric: { mean: 600, stdDev: 44, p75: 620, p95: 680 },
+      }),
+    ).toBe(EntryHealth.Pass);
   });
-});
 
-describe('buildBenchmarkSection', () => {
-  const noMissing = (
-    entries: ReturnType<typeof extractEntries>,
-  ): FetchBenchmarkResult => ({
-    entries,
-    missingPresets: [],
+  it('skips a percentile when its value is absent from the entry', () => {
+    expect(
+      computeEntryHealth(makeEntry({ p75: {} }), BASELINE_METRICS_PASS),
+    ).toBe(EntryHealth.Pass);
   });
 
-  describe('interaction benchmarks', () => {
-    const result = noMissing(extractEntries(mockUserActionsJson));
+  describe('Layer 1 absolute threshold (standardHome, CI=true)', () => {
+    const originalCI = process.env.CI;
 
-    it('wraps rows in a collapsible details section', () => {
-      const html = buildBenchmarkSection(result, '👆 Interaction Benchmarks');
+    beforeEach(() => {
+      process.env.CI = 'true';
+    });
 
-      expect(html).toContain('<details>');
-      expect(html).toContain('👆 Interaction Benchmarks');
-      expect(html).toContain('<table>');
-      expect(html).toContain('</details>');
+    afterEach(() => {
+      if (originalCI === undefined) {
+        delete process.env.CI;
+      } else {
+        process.env.CI = originalCI;
+      }
     });
 
-    it('includes correct column headers', () => {
-      const html = buildBenchmarkSection(result, '👆 Interaction Benchmarks');
+    it('returns fail when values exceed the absolute fail threshold', () => {
+      const entry = makeEntry({
+        benchmarkName: 'startupStandardHome',
+        presetName: 'startupStandardHome',
+        mean: { uiStartup: 4000 },
+        stdDev: { uiStartup: 200 },
+        p75: { uiStartup: 4500 },
+        p95: { uiStartup: 6000 },
+      });
+      expect(computeEntryHealth(entry, undefined)).toBe(EntryHealth.Fail);
+    });
 
-      expect(html).toContain('<th>Benchmark</th>');
-      expect(html).toContain('<th>Metric</th>');
-      expect(html).toContain('<th>Mean (ms)</th>');
-      expect(html).toContain('<th>Min (ms)</th>');
-      expect(html).toContain('<th>Max (ms)</th>');
-      expect(html).toContain('<th>Std Dev (ms)</th>');
-      expect(html).toContain('<th>P75 (ms)</th>');
-      expect(html).toContain('<th>P95 (ms)</th>');
-    });
-
-    it('returns empty string when no entries and no missing presets', () => {
-      const empty: FetchBenchmarkResult = { entries: [], missingPresets: [] };
-      expect(buildBenchmarkSection(empty, '👆 Interaction Benchmarks')).toBe(
-        '',
-      );
+    it('returns warn when values exceed warn but not fail threshold', () => {
+      const entry = makeEntry({
+        benchmarkName: 'startupStandardHome',
+        presetName: 'startupStandardHome',
+        mean: { uiStartup: 2800 },
+        stdDev: { uiStartup: 100 },
+        p75: { uiStartup: 3200 },
+        p95: { uiStartup: 4200 },
+      });
+      expect(computeEntryHealth(entry, undefined)).toBe(EntryHealth.Warn);
     });
   });
+});
 
-  describe('user journey benchmarks', () => {
-    const entries = [
-      ...extractEntries(mockPerformanceOnboardingJson),
-      ...extractEntries(mockPerformanceAssetsJson),
-    ];
-    const result = noMissing(entries);
+describe('fetchBenchmarkJson', () => {
+  const HOST = 'https://ci.example.com';
+  const mockFetch = jest.fn();
 
-    it('wraps rows in a collapsible details section', () => {
-      const html = buildBenchmarkSection(result, '🧭 User Journey Benchmarks');
+  afterEach(() => {
+    mockFetch.mockReset();
+    (readFile as jest.Mock).mockReset();
+  });
 
-      expect(html).toContain('<details>');
-      expect(html).toContain('🧭 User Journey Benchmarks');
-      expect(html).toContain('<table>');
-      expect(html).toContain('</details>');
+  describe('local filesystem (BENCHMARK_RESULTS_DIR set)', () => {
+    beforeEach(() => {
+      process.env.BENCHMARK_RESULTS_DIR = '/tmp/benchmarks';
     });
 
-    it('includes correct column headers', () => {
-      const html = buildBenchmarkSection(result, '🧭 User Journey Benchmarks');
-
-      expect(html).toContain('<th>Benchmark</th>');
-      expect(html).toContain('<th>Metric</th>');
-      expect(html).toContain('<th>Mean (ms)</th>');
-      expect(html).toContain('<th>Min (ms)</th>');
-      expect(html).toContain('<th>Max (ms)</th>');
+    afterEach(() => {
+      delete process.env.BENCHMARK_RESULTS_DIR;
     });
 
-    it('includes entries from all presets', () => {
-      const html = buildBenchmarkSection(result, '🧭 User Journey Benchmarks');
+    it('reads and parses JSON from the correct local file path', async () => {
+      (readFile as jest.Mock).mockResolvedValue(JSON.stringify(MOCK_PAYLOAD));
+
+      const result = await fetchBenchmarkJson(
+        HOST,
+        'chrome',
+        'browserify',
+        'myPreset',
+      );
 
-      expect(html).toContain('Onboarding Import Wallet');
-      expect(html).toContain('Asset Details');
+      expect(readFile as jest.Mock).toHaveBeenCalledWith(
+        '/tmp/benchmarks/benchmark-chrome-browserify-myPreset.json',
+        'utf8',
+      );
+      expect(result).toStrictEqual(MOCK_PAYLOAD);
     });
 
-    it('returns empty string when no entries and no missing presets', () => {
-      const empty: FetchBenchmarkResult = { entries: [], missingPresets: [] };
-      expect(buildBenchmarkSection(empty, '🧭 User Journey Benchmarks')).toBe(
-        '',
+    it('returns null when the local file does not exist', async () => {
+      (readFile as jest.Mock).mockRejectedValue(
+        Object.assign(new Error('ENOENT'), { code: 'ENOENT' }),
       );
+
+      expect(
+        await fetchBenchmarkJson(HOST, 'chrome', 'browserify', 'missing'),
+      ).toBeNull();
     });
   });
 
-  describe('missing data warnings', () => {
-    it('renders warning when presets are missing', () => {
-      const result: FetchBenchmarkResult = {
-        entries: [],
-        missingPresets: ['chrome/browserify/interactionUserActions'],
-      };
-      const html = buildBenchmarkSection(result, '👆 Interaction Benchmarks');
+  describe('HTTP fetch fallback (BENCHMARK_RESULTS_DIR not set)', () => {
+    beforeEach(() => {
+      global.fetch = mockFetch;
+    });
 
-      expect(html).toContain('⚠️');
-      expect(html).toContain('Missing data');
-      expect(html).toContain('chrome/browserify/interactionUserActions');
-      expect(html).not.toContain('<table>');
+    it('returns parsed JSON when fetch succeeds', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MOCK_PAYLOAD),
+      } as unknown as Response);
+
+      expect(
+        await fetchBenchmarkJson(HOST, 'chrome', 'browserify', 'myPreset'),
+      ).toStrictEqual(MOCK_PAYLOAD);
     });
 
-    it('renders both table and warning when some presets are missing', () => {
-      const result: FetchBenchmarkResult = {
-        entries: extractEntries(mockUserActionsJson),
-        missingPresets: ['firefox/browserify/interactionUserActions'],
-      };
-      const html = buildBenchmarkSection(result, '👆 Interaction Benchmarks');
+    it('returns null when fetch returns a non-ok response', async () => {
+      mockFetch.mockResolvedValue({ ok: false } as Response);
 
-      expect(html).toContain('⚠️');
-      expect(html).toContain('firefox/browserify/interactionUserActions');
-      expect(html).toContain('<table>');
-      expect(html).toContain('Load New Account');
+      expect(
+        await fetchBenchmarkJson(HOST, 'chrome', 'browserify', 'myPreset'),
+      ).toBeNull();
+    });
+
+    it('returns null when fetch throws a network error', async () => {
+      mockFetch.mockRejectedValue(new Error('network error'));
+
+      expect(
+        await fetchBenchmarkJson(HOST, 'chrome', 'browserify', 'myPreset'),
+      ).toBeNull();
     });
   });
 });
@@ -396,34 +348,24 @@ describe('fetchBenchmarkEntries', () => {
     mockFetch.mockReset();
   });
 
-  it('returns entries when fetch succeeds', async () => {
-    const payload: Record<string, BenchmarkResults> = {
-      confirmTx: {
-        testTitle: 'benchmark-confirm-tx',
-        persona: 'standard',
-        mean: { confirmTx: 1000 },
-        min: { confirmTx: 900 },
-        max: { confirmTx: 1100 },
-        stdDev: { confirmTx: 50 },
-        p75: { confirmTx: 1050 },
-        p95: { confirmTx: 1090 },
-      },
-    };
+  it('returns entries with preset, platform, and buildType on success', async () => {
     mockFetch.mockResolvedValue({
       ok: true,
-      json: () => Promise.resolve(payload),
+      json: () => Promise.resolve(MOCK_PAYLOAD),
     } as unknown as Response);
 
     const { entries, missingPresets } = await fetchBenchmarkEntries(HOST, [
       'interactionUserActions',
     ]);
 
-    expect(entries.length).toBeGreaterThan(0);
-    expect(entries[0].benchmarkName).toBe('confirmTx');
+    expect(entries[0].benchmarkName).toBe('loadNewAccount');
+    expect(entries[0].presetName).toBe('interactionUserActions');
+    expect(entries[0].platform).toBeTruthy();
+    expect(entries[0].buildType).toBeTruthy();
     expect(missingPresets).toHaveLength(0);
   });
 
-  it('records missing presets when fetch returns non-ok', async () => {
+  it('records missing presets when fetch fails', async () => {
     mockFetch.mockResolvedValue({ ok: false } as Response);
 
     const { entries, missingPresets } = await fetchBenchmarkEntries(HOST, [
@@ -431,19 +373,371 @@ describe('fetchBenchmarkEntries', () => {
     ]);
 
     expect(entries).toHaveLength(0);
-    expect(missingPresets.length).toBeGreaterThan(0);
     expect(missingPresets[0]).toContain('interactionUserActions');
   });
 
-  it('records missing presets when fetch throws', async () => {
-    mockFetch.mockRejectedValue(new Error('network error'));
+  it('uses custom platforms and buildTypes (2 × 2 × 1 = 4 combinations)', async () => {
+    mockFetch.mockResolvedValue({ ok: false } as Response);
 
-    const { entries, missingPresets } = await fetchBenchmarkEntries(HOST, [
-      'interactionUserActions',
-    ]);
+    const { missingPresets } = await fetchBenchmarkEntries(
+      HOST,
+      ['myPreset'],
+      ['chrome', 'firefox'],
+      ['browserify', 'webpack'],
+    );
 
-    expect(entries).toHaveLength(0);
-    expect(missingPresets.length).toBeGreaterThan(0);
+    expect(missingPresets).toHaveLength(4);
+    expect(missingPresets).toContain('chrome/browserify/myPreset');
+    expect(missingPresets).toContain('firefox/webpack/myPreset');
+  });
+});
+
+describe('buildBenchmarkSection', () => {
+  it('returns empty string when there are no entries and no missing presets', () => {
+    expect(
+      buildBenchmarkSection({ entries: [], missingPresets: [] }, 'Test'),
+    ).toBe('');
+  });
+
+  it('surfaces ⚠️ warning for missing presets', () => {
+    const html = buildBenchmarkSection(
+      { entries: [], missingPresets: ['chrome/browserify/foo'] },
+      'Test',
+    );
+    expect(html).toContain('⚠️');
+    expect(html).toContain('chrome/browserify/foo');
+  });
+
+  it('renders a table with benchmark rows and combo columns', () => {
+    const html = buildBenchmarkSection(
+      withEntries([
+        makeEntry({ benchmarkName: 'loadNewAccount' }),
+        makeEntry({
+          benchmarkName: 'confirmTx',
+          mean: { confirmTx: 500 },
+          stdDev: { confirmTx: 30 },
+          p75: { confirmTx: 520 },
+          p95: { confirmTx: 540 },
+        }),
+      ]),
+      'Test',
+      BASELINE_PASS,
+    );
+
+    expect(html).toContain('<table style=');
+    expect(html).toContain('<th>chrome-browserify</th>');
+    expect(html).toContain('<td>loadNewAccount</td>');
+    expect(html).toContain('<td>confirmTx</td>');
+  });
+
+  it('shows 🟢 in the cell when p95 is above baseline but within absolute threshold', () => {
+    const html = buildBenchmarkSection(
+      withEntries([makeEntry({ p95: { loadNewAccount: 672 } })]),
+      'Test',
+      BASELINE_600,
+    );
+
+    expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+    expect(html).not.toContain(COMPARISON_SEVERITY.Warn.icon);
+  });
+
+  it('shows relative delta in bullet section when p75 is notably above baseline', () => {
+    const html = buildBenchmarkSection(
+      withEntries([
+        makeEntry({
+          p75: { loadNewAccount: 700 },
+          p95: { loadNewAccount: 720 },
+        }),
+      ]),
+      'Test',
+      BASELINE_600,
+    );
+
+    expect(html).toContain(
+      '📈 Results compared to the previous 5 runs on main',
+    );
+    expect(html).toContain('loadNewAccount/loadNewAccount');
+    expect(html).toContain('+30%');
+  });
+
+  it('shows 🟢 for passing entries even when no baseline is given', () => {
+    const html = buildBenchmarkSection(withEntries([makeEntry()]), 'Test');
+    expect(html).toContain('<table style=');
+    expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+  });
+
+  it('shows – for combos where a benchmark has no data', () => {
+    const html = buildBenchmarkSection(
+      withEntries([
+        makeEntry({
+          benchmarkName: 'loadNewAccount',
+          platform: 'chrome',
+          buildType: 'browserify',
+        }),
+        makeEntry({
+          benchmarkName: 'confirmTx',
+          platform: 'chrome',
+          buildType: 'webpack',
+          mean: { confirmTx: 500 },
+          stdDev: { confirmTx: 30 },
+          p75: { confirmTx: 520 },
+          p95: { confirmTx: 540 },
+        }),
+      ]),
+      'Test',
+      BASELINE_PASS,
+    );
+
+    expect(html).toContain('–');
+  });
+
+  it('links each cell to the entry artifact URL as [Show logs]', () => {
+    const ARTIFACT =
+      'https://cdn.example.com/benchmark-chrome-browserify-foo.json';
+    const html = buildBenchmarkSection(
+      withEntries([makeEntry({ artifactUrl: ARTIFACT })]),
+      'Test',
+      BASELINE_PASS,
+    );
+
+    expect(html).toContain(`href="${ARTIFACT}"`);
+    expect(html).toContain('[Show logs]');
+  });
+
+  it('falls back to runUrl for [Show logs] when entry has no artifactUrl', () => {
+    const RUN_URL = 'https://github.com/actions/runs/123';
+    const html = buildBenchmarkSection(
+      withEntries([makeEntry({ p95: { loadNewAccount: 672 } })]),
+      'Test',
+      BASELINE_600,
+      RUN_URL,
+    );
+
+    expect(html).toContain(`href="${RUN_URL}"`);
+    expect(html).toContain('[Show logs]');
+  });
+
+  it('resolves startup baseline via pageLoad/* key format and shows delta in bullet section', () => {
+    const entry = makeEntry({
+      benchmarkName: 'chrome-browserify-startupStandardHome',
+      presetName: 'startupStandardHome',
+      mean: { uiStartup: 1800 },
+      stdDev: { uiStartup: 100 },
+      p75: { uiStartup: 1850 },
+      p95: { uiStartup: 1980 },
+    });
+    const html = buildBenchmarkSection(withEntries([entry]), '🔌 Startup', {
+      'pageLoad/chrome-browserify-startupStandardHome': {
+        uiStartup: { mean: 1600, stdDev: 80, p75: 1650, p95: 1750 },
+      },
+    });
+
+    expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+    expect(html).toContain('startupStandardHome');
+    expect(html).toContain(
+      '📈 Results compared to the previous 5 runs on main',
+    );
+    expect(html).toContain('uiStartup');
+  });
+
+  it('uses the platform-specific baseline, not the first matching key', () => {
+    const firefoxEntry = makeEntry({
+      benchmarkName: 'standardHome',
+      presetName: 'startupStandardHome',
+      platform: 'firefox',
+      buildType: 'browserify',
+      mean: { uiStartup: 1490 },
+      stdDev: { uiStartup: 90 },
+      p75: { uiStartup: 1545 },
+      p95: { uiStartup: 1600 },
+    });
+    const html = buildBenchmarkSection(
+      withEntries([firefoxEntry]),
+      '🔌 Startup',
+      {
+        'pageLoad/chrome-browserify-startupStandardHome': {
+          uiStartup: { mean: 1380, stdDev: 80, p75: 1430, p95: 1500 },
+        },
+        'pageLoad/firefox-browserify-startupStandardHome': {
+          uiStartup: { mean: 1480, stdDev: 90, p75: 1540, p95: 1595 },
+        },
+      },
+    );
+
+    expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+    expect(html).not.toContain(`${COMPARISON_SEVERITY.Regression.icon} 1`);
+  });
+
+  it('skips metrics absent from the baseline (no false positives)', () => {
+    const entry = makeEntry({
+      p95: { loadNewAccount: 612, otherMetric: 100 },
+      p75: { loadNewAccount: 550, otherMetric: 80 },
+    });
+    const html = buildBenchmarkSection(
+      withEntries([entry]),
+      'Test',
+      BASELINE_PASS,
+    );
+
+    expect(html).not.toContain(`${COMPARISON_SEVERITY.Regression.icon} 1`);
+  });
+
+  it('skips a percentile when its value is absent from the entry', () => {
+    const html = buildBenchmarkSection(
+      withEntries([makeEntry({ p75: {} })]),
+      'Test',
+      BASELINE_PASS,
+    );
+
+    expect(html).not.toContain(`${COMPARISON_SEVERITY.Regression.icon} 1`);
+  });
+
+  it('shows 🔴 failure badge when Layer 1 absolute fail threshold is exceeded', () => {
+    const entry = makeEntry({
+      benchmarkName: 'startupStandardHome',
+      presetName: 'startupStandardHome',
+      mean: { uiStartup: 4000 },
+      stdDev: { uiStartup: 200 },
+      p75: { uiStartup: 4500 },
+      p95: { uiStartup: 6000 },
+    });
+    const html = buildBenchmarkSection(withEntries([entry]), 'Test');
+
+    expect(html).toContain(`${COMPARISON_SEVERITY.Regression.icon} 1`);
+    expect(html).toContain(COMPARISON_SEVERITY.Regression.icon);
+  });
+
+  it('returns "No regressions detected" when no entries exist but baseline is provided', () => {
+    const html = buildBenchmarkSection(
+      { entries: [], missingPresets: ['chrome/browserify/somePreset'] },
+      'Test',
+      {
+        'some/key': {
+          uiStartup: { mean: 500, stdDev: 20, p75: 550, p95: 600 },
+        },
+      },
+    );
+
+    expect(html).toContain('No regressions detected');
+  });
+
+  it('returns empty string and logs error when entry processing throws', () => {
+    const consoleSpy = jest.spyOn(console, 'log').mockImplementation();
+    const badEntry = {
+      ...makeEntry(),
+      p95: null,
+    } as unknown as BenchmarkEntry;
+
+    const html = buildBenchmarkSection(withEntries([badEntry]), 'CrashSection');
+
+    expect(html).toBe('');
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('Failed to build CrashSection'),
+    );
+    consoleSpy.mockRestore();
+  });
+
+  describe('timer details', () => {
+    it('shows only failing/warning timers when entry has multiple timers', () => {
+      const entry = makeEntry({
+        benchmarkName: 'swap',
+        mean: {
+          openSwapPageFromHome: 310,
+          fetchAndDisplaySwapQuotes: 5000,
+        },
+        p75: {
+          openSwapPageFromHome: 340,
+          fetchAndDisplaySwapQuotes: 4500,
+        },
+        p95: {
+          openSwapPageFromHome: 400,
+          fetchAndDisplaySwapQuotes: 5500,
+        },
+      });
+
+      const html = buildBenchmarkSection(withEntries([entry]), 'Test');
+
+      expect(html).not.toContain('<code>openSwapPageFromHome</code>');
+      expect(html).toContain('<code>fetchAndDisplaySwapQuotes</code>');
+    });
+
+    it('shows [Show logs] without icon when timers are present', () => {
+      const entry = makeEntry({
+        benchmarkName: 'swap',
+        mean: { timer1: 100, timer2: 200 },
+        p75: { timer1: 110, timer2: 220 },
+        p95: { timer1: 120, timer2: 240 },
+      });
+
+      const html = buildBenchmarkSection(
+        withEntries([entry]),
+        'Test',
+        undefined,
+        'https://github.com/actions/runs/123',
+      );
+      expect(html).not.toMatch(/🟢 <a href=.*\[Show logs\]<br\/>/u);
+    });
+
+    it('shows icon with [Show logs] when no timers present', () => {
+      const entry = makeEntry({
+        benchmarkName: 'loadNewAccount',
+        mean: {},
+        p75: {},
+        p95: {},
+        artifactUrl: 'https://example.com/artifact.json',
+      });
+
+      const html = buildBenchmarkSection(withEntries([entry]), 'Test');
+
+      expect(html).toContain('[Show logs]');
+      expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+      expect(html).not.toContain('<ul');
+    });
+
+    it('shows per-timer traffic lights based on thresholds (only warnings/failures)', () => {
+      const entry = makeEntry({
+        benchmarkName: 'onboardingImportWallet',
+        mean: {
+          importWalletToSocialScreen: 1000,
+          doneButtonToHomeScreen: 22000,
+        },
+        p75: {
+          importWalletToSocialScreen: 1200,
+          doneButtonToHomeScreen: 22000,
+        },
+        p95: {
+          importWalletToSocialScreen: 1500,
+          doneButtonToHomeScreen: 32000,
+        },
+      });
+
+      const html = buildBenchmarkSection(withEntries([entry]), 'Test');
+
+      expect(html).not.toContain('<code>importWalletToSocialScreen</code>');
+      expect(html).toContain('<code>doneButtonToHomeScreen</code>');
+      expect(html).toMatch(/<div>🔴/u);
+    });
+
+    it('does not show timer details for benchmarks without timer data', () => {
+      const entry = makeEntry({
+        benchmarkName: 'startupStandardHome',
+        mean: { uiStartup: 1500 },
+        p75: { uiStartup: 1600 },
+        p95: { uiStartup: 1800 },
+      });
+
+      const html = buildBenchmarkSection(
+        withEntries([entry]),
+        'Test',
+        undefined,
+        'https://github.com/actions/runs/123',
+      );
+
+      expect(html).toContain(COMPARISON_SEVERITY.Pass.icon);
+      expect(html).toContain('[Show logs]');
+      expect(html).not.toContain('<code>uiStartup</code>');
+      expect(html).not.toContain('<ul');
+    });
   });
 });
 
@@ -453,46 +747,440 @@ describe('buildPerformanceBenchmarksSection', () => {
 
   beforeEach(() => {
     global.fetch = mockFetch;
-    jest.spyOn(console, 'log').mockImplementation();
+    jest
+      .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+      .mockResolvedValue(null);
   });
 
   afterEach(() => {
-    jest.restoreAllMocks();
     mockFetch.mockReset();
+    jest.restoreAllMocks();
   });
 
-  const mockPayload: Record<string, BenchmarkResults> = {
-    confirmTx: {
-      testTitle: 'benchmark-confirm-tx',
-      persona: 'standard',
-      mean: { confirmTx: 1000 },
-      min: { confirmTx: 900 },
-      max: { confirmTx: 1100 },
-      stdDev: { confirmTx: 50 },
-      p75: { confirmTx: 1050 },
-      p95: { confirmTx: 1090 },
-    },
-  };
-
-  it('returns a collapsible section with all three subsections when data is available', async () => {
+  it('returns empty string when all fetches return empty data', async () => {
     mockFetch.mockResolvedValue({
       ok: true,
-      json: () => Promise.resolve(mockPayload),
+      json: () => Promise.resolve({}),
     } as unknown as Response);
 
-    const result = await buildPerformanceBenchmarksSection(HOST);
-
-    expect(result).toContain('<details>');
-    expect(result).toContain('⚡ Performance Benchmarks');
+    expect(await buildPerformanceBenchmarksSection(HOST)).toBe('');
   });
 
-  it('returns a section with missing preset warnings when all fetches fail', async () => {
+  it('returns section with ⚠️ warnings when fetches fail', async () => {
     mockFetch.mockResolvedValue({ ok: false } as Response);
 
-    const result = await buildPerformanceBenchmarksSection(HOST);
+    const html = await buildPerformanceBenchmarksSection(HOST);
 
-    // When all fetches fail, missing-preset warnings are shown instead of empty string
-    expect(result).toContain('⚡ Performance Benchmarks');
-    expect(result).toContain('Missing data');
+    expect(html).toContain('⚡ Performance Benchmarks');
+    expect(html).toContain('Missing data');
+  });
+
+  it('wraps content in an ⚡ Performance Benchmarks collapsible on success', async () => {
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve(MOCK_PAYLOAD),
+    } as unknown as Response);
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+
+    expect(html).toContain('<details>');
+    expect(html).toContain('⚡ Performance Benchmarks');
+  });
+
+  it('includes total pass/warn/fail counts in the outer <summary> tag', async () => {
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve(MOCK_PAYLOAD),
+    } as unknown as Response);
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+
+    expect(html).toMatch(
+      new RegExp(
+        `<summary>⚡ Performance Benchmarks \\(Total: ${COMPARISON_SEVERITY.Pass.icon} \\d+ pass · ${COMPARISON_SEVERITY.Warn.icon} \\d+ warn · ${COMPARISON_SEVERITY.Regression.icon} \\d+ fail\\)</summary>`,
+        'u',
+      ),
+    );
+  });
+
+  it('includes commit information with hash and date from baseline', async () => {
+    jest
+      .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+      .mockResolvedValue({
+        baseline: {},
+        latestCommit: 'abc1234567890def',
+        latestTimestamp: 1700000000, // Unix timestamp in seconds
+      });
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve(MOCK_PAYLOAD),
+    } as unknown as Response);
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+
+    expect(html).toContain('<strong>Baseline (latest main)</strong>');
+    expect(html).toContain('abc1234');
+    expect(html).toContain('<strong>Date</strong>');
+  });
+
+  it('links commit hash from baseline data', async () => {
+    jest
+      .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+      .mockResolvedValue({
+        baseline: {},
+        latestCommit: 'abc1234567890def',
+        latestTimestamp: 1700000000,
+      });
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve(MOCK_PAYLOAD),
+    } as unknown as Response);
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+
+    expect(html).toContain(
+      '<a href="https://github.com/MetaMask/metamask-extension/commit/abc1234567890def">abc1234</a>',
+    );
+    expect(html).toContain(
+      'https://github.com/MetaMask/metamask-extension/commit/abc1234567890def',
+    );
+  });
+
+  it('includes build logs link when available', async () => {
+    process.env.GITHUB_SERVER_URL = 'https://github.com';
+    process.env.GITHUB_REPOSITORY = 'MetaMask/metamask-extension';
+    process.env.BENCHMARK_WORKFLOW_RUN_ID = '98765';
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve(MOCK_PAYLOAD),
+    } as unknown as Response);
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+
+    expect(html).toContain('Pipeline');
+    expect(html).toContain(
+      '<a href="https://github.com/MetaMask/metamask-extension/actions/runs/98765">98765</a>',
+    );
+    expect(html).toContain(
+      'https://github.com/MetaMask/metamask-extension/actions/runs/98765',
+    );
+    expect(html).toContain('Baseline logs');
+
+    delete process.env.BENCHMARK_WORKFLOW_RUN_ID;
+    delete process.env.GITHUB_SERVER_URL;
+    delete process.env.GITHUB_REPOSITORY;
+  });
+
+  it('shows regression details when baseline has regressions', async () => {
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () =>
+        Promise.resolve({
+          ...MOCK_PAYLOAD,
+          loadNewAccount: {
+            ...MOCK_PAYLOAD.loadNewAccount,
+            p95: { loadNewAccount: 672 },
+          },
+        }),
+    } as unknown as Response);
+
+    jest
+      .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+      .mockResolvedValue({
+        baseline: {
+          'interactionUserActions/loadNewAccount': {
+            loadNewAccount: { mean: 540, stdDev: 30, p75: 540, p95: 600 },
+          },
+        },
+        latestCommit: 'abc123',
+        latestTimestamp: 1700000000, // Unix timestamp in seconds
+      });
+
+    const html = await buildPerformanceBenchmarksSection(HOST);
+    expect(html).toContain('loadNewAccount');
+  });
+
+  describe('with a Layer 1 threshold failure (CI=true)', () => {
+    const originalCI = process.env.CI;
+
+    const FAILING_PAYLOAD = {
+      startupStandardHome: {
+        testTitle: 'standard-home',
+        persona: 'standard',
+        platform: 'chrome',
+        buildType: 'browserify',
+        mean: { uiStartup: 4500 },
+        min: { uiStartup: 3000 },
+        max: { uiStartup: 7000 },
+        stdDev: { uiStartup: 500 },
+        p75: { uiStartup: 4500 },
+        p95: { uiStartup: 6000 },
+      },
+    };
+
+    beforeEach(() => {
+      process.env.CI = 'true';
+    });
+
+    afterEach(() => {
+      if (originalCI === undefined) {
+        delete process.env.CI;
+      } else {
+        process.env.CI = originalCI;
+      }
+    });
+
+    it('renders the failure matrix table with the worst metric label', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(FAILING_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('startupStandardHome');
+      expect(html).toContain(COMPARISON_SEVERITY.Regression.icon);
+      expect(html).toContain('uiStartup');
+    });
+
+    it('renders the regression details inline with the worst label and log link', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(FAILING_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('Regressions');
+      expect(html).toContain('startupStandardHome');
+    });
+
+    it('exercises getEntryRegressions with baseline data when entry is non-pass', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(FAILING_PAYLOAD),
+      } as unknown as Response);
+
+      jest
+        .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+        .mockResolvedValue({
+          baseline: {
+            'pageLoad/chrome-browserify-startupStandardHome': {
+              uiStartup: { mean: 1600, stdDev: 100, p75: 1700, p95: 1900 },
+            },
+          },
+          latestCommit: 'abc123',
+          latestTimestamp: 1700000000,
+        });
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('startupStandardHome');
+      expect(html).toContain(COMPARISON_SEVERITY.Regression.icon);
+    });
+  });
+
+  describe('commit information', () => {
+    const originalSha = process.env.GITHUB_SHA;
+    const originalServerUrl = process.env.GITHUB_SERVER_URL;
+    const originalRepo = process.env.GITHUB_REPOSITORY;
+
+    afterEach(() => {
+      if (originalSha === undefined) {
+        delete process.env.GITHUB_SHA;
+      } else {
+        process.env.GITHUB_SHA = originalSha;
+      }
+      if (originalServerUrl === undefined) {
+        delete process.env.GITHUB_SERVER_URL;
+      } else {
+        process.env.GITHUB_SERVER_URL = originalServerUrl;
+      }
+      if (originalRepo === undefined) {
+        delete process.env.GITHUB_REPOSITORY;
+      } else {
+        process.env.GITHUB_REPOSITORY = originalRepo;
+      }
+    });
+
+    it('includes commit hash and date in the section from baseline', async () => {
+      jest
+        .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+        .mockResolvedValue({
+          baseline: {},
+          latestCommit: 'abc1234567890def',
+          latestTimestamp: 1700000000000,
+        });
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MOCK_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('<strong>Baseline (latest main)</strong>');
+      expect(html).toContain('abc1234');
+      expect(html).toContain('<strong>Date</strong>');
+    });
+
+    it('links commit hash from baseline data', async () => {
+      jest
+        .spyOn(historicalComparison, 'fetchHistoricalPerformanceDataFromMain')
+        .mockResolvedValue({
+          baseline: {},
+          latestCommit: 'abc1234567890def',
+          latestTimestamp: 1700000000000,
+        });
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MOCK_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain(
+        '<a href="https://github.com/MetaMask/metamask-extension/commit/abc1234567890def">abc1234</a>',
+      );
+      expect(html).toContain(
+        'https://github.com/MetaMask/metamask-extension/commit/abc1234567890def',
+      );
+    });
+
+    it('includes build logs link when workflow run ID is available', async () => {
+      process.env.GITHUB_SERVER_URL = 'https://github.com';
+      process.env.GITHUB_REPOSITORY = 'MetaMask/metamask-extension';
+      process.env.BENCHMARK_WORKFLOW_RUN_ID = '12345';
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MOCK_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('Pipeline');
+      expect(html).toContain(
+        '<a href="https://github.com/MetaMask/metamask-extension/actions/runs/12345">12345</a>',
+      );
+      expect(html).toContain(
+        'https://github.com/MetaMask/metamask-extension/actions/runs/12345',
+      );
+      expect(html).toContain('Baseline logs');
+    });
+  });
+
+  describe('health matrix structure', () => {
+    const MATRIX_PAYLOAD = {
+      startupStandardHome: {
+        testTitle: 'standard-home',
+        persona: 'standard',
+        platform: 'chrome',
+        buildType: 'browserify',
+        mean: { uiStartup: 4500 },
+        stdDev: { uiStartup: 500 },
+        p75: { uiStartup: 4500 },
+        p95: { uiStartup: 6000 },
+      },
+    };
+
+    beforeEach(() => {
+      process.env.CI = 'true';
+    });
+
+    afterEach(() => {
+      delete process.env.CI;
+    });
+
+    it('shows benchmarks as rows and browsers as columns', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MATRIX_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('<th>Benchmark</th>');
+      expect(html).toContain('<th>chrome-browserify</th>');
+    });
+
+    it('includes clickable log links in matrix cells', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MATRIX_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('startupStandardHome');
+      expect(html).toContain('<a href=');
+    });
+
+    it('renders startup benchmark in the matrix with the correct combo column', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MATRIX_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('startupStandardHome');
+      expect(html).toContain(COMPARISON_SEVERITY.Regression.icon);
+    });
+
+    it('does not render matrix rows when there are no failures', async () => {
+      const passingPayload = {
+        startupStandardHome: {
+          testTitle: 'standard-home',
+          persona: 'standard',
+          mean: { uiStartup: 1500 },
+          stdDev: { uiStartup: 100 },
+          p75: { uiStartup: 1600 },
+          p95: { uiStartup: 1800 },
+        },
+      };
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(passingPayload),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).not.toContain('<th>Metrics</th>');
+    });
+
+    it('renders non-startup (interaction) benchmark in the matrix when it fails', async () => {
+      /* eslint-disable @typescript-eslint/naming-convention */
+      const interactionFailPayload = {
+        loadNewAccount: {
+          testTitle: 'load-new-account',
+          persona: 'standard',
+          mean: { load_new_account: 5000 },
+          stdDev: { load_new_account: 200 },
+          p75: { load_new_account: 9000 },
+          p95: { load_new_account: 12000 },
+        },
+      };
+      /* eslint-enable @typescript-eslint/naming-convention */
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(interactionFailPayload),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('loadNewAccount');
+      expect(html).toContain(COMPARISON_SEVERITY.Regression.icon);
+    });
+
+    it('renders the matrix header with the correct column label', async () => {
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(MATRIX_PAYLOAD),
+      } as unknown as Response);
+
+      const html = await buildPerformanceBenchmarksSection(HOST);
+
+      expect(html).toContain('<th>Metrics</th>');
+      expect(html).toContain('<th>chrome-browserify</th>');
+    });
   });
 });
diff --git a/development/metamaskbot-build-announce/performance-benchmarks.ts b/development/metamaskbot-build-announce/performance-benchmarks.ts
index d8ad83f80be5..1ea1082ed895 100644
--- a/development/metamaskbot-build-announce/performance-benchmarks.ts
+++ b/development/metamaskbot-build-announce/performance-benchmarks.ts
@@ -1,36 +1,123 @@
-import startCase from 'lodash/startCase';
+import { readFile } from 'fs/promises';
+import { join } from 'path';
 import {
   ENTRY_BENCHMARK_PLATFORMS,
   ENTRY_BENCHMARK_BUILD_TYPES,
+  BENCHMARK_PLATFORMS,
+  BENCHMARK_BUILD_TYPES,
+  ALL_BENCHMARK_COMBOS,
+  STAT_KEY,
+  DEFAULT_RELATIVE_THRESHOLDS,
+  THRESHOLD_SEVERITY,
 } from '../../shared/constants/benchmarks';
 import type {
   BenchmarkResults,
+  ComparisonKey,
   StatisticalResult,
+  WebVitalsSummary,
 } from '../../shared/constants/benchmarks';
 import {
   STARTUP_PRESETS,
   INTERACTION_PRESETS,
   USER_JOURNEY_PRESETS,
+  THRESHOLD_REGISTRY,
 } from '../../test/e2e/benchmarks/utils/constants';
+import { validateResultThresholds } from '../../test/e2e/benchmarks/utils/statistics';
+import {
+  compareMetric,
+  formatDeltaPercent,
+  COMPARISON_SEVERITY,
+} from './comparison-utils';
+import type { ComparisonSeverity } from './comparison-utils';
+import type {
+  HistoricalBaselineReference,
+  HistoricalBaselineResult,
+} from './historical-comparison';
+import { fetchHistoricalPerformanceDataFromMain } from './historical-comparison';
+import {
+  resolveBaseline,
+  buildEntryKey,
+  buildCombo,
+  buildArtifactFilename,
+  buildArtifactUrl,
+} from './utils';
 
-/** A parsed benchmark entry with its name and the stats we render. */
 export type BenchmarkEntry = {
   benchmarkName: string;
+  presetName: string;
+  platform: string;
+  buildType: string;
   mean: StatisticalResult;
-  min: StatisticalResult;
-  max: StatisticalResult;
   stdDev: StatisticalResult;
   p75: StatisticalResult;
   p95: StatisticalResult;
+  webVitals?: WebVitalsSummary;
+  artifactUrl?: string;
+};
+
+export const EntryHealth = {
+  Pass: 'pass',
+  Warn: 'warn',
+  Fail: 'fail',
+} as const;
+
+export type EntryHealth = (typeof EntryHealth)[keyof typeof EntryHealth];
+
+type MetricStat = { icon: string; delta: string; severity: ComparisonSeverity };
+
+type RegressionInfo = {
+  metric: string;
+  mean: MetricStat | null;
+  p75: MetricStat | null;
+  p95: MetricStat | null;
+  worstSeverity: ComparisonSeverity;
+};
+
+export type FetchBenchmarkResult = {
+  entries: BenchmarkEntry[];
+  missingPresets: string[];
+};
+
+const HEALTH_ORDER: Record<EntryHealth, number> = {
+  [EntryHealth.Pass]: 0,
+  [EntryHealth.Warn]: 1,
+  [EntryHealth.Fail]: 2,
+};
+
+const HEALTH_ICON: Record<EntryHealth, string> = {
+  [EntryHealth.Fail]: COMPARISON_SEVERITY.Regression.icon,
+  [EntryHealth.Warn]: COMPARISON_SEVERITY.Warn.icon,
+  [EntryHealth.Pass]: COMPARISON_SEVERITY.Pass.icon,
 };
 
+const USER_JOURNEY_BENCHMARK_PLATFORMS = [BENCHMARK_PLATFORMS.CHROME] as const;
+
+/**
+ * Build types to fetch for user-journey presets in this workflow run.
+ * Mirrors whether `benchmarks-webpack-perf` runs (push to main/release only).
+ */
+export function getUserJourneyBenchmarkBuildTypesForCurrentRun(): readonly string[] {
+  const eventName = process.env.GITHUB_EVENT_NAME;
+  const ref = process.env.GITHUB_REF ?? '';
+  const webpackUserJourneyArtifactsExist =
+    eventName === 'push' &&
+    (ref === 'refs/heads/main' || ref.startsWith('refs/heads/release/'));
+
+  if (webpackUserJourneyArtifactsExist) {
+    return [BENCHMARK_BUILD_TYPES.BROWSERIFY, BENCHMARK_BUILD_TYPES.WEBPACK];
+  }
+
+  return [BENCHMARK_BUILD_TYPES.BROWSERIFY];
+}
+
 /**
  * Fetches benchmark JSON artifact for a given preset/platform/buildType.
- * Returns null if the artifact doesn't exist (preset not run or failed).
+ * Reads from local filesystem (BENCHMARK_RESULTS_DIR env) when set,
+ * otherwise falls back to fetching from hostUrl (S3/CloudFront).
  *
  * @param hostUrl - Base URL for CI artifacts.
- * @param platform - Browser platform (e.g. 'chrome', 'firefox').
- * @param buildType - Build type (e.g. 'browserify', 'webpack').
+ * @param platform - Browser platform (e.g. 'chrome').
+ * @param buildType - Build type (e.g. 'browserify').
  * @param preset - Benchmark preset name.
  * @returns Parsed JSON or null.
  */
@@ -42,14 +129,25 @@ export async function fetchBenchmarkJson<
   buildType: string,
   preset: string,
 ): Promise<Result | null> {
+  const fileName = buildArtifactFilename(platform, buildType, preset);
+  const localDir = process.env.BENCHMARK_RESULTS_DIR;
+
+  if (localDir) {
+    try {
+      const raw = await readFile(join(localDir, fileName), 'utf8');
+      return JSON.parse(raw) as Result;
+    } catch {
+      return null;
+    }
+  }
+
   try {
-    const url = `${hostUrl}/benchmarks/benchmark-${platform}-${buildType}-${preset}.json`;
+    const url = `${hostUrl}/benchmarks/${fileName}`;
     const response = await fetch(url);
     if (!response.ok) {
       return null;
     }
-    const data: Result = await response.json();
-    return data;
+    return (await response.json()) as Result;
   } catch {
     return null;
   }
@@ -59,51 +157,60 @@ export async function fetchBenchmarkJson<
  * Extracts benchmark entries from a fetched JSON artifact.
  *
  * @param data - Raw parsed JSON from a benchmark artifact.
+ * @param presetName - The preset name these entries were fetched under.
+ * @param platform - Browser platform (e.g. 'chrome').
+ * @param buildType - Build type (e.g. 'browserify').
+ * @param artifactUrl
  * @returns Flat BenchmarkEntry array with only the fields we render.
  */
 export function extractEntries(
-  data: Record<string, BenchmarkResults>,
+  data: Record<string, BenchmarkResults | null>,
+  presetName = '',
+  platform = '',
+  buildType = '',
+  artifactUrl?: string,
 ): BenchmarkEntry[] {
+  const hasValidMean = (
+    entry: [string, BenchmarkResults | null],
+  ): entry is [string, BenchmarkResults] => {
+    const [, raw] = entry;
+    return raw?.mean !== null && typeof raw?.mean === 'object';
+  };
+
   return Object.entries(data)
-    .filter(
-      ([, raw]) =>
-        raw?.mean !== undefined &&
-        raw.mean !== null &&
-        typeof raw.mean === 'object',
-    )
+    .filter(hasValidMean)
     .map(([name, raw]) => ({
       benchmarkName: name,
+      presetName,
+      platform,
+      buildType,
       mean: raw.mean,
-      min: raw.min,
-      max: raw.max,
       stdDev: raw.stdDev,
       p75: raw.p75,
       p95: raw.p95,
+      ...(raw.webVitals ? { webVitals: raw.webVitals } : {}),
+      artifactUrl,
     }));
 }
 
-export type FetchBenchmarkResult = {
-  entries: BenchmarkEntry[];
-  missingPresets: string[];
-};
-
 /**
- * Fetches and aggregates benchmark entries for a given set of presets.
- * Iterates all platform/buildType combos defined in ENTRY_BENCHMARK_PLATFORMS
- * and ENTRY_BENCHMARK_BUILD_TYPES (shared/constants/benchmarks.ts), so adding
- * a new target only requires updating those constants.
+ * Fetches and aggregates benchmark entries for a given set of presets,
+ * platforms, and build types.
  *
- * Reports any preset/platform/buildType combos that returned no data.
  * @param hostUrl - Base URL for CI artifacts.
- * @param presets - Preset names to fetch (e.g. INTERACTION_PRESETS values).
+ * @param presets - Preset names to fetch.
+ * @param platforms - Platforms to fetch (defaults to ENTRY_BENCHMARK_PLATFORMS).
+ * @param buildTypes - Build types to fetch (defaults to ENTRY_BENCHMARK_BUILD_TYPES).
  * @returns Entries and a list of missing preset descriptions.
  */
 export async function fetchBenchmarkEntries(
   hostUrl: string,
   presets: string[],
+  platforms: readonly string[] = ENTRY_BENCHMARK_PLATFORMS,
+  buildTypes: readonly string[] = ENTRY_BENCHMARK_BUILD_TYPES,
 ): Promise<FetchBenchmarkResult> {
-  const fetches = ENTRY_BENCHMARK_PLATFORMS.flatMap((platform) =>
-    ENTRY_BENCHMARK_BUILD_TYPES.flatMap((buildType) =>
+  const fetches = platforms.flatMap((platform) =>
+    buildTypes.flatMap((buildType) =>
       presets.map(async (preset) => {
         const data = await fetchBenchmarkJson(
           hostUrl,
@@ -117,13 +224,17 @@ export async function fetchBenchmarkEntries(
   );
 
   const results = await Promise.all(fetches);
-
   const allEntries: BenchmarkEntry[] = [];
   const missingPresets: string[] = [];
 
   for (const { platform, buildType, preset, data } of results) {
     if (data) {
-      allEntries.push(...extractEntries(data));
+      const artifactUrl = process.env.BENCHMARK_RESULTS_DIR
+        ? undefined
+        : buildArtifactUrl(hostUrl, platform, buildType, preset);
+      allEntries.push(
+        ...extractEntries(data, preset, platform, buildType, artifactUrl),
+      );
     } else {
       missingPresets.push(`${platform}/${buildType}/${preset}`);
     }
@@ -132,97 +243,730 @@ export async function fetchBenchmarkEntries(
   return { entries: allEntries, missingPresets };
 }
 
+const CWV_METRICS: {
+  key: 'inp' | 'fcp' | 'lcp' | 'cls';
+  label: string;
+  unit: string;
+  good: number;
+  poor: number;
+}[] = [
+  { key: 'inp', label: 'INP', unit: 'ms', good: 200, poor: 500 },
+  { key: 'fcp', label: 'FCP', unit: 'ms', good: 1800, poor: 3000 },
+  { key: 'lcp', label: 'LCP', unit: 'ms', good: 2500, poor: 4000 },
+  { key: 'cls', label: 'CLS', unit: '', good: 0.1, poor: 0.25 },
+];
+
+function getCwvIcon(value: number, good: number, poor: number): string {
+  if (value <= good) {
+    return HEALTH_ICON[EntryHealth.Pass];
+  }
+  if (value <= poor) {
+    return HEALTH_ICON[EntryHealth.Warn];
+  }
+  return HEALTH_ICON[EntryHealth.Fail];
+}
+
+function formatCwvValue(value: number, unit: string): string {
+  if (unit === 'ms') {
+    return value >= 1000
+      ? `${(value / 1000).toFixed(1)}s`
+      : `${Math.round(value)}ms`;
+  }
+  return value.toFixed(3);
+}
+
 /**
- * Renders a single HTML table row cell value, rounding numbers or returning '-'.
+ * Validates P75/P95 against THRESHOLD_REGISTRY limits.
+ * Fail violation → EntryHealth.Fail; Warn violation → EntryHealth.Warn.
+ * Returns Pass when no threshold is registered or all values are within limits.
+ *
+ * Relative context is shown separately as informational deltas below each table,
+ * and does not affect the health badge.
  *
- * @param stats - The stats record (e.g. entry.stdDev).
- * @param metric - The metric key.
- * @returns Rounded string or '-'.
+ * @param entry - The benchmark entry.
+ * @param _baselineMetrics - Unused; kept for call-site compatibility.
+ * @returns `EntryHealth.Fail` | `EntryHealth.Warn` | `EntryHealth.Pass`.
  */
-function formatCellValue(stats: StatisticalResult, metric: string): string {
-  const value = stats[metric];
-  return typeof value === 'number' ? Math.round(value).toString() : '-';
+export function computeEntryHealth(
+  entry: BenchmarkEntry,
+  _baselineMetrics: HistoricalBaselineReference[string] | undefined,
+): EntryHealth {
+  let health: EntryHealth = EntryHealth.Pass;
+
+  // Timer threshold checks
+  const thresholdConfig = THRESHOLD_REGISTRY[entry.benchmarkName];
+  if (thresholdConfig) {
+    const { violations } = validateResultThresholds(
+      { p75: entry.p75, p95: entry.p95 } as BenchmarkResults,
+      thresholdConfig,
+    );
+    if (violations.some((v) => v.severity === THRESHOLD_SEVERITY.Fail)) {
+      return EntryHealth.Fail;
+    }
+    if (violations.some((v) => v.severity === THRESHOLD_SEVERITY.Warn)) {
+      health = EntryHealth.Warn;
+    }
+  }
+
+  // CWV checks: warn on "needs-improvement" or worse (p75 > good threshold).
+  // Does not fail — informational only until team calibrates expectations.
+  const agg = entry.webVitals?.aggregated;
+  if (agg) {
+    for (const { key, good } of CWV_METRICS) {
+      const s = agg[key];
+      if (s && s.max > 0 && s.p75 > good) {
+        health = EntryHealth.Warn;
+        break;
+      }
+    }
+  }
+
+  return health;
 }
 
 /**
- * Builds table rows from benchmark entries.
+ * Returns regression/warn items for a benchmark entry vs its baseline.
+ * Checks P75 and P95 only (Mean is excluded — it is noisier and already
+ * omitted from the health badge in computeEntryHealth).
  *
- * @param entries - Array of benchmark entries with names.
- * @returns Array of HTML table row strings.
+ * @param entry - The benchmark entry.
+ * @param baselineMetrics - Resolved baseline metrics for this entry.
+ * @returns Array of RegressionInfo (may be empty).
  */
-export function buildTableRows(entries: BenchmarkEntry[]): string[] {
-  const tableRows: string[] = [];
-
-  for (const { benchmarkName, mean, min, max, stdDev, p75, p95 } of entries) {
-    const metrics = Object.keys(mean);
-    for (let i = 0; i < metrics.length; i++) {
-      const metric = metrics[i];
-      let row = '';
-      if (i === 0) {
-        row += `<td rowspan="${metrics.length}">${startCase(benchmarkName)}</td>`;
+function getEntryRegressions(
+  entry: BenchmarkEntry,
+  baselineMetrics: HistoricalBaselineReference[string] | undefined,
+): RegressionInfo[] {
+  if (!baselineMetrics) {
+    return [];
+  }
+
+  const result: RegressionInfo[] = [];
+  const metrics = Object.keys(entry.p95).filter((m) => m !== 'total');
+
+  for (const metric of metrics) {
+    if (!baselineMetrics[metric]) {
+      continue;
+    }
+
+    const getStat = (
+      statsMap: StatisticalResult | undefined,
+      key: ComparisonKey,
+    ): MetricStat | null => {
+      const val = statsMap?.[metric];
+      const baselineVal = baselineMetrics[metric]?.[key];
+      if (val === undefined || baselineVal === undefined) {
+        return null;
+      }
+      const cmp = compareMetric(
+        metric,
+        key,
+        val,
+        baselineVal,
+        DEFAULT_RELATIVE_THRESHOLDS,
+      );
+      const sev = Object.values(COMPARISON_SEVERITY).find(
+        (s) => s.value === cmp.severity,
+      );
+      return {
+        icon: sev?.icon ?? COMPARISON_SEVERITY.Pass.icon,
+        delta: formatDeltaPercent(cmp.deltaPercent),
+        severity: cmp.severity,
+      };
+    };
+
+    const meanStat = getStat(entry.mean, STAT_KEY.Mean as ComparisonKey);
+    const p75Stat = getStat(entry.p75, STAT_KEY.P75 as ComparisonKey);
+    const p95Stat = getStat(entry.p95, STAT_KEY.P95 as ComparisonKey);
+
+    // Only include this metric if p75 or p95 has a regression or warn.
+    const hasIssue = (s: MetricStat | null) =>
+      s?.severity === COMPARISON_SEVERITY.Regression.value ||
+      s?.severity === COMPARISON_SEVERITY.Warn.value;
+
+    if (![p75Stat, p95Stat].some(hasIssue)) {
+      continue;
+    }
+
+    let worstSeverity: ComparisonSeverity = COMPARISON_SEVERITY.Pass.value;
+    for (const s of [p75Stat, p95Stat]) {
+      if (s?.severity === COMPARISON_SEVERITY.Regression.value) {
+        worstSeverity = COMPARISON_SEVERITY.Regression.value;
+        break;
       }
-      row += `<td>${metric}</td>`;
-      row += `<td align="right">${Math.round(mean[metric])}</td>`;
-      row += `<td align="right">${formatCellValue(min, metric)}</td>`;
-      row += `<td align="right">${formatCellValue(max, metric)}</td>`;
-      row += `<td align="right">${formatCellValue(stdDev, metric)}</td>`;
-      row += `<td align="right">${formatCellValue(p75, metric)}</td>`;
-      row += `<td align="right">${formatCellValue(p95, metric)}</td>`;
-      tableRows.push(`<tr>${row}</tr>`);
+      if (s?.severity === COMPARISON_SEVERITY.Warn.value) {
+        worstSeverity = COMPARISON_SEVERITY.Warn.value;
+      }
+    }
+
+    result.push({
+      metric,
+      mean: meanStat,
+      p75: p75Stat,
+      p95: p95Stat,
+      worstSeverity,
+    });
+  }
+  return result;
+}
+
+/**
+ * Aggregates the worst EntryHealth per "presetName|platform-buildType" key
+ * across all provided entries.
+ *
+ * @param entries - Benchmark entries to aggregate.
+ * @param baseline - Historical baseline (optional).
+ * @returns Map from "preset|platform-buildType" to worst EntryHealth.
+ */
+function buildHealthMap(
+  entries: BenchmarkEntry[],
+  baseline?: HistoricalBaselineReference,
+): Map<string, EntryHealth> {
+  const map = new Map<string, EntryHealth>();
+  for (const entry of entries) {
+    const baselineMetrics = baseline
+      ? resolveBaseline(baseline, entry.presetName, entry.benchmarkName)
+      : undefined;
+    const health = computeEntryHealth(entry, baselineMetrics);
+    const key = buildEntryKey(
+      entry.benchmarkName,
+      entry.platform,
+      entry.buildType,
+    );
+    const existing = map.get(key);
+    if (!existing || HEALTH_ORDER[health] > HEALTH_ORDER[existing]) {
+      map.set(key, health);
+    }
+  }
+  return map;
+}
+
+/**
+ * Extracts the display name from a benchmark name.
+ * For startup benchmarks with platform prefix (e.g., 'chrome-browserify-startupStandardHome'),
+ * returns just the metric name (e.g., 'startupStandardHome').
+ * For other benchmarks, returns the name as-is.
+ * @param benchmarkName
+ */
+function extractDisplayName(benchmarkName: string): string {
+  const match = benchmarkName.match(
+    /^(?:chrome|firefox)-(?:browserify|webpack)-(.+)$/u,
+  );
+  return match ? match[1] : benchmarkName;
+}
+
+/**
+ * Counts the number of failing and warning benchmark entries.
+ *
+ * @param allEntries - All benchmark entries to count.
+ * @param baseline - Historical baseline (optional).
+ * @returns Object with failure and warning counts.
+ */
+function countHealthEntries(
+  allEntries: BenchmarkEntry[],
+  baseline?: HistoricalBaselineReference,
+): { passes: number; failures: number; warnings: number } {
+  const presetComboMap = buildHealthMap(allEntries, baseline);
+
+  let passes = 0;
+  let failures = 0;
+  let warnings = 0;
+  for (const health of presetComboMap.values()) {
+    if (health === EntryHealth.Fail) {
+      failures += 1;
+    } else if (health === EntryHealth.Warn) {
+      warnings += 1;
+    } else if (health === EntryHealth.Pass) {
+      passes += 1;
     }
   }
+  return { passes, failures, warnings };
+}
+
+/**
+ * Formats timer details from StatisticalResult into a readable HTML list with traffic lights.
+ * Only returns timer breakdown if entry has multiple timers (user journey benchmarks).
+ *
+ * @param entry - Benchmark entry with all stats (mean, p75, p95)
+ * @param baselineMetrics - Historical baseline for comparison (optional)
+ * @param logHref
+ * @returns HTML string with timer breakdown, or empty string if single timer
+ */
+function formatTimerDetails(
+  entry: BenchmarkEntry,
+  baselineMetrics: HistoricalBaselineReference[string] | undefined,
+  logHref?: string,
+): string {
+  const timerCount = Object.keys(entry.mean).length;
+
+  if (timerCount <= 1) {
+    return '';
+  }
+
+  const thresholdConfig = THRESHOLD_REGISTRY[entry.benchmarkName];
+
+  const entries = Object.entries(entry.mean)
+    .map(([metricName]) => {
+      let icon = HEALTH_ICON[EntryHealth.Pass];
+      let hasIssue = false;
+
+      if (thresholdConfig?.[metricName]) {
+        const metricResult = {
+          p75: { [metricName]: entry.p75[metricName] },
+          p95: { [metricName]: entry.p95[metricName] },
+        } as BenchmarkResults;
+
+        const { violations } = validateResultThresholds(metricResult, {
+          [metricName]: thresholdConfig[metricName],
+        });
+
+        const hasFail = violations.some(
+          (v) => v.severity === THRESHOLD_SEVERITY.Fail,
+        );
+        const hasWarn = violations.some(
+          (v) => v.severity === THRESHOLD_SEVERITY.Warn,
+        );
+
+        if (hasFail) {
+          icon = HEALTH_ICON[EntryHealth.Fail];
+          hasIssue = true;
+        } else if (hasWarn) {
+          icon = HEALTH_ICON[EntryHealth.Warn];
+          hasIssue = true;
+        }
+      }
+
+      if (!hasIssue) {
+        return null;
+      }
+
+      const logsLine = logHref
+        ? `<br><a href="${logHref}">[Show logs]</a>`
+        : '';
+      return `<div>${icon} <code>${metricName}</code>${logsLine}</div>`;
+    })
+    .filter((item) => item !== null)
+    .join('');
 
-  return tableRows;
+  return entries
+    ? `<div style="text-align: left; margin: 4px 0 8px 0; padding-left: 8px;">${entries}</div>`
+    : '';
 }
 
 /**
- * Builds a benchmark HTML section with a collapsible table.
- * Surfaces a warning for any missing presets so reviewers can see
- * exactly which data is absent (prevents silent bypass).
+ * Builds an outer collapsible section (e.g. 'Interaction Benchmarks').
  *
  * @param result - Fetched entries and missing preset descriptions.
- * @param summary - The collapsible header text (e.g. '👆 Interaction Benchmarks').
- * @returns HTML string or empty string if no data at all.
+ * @param summary - The collapsible header text.
+ * @param baseline - Historical baseline for relative delta annotations.
+ * @param runUrl - GitHub Actions run URL for "Show logs" links (optional).
+ * @returns HTML string or empty string if no data.
  */
+
+/** Minimum absolute delta (%) to include a metric in the relative summary. */
+const RELATIVE_DELTA_MIN_PCT = 0.1;
+
+/**
+ * Builds a bullet-point summary of notable relative deltas vs the 5-commit baseline.
+ * Only metrics that changed by ≥10% (either direction) are shown.
+ * This is purely informational and does not affect any health badge.
+ *
+ * @param entries - All benchmark entries in this section.
+ * @param baseline - Historical baseline reference.
+ * @returns HTML string, or empty string if nothing notable.
+ */
+function buildRelativeDeltaSection(
+  entries: BenchmarkEntry[],
+  baseline: HistoricalBaselineReference | undefined,
+): string {
+  if (!baseline) {
+    return '';
+  }
+
+  const lines: string[] = [];
+
+  for (const entry of entries) {
+    const baselineMetrics =
+      resolveBaseline(baseline, entry.presetName, entry.benchmarkName) ??
+      (entry.presetName.startsWith('startup')
+        ? resolveBaseline(
+            baseline,
+            entry.presetName,
+            `${entry.platform}-${entry.buildType}-${entry.benchmarkName}`,
+          )
+        : undefined);
+    if (!baselineMetrics) {
+      continue;
+    }
+
+    for (const metric of Object.keys(entry.p75)) {
+      const baselineMetric = baselineMetrics[metric];
+      if (!baselineMetric) {
+        continue;
+      }
+      const cur = entry.p75[metric];
+      const base = baselineMetric.p75;
+      if (cur === undefined || !base) {
+        continue;
+      }
+      const deltaPercent = (cur - base) / base;
+      if (Math.abs(deltaPercent) < RELATIVE_DELTA_MIN_PCT) {
+        continue;
+      }
+      const sign = deltaPercent > 0 ? '+' : '';
+      const pct = `${sign}${(deltaPercent * 100).toFixed(0)}%`;
+      const arrow = deltaPercent > 0 ? '↑' : '↓';
+      lines.push(
+        `<li>${arrow} <code>${entry.benchmarkName}/${metric}</code>: ${pct}</li>`,
+      );
+    }
+  }
+
+  if (lines.length === 0) {
+    return '';
+  }
+
+  return `<p><b>📈 Results compared to the previous 5 runs on main</b></p><ul>${lines.join('')}</ul>\n`;
+}
+
+/**
+ * Builds a separate CWV subsection showing P75 values and rating distributions.
+ * Shown independently of baseline — absolute values are meaningful for CWV
+ * due to universal thresholds (INP <200ms, LCP <2500ms, etc.).
+ * TODO: transition to delta-only format once CWV baseline data accumulates.
+ * @param entries
+ */
+function buildCwvSection(entries: BenchmarkEntry[]): string {
+  const lines: string[] = [];
+
+  for (const entry of entries) {
+    const agg = entry.webVitals?.aggregated;
+    if (!agg) {
+      continue;
+    }
+    for (const { key, label, unit, good, poor } of CWV_METRICS) {
+      const s = agg[key];
+      if (!s || s.max === 0) {
+        continue;
+      }
+      if (s.p75 <= good) {
+        continue;
+      }
+      const icon = getCwvIcon(s.p75, good, poor);
+      lines.push(
+        `<li>${icon} <code>${entry.benchmarkName}/${label}</code>: p75 ${formatCwvValue(s.p75, unit)}</li>`,
+      );
+    }
+  }
+
+  if (lines.length === 0) {
+    return '';
+  }
+
+  const legend = `${HEALTH_ICON[EntryHealth.Pass]} good · ${HEALTH_ICON[EntryHealth.Warn]} needs improvement · ${HEALTH_ICON[EntryHealth.Fail]} poor (<a href="https://web.dev/articles/vitals">web.dev thresholds</a>)`;
+  return `<p><b>🌐 Core Web Vitals</b> — ${legend}</p><ul>${lines.join('')}</ul>\n`;
+}
+
 export function buildBenchmarkSection(
   result: FetchBenchmarkResult,
   summary: string,
+  baseline?: HistoricalBaselineReference,
+  runUrl?: string,
 ): string {
   try {
     const { entries, missingPresets } = result;
     if (entries.length === 0 && missingPresets.length === 0) {
       return '';
     }
-    const rows = buildTableRows(entries);
-    let warningHtml = '';
-    if (missingPresets.length > 0) {
-      warningHtml = `<p>⚠️ <b>Missing data:</b> ${missingPresets.join(', ')}</p>\n`;
+
+    const warningHtml =
+      missingPresets.length > 0
+        ? `<p>⚠️ <b>Missing data:</b> ${missingPresets.join(', ')}</p>\n`
+        : '';
+
+    const sectionCounts = countHealthEntries(entries, baseline);
+    const sectionBadge =
+      sectionCounts.failures > 0
+        ? ` ${HEALTH_ICON[EntryHealth.Fail]} ${sectionCounts.failures}`
+        : '';
+
+    const entryLookup = new Map<string, BenchmarkEntry>();
+    for (const entry of entries) {
+      entryLookup.set(
+        buildEntryKey(entry.benchmarkName, entry.platform, entry.buildType),
+        entry,
+      );
     }
-    const columns = [
-      'Benchmark',
-      'Metric',
-      'Mean (ms)',
-      'Min (ms)',
-      'Max (ms)',
-      'Std Dev (ms)',
-      'P75 (ms)',
-      'P95 (ms)',
-    ];
-    const header = `<thead><tr>${columns.map((c) => `<th>${c}</th>`).join('')}</tr></thead>`;
-    let content = warningHtml;
-    if (rows.length > 0) {
-      content += `<table>${header}<tbody>${rows.join('')}</tbody></table>\n`;
+
+    const benchmarkNames = [...new Set(entries.map((e) => e.benchmarkName))];
+    const usedCombos = new Set(
+      entries.map((e) => buildCombo(e.platform, e.buildType)),
+    );
+    const orderedCombos = ALL_BENCHMARK_COMBOS.filter((c) => usedCombos.has(c));
+
+    let sectionBody = '';
+    if (benchmarkNames.length > 0 && orderedCombos.length > 0) {
+      const headerRow = `<tr><th>Benchmark</th>${orderedCombos
+        .map((c) => `<th>${c}</th>`)
+        .join('')}</tr>`;
+
+      const dataRows = benchmarkNames
+        .map((benchmarkName: string) => {
+          const cells = orderedCombos
+            .map((combo: string) => {
+              const entry = entryLookup.get(`${benchmarkName}|${combo}`);
+              if (!entry) {
+                return `<td align="left">–</td>`;
+              }
+              const baselineMetrics = baseline
+                ? resolveBaseline(baseline, entry.presetName, benchmarkName)
+                : undefined;
+              const health = computeEntryHealth(entry, baselineMetrics);
+              const icon = HEALTH_ICON[health];
+              const logHref = entry.artifactUrl ?? runUrl;
+
+              const timerDetails = formatTimerDetails(
+                entry,
+                baselineMetrics,
+                logHref,
+              );
+
+              const logsLink = logHref
+                ? `<a href="${logHref}">[Show logs]</a>`
+                : '';
+
+              let cell: string;
+              switch (true) {
+                case Boolean(timerDetails):
+                  cell = timerDetails;
+                  break;
+                case Boolean(logHref):
+                  cell = `${icon} ${logsLink}`;
+                  break;
+                default:
+                  cell = icon;
+              }
+              return `<td align="left">${cell}</td>`;
+            })
+            .join('');
+          const displayName = extractDisplayName(benchmarkName);
+          return `<tr><td>${displayName}</td>${cells}</tr>`;
+        })
+        .join('');
+
+      sectionBody = `<div style="overflow-x:auto;width:100%"><table style="width:100%;min-width:900px;table-layout:auto;border-collapse:collapse"><thead>${headerRow}</thead><tbody>${dataRows}</tbody></table></div>\n`;
+    } else if (baseline) {
+      sectionBody = `<p>✅ No regressions detected</p>\n`;
     }
-    return `<details><summary>${summary}</summary>${content}</details>\n\n`;
+
+    const deltaSection = buildRelativeDeltaSection(entries, baseline);
+    const cwvSection = buildCwvSection(entries);
+    const sectionContent =
+      warningHtml + sectionBody + deltaSection + cwvSection;
+    return sectionContent
+      ? `<details><summary><b>${summary}${sectionBadge}</b></summary>\n${sectionContent}</details>\n`
+      : '';
   } catch (error: unknown) {
     console.log(`Failed to build ${summary}: ${String(error)}`);
     return '';
   }
 }
 
+type MatrixCellData = {
+  health: EntryHealth;
+  label: string;
+};
+
+/**
+ * Builds a summary health matrix table: benchmarkName rows × platform-buildType columns.
+ * Each cell shows the health icon and the worst metric(percentile) that triggered it.
+ * Only rows with at least one 🔴 Fail are included.
+ *
+ * @param allEntries - All benchmark entries across all sections.
+ * @param baseline - Historical baseline (optional).
+ * @returns HTML table string, or empty string if nothing to show.
+ */
+function buildHealthMatrixHtml(
+  allEntries: BenchmarkEntry[],
+  baseline: HistoricalBaselineReference | undefined,
+): string {
+  const cellMap = new Map<string, MatrixCellData>();
+  for (const entry of allEntries) {
+    const baselineMetrics = baseline
+      ? resolveBaseline(baseline, entry.presetName, entry.benchmarkName)
+      : undefined;
+    const health = computeEntryHealth(entry, baselineMetrics);
+    const key = buildEntryKey(
+      entry.benchmarkName,
+      entry.platform,
+      entry.buildType,
+    );
+    const existing = cellMap.get(key);
+    if (existing && HEALTH_ORDER[health] <= HEALTH_ORDER[existing.health]) {
+      continue;
+    }
+    const regs =
+      health === EntryHealth.Pass
+        ? []
+        : getEntryRegressions(entry, baselineMetrics);
+    const topReg =
+      regs.find(
+        (r) => r.worstSeverity === COMPARISON_SEVERITY.Regression.value,
+      ) ?? regs[0];
+    let label = '';
+    if (topReg) {
+      const p95IsTrigger =
+        topReg.p95?.severity === COMPARISON_SEVERITY.Regression.value ||
+        topReg.p95?.severity === COMPARISON_SEVERITY.Warn.value;
+      const percentile = p95IsTrigger ? 'p95' : 'p75';
+      label = `${topReg.metric}(${percentile})`;
+    }
+    cellMap.set(key, { health, label });
+  }
+
+  const usedCombos = new Set(
+    allEntries.map((e) => `${e.platform}-${e.buildType}`),
+  );
+  const orderedCombos = ALL_BENCHMARK_COMBOS.filter((c) => usedCombos.has(c));
+
+  const allBenchmarks = [...new Set(allEntries.map((e) => e.benchmarkName))];
+  const affectedBenchmarks = allBenchmarks.filter((benchmark) =>
+    orderedCombos.some(
+      (combo) =>
+        cellMap.get(`${benchmark}|${combo}`)?.health === EntryHealth.Fail,
+    ),
+  );
+
+  if (affectedBenchmarks.length === 0 || orderedCombos.length === 0) {
+    return '';
+  }
+
+  const headerRow = `<tr><th>Metrics</th>${orderedCombos
+    .map((c) => `<th>${c}</th>`)
+    .join('')}</tr>`;
+
+  const dataRows = affectedBenchmarks
+    .map((benchmark) => {
+      const cells = orderedCombos
+        .map((combo) => {
+          const data = cellMap.get(`${benchmark}|${combo}`);
+          if (!data) {
+            return `<td align="center">–</td>`;
+          }
+          const icon = HEALTH_ICON[data.health];
+          const entry = allEntries.find(
+            (e) =>
+              e.benchmarkName === benchmark &&
+              `${e.platform}-${e.buildType}` === combo,
+          );
+          const logHref = entry?.artifactUrl;
+          const label = data.label ? `${icon} ${data.label}` : icon;
+          const cell = logHref
+            ? `${label} <a href="${logHref}">[logs]</a>`
+            : label;
+          return `<td align="center">${cell}</td>`;
+        })
+        .join('');
+      return `<tr><td>${benchmark}</td>${cells}</tr>`;
+    })
+    .join('');
+
+  return `<table><thead>${headerRow}</thead><tbody>${dataRows}</tbody></table>\n`;
+}
+
+/**
+ * Returns the worst offending metric label for a failing entry, for use in the
+ * "View regression details" list.
+ *
+ * @param entry - The failing benchmark entry.
+ * @param baselineMetrics - Resolved baseline metrics (for Layer 2 fallback).
+ * @returns Label such as "initialActions(p95)", or empty string if none found.
+ */
+function getWorstViolationLabel(
+  entry: BenchmarkEntry,
+  baselineMetrics: HistoricalBaselineReference[string] | undefined,
+): string {
+  // Layer 1: find the threshold violation with the largest excess over the limit.
+  const thresholdConfig = THRESHOLD_REGISTRY[entry.benchmarkName];
+  if (thresholdConfig) {
+    const { violations } = validateResultThresholds(
+      { p75: entry.p75, p95: entry.p95 } as BenchmarkResults,
+      thresholdConfig,
+    );
+    const worst = violations
+      .filter((v) => v.severity === THRESHOLD_SEVERITY.Fail)
+      .sort((a, b) => b.value / b.threshold - a.value / a.threshold)[0];
+    if (worst) {
+      return `${worst.metricId}(${worst.percentile})`;
+    }
+  }
+
+  // Layer 2: fall back to the worst relative regression metric.
+  const regs = getEntryRegressions(entry, baselineMetrics);
+  const topReg =
+    regs.find(
+      (r) => r.worstSeverity === COMPARISON_SEVERITY.Regression.value,
+    ) ?? regs[0];
+  if (!topReg) {
+    return '';
+  }
+  const p95Worst =
+    topReg.p95?.severity === COMPARISON_SEVERITY.Regression.value ||
+    topReg.p95?.severity === COMPARISON_SEVERITY.Warn.value;
+  return `${topReg.metric}(${p95Worst ? 'p95' : 'p75'})`;
+}
+
 /**
- * Builds the full ⚡ Performance Benchmarks collapsible section,
- * including 👆 Interaction, 🔌 Startup, and 🧭 User Journey sub-sections.
+ * Builds the "View regression details" collapsible.
+ *
+ * @param allEntries - All benchmark entries across all sections.
+ * @param baseline - Historical baseline (optional).
+ * @param failures - Pre-computed failure count (from countHealthEntries).
+ * @param runUrl - Fallback log URL when an entry has no artifactUrl.
+ */
+function buildFailingItemsHtml(
+  allEntries: BenchmarkEntry[],
+  baseline: HistoricalBaselineReference | undefined,
+  failures: number,
+  runUrl: string | undefined,
+): string {
+  if (failures === 0) {
+    return '';
+  }
+
+  const failureSuffix = failures === 1 ? 'failure' : 'failures';
+  const failureLabel = `${HEALTH_ICON[EntryHealth.Fail]} ${failures} ${failureSuffix}`;
+
+  const listItems = allEntries
+    .flatMap((entry) => {
+      const baselineMetrics = baseline
+        ? resolveBaseline(baseline, entry.presetName, entry.benchmarkName)
+        : undefined;
+      if (computeEntryHealth(entry, baselineMetrics) !== EntryHealth.Fail) {
+        return [];
+      }
+      const worstLabel = getWorstViolationLabel(entry, baselineMetrics);
+      const labelPart = worstLabel ? ` — ${worstLabel}` : '';
+      const logHref = entry.artifactUrl ?? runUrl;
+      const logAnchor = logHref ? ` <a href="${logHref}">[Show logs]</a>` : '';
+      return [
+        `<li><b>${entry.benchmarkName}</b> · ${entry.platform}-${entry.buildType}${labelPart}${logAnchor}</li>`,
+      ];
+    })
+    .join('');
+
+  if (!listItems) {
+    return `<p>${failureLabel}</p>\n`;
+  }
+
+  return (
+    `<p><strong>Regressions (${failureLabel})</strong></p>\n` +
+    `<ul>${listItems}</ul>\n`
+  );
+}
+
+/**
+ * Builds the full ⚡ Performance Benchmarks collapsible section.
  *
  * @param hostUrl - Base URL for CI artifacts.
  * @returns HTML string for the collapsible section, or empty string.
@@ -232,33 +976,116 @@ export async function buildPerformanceBenchmarksSection(
 ): Promise<string> {
   const sectionTitle = '⚡ Performance Benchmarks';
 
-  const [interactionResult, startupResult, userJourneyResult] =
+  const benchmarkRunId =
+    process.env.BENCHMARK_WORKFLOW_RUN_ID ?? process.env.GITHUB_RUN_ID;
+  const runUrl =
+    process.env.GITHUB_SERVER_URL &&
+    process.env.GITHUB_REPOSITORY &&
+    benchmarkRunId
+      ? `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${benchmarkRunId}`
+      : undefined;
+
+  const [interactionResult, startupResult, userJourneyResult, baselineResult] =
     await Promise.all([
-      fetchBenchmarkEntries(hostUrl, Object.values(INTERACTION_PRESETS)),
-      fetchBenchmarkEntries(hostUrl, Object.values(STARTUP_PRESETS)),
-      fetchBenchmarkEntries(hostUrl, Object.values(USER_JOURNEY_PRESETS)),
+      fetchBenchmarkEntries(
+        hostUrl,
+        Object.values(INTERACTION_PRESETS),
+        ENTRY_BENCHMARK_PLATFORMS,
+        ENTRY_BENCHMARK_BUILD_TYPES,
+      ),
+      fetchBenchmarkEntries(
+        hostUrl,
+        Object.values(STARTUP_PRESETS),
+        Object.values(BENCHMARK_PLATFORMS),
+        Object.values(BENCHMARK_BUILD_TYPES),
+      ),
+      fetchBenchmarkEntries(
+        hostUrl,
+        Object.values(USER_JOURNEY_PRESETS),
+        USER_JOURNEY_BENCHMARK_PLATFORMS,
+        getUserJourneyBenchmarkBuildTypesForCurrentRun(),
+      ),
+      fetchHistoricalPerformanceDataFromMain(),
     ]);
 
+  const resolvedBaseline = baselineResult?.baseline ?? undefined;
+  const baselineCommit = baselineResult?.latestCommit;
+  const baselineTimestamp = baselineResult?.latestTimestamp;
+
+  const allEntries = [
+    ...startupResult.entries,
+    ...interactionResult.entries,
+    ...userJourneyResult.entries,
+  ];
+
+  if (
+    allEntries.length === 0 &&
+    interactionResult.missingPresets.length === 0 &&
+    startupResult.missingPresets.length === 0 &&
+    userJourneyResult.missingPresets.length === 0
+  ) {
+    return '';
+  }
+
   const interactionHtml = buildBenchmarkSection(
     interactionResult,
-    '👆 Interaction Benchmarks',
+    'Interaction Benchmarks',
+    resolvedBaseline,
+    runUrl,
   );
   const startupHtml = buildBenchmarkSection(
     startupResult,
-    '🔌 Startup Benchmarks',
+    'Startup Benchmarks',
+    resolvedBaseline,
+    runUrl,
   );
   const userJourneyHtml = buildBenchmarkSection(
     userJourneyResult,
-    '🧭 User Journey Benchmarks',
+    'User Journey Benchmarks',
+    resolvedBaseline,
+    runUrl,
   );
 
-  // TODO: Introduce a Traffic Light System for Regression Detection
-  // https://github.com/MetaMask/MetaMask-planning/issues/6993
+  const { passes, failures, warnings } = countHealthEntries(
+    allEntries,
+    resolvedBaseline,
+  );
+  const regressionDetailsHtml = buildFailingItemsHtml(
+    allEntries,
+    resolvedBaseline,
+    failures,
+    runUrl,
+  );
 
-  if (!interactionHtml && !startupHtml && !userJourneyHtml) {
-    return '';
-  }
+  const matrixHtml = buildHealthMatrixHtml(allEntries, resolvedBaseline);
+
+  const commitHash = baselineCommit?.slice(0, 7) ?? 'unknown';
+  const commitDate = baselineTimestamp
+    ? new Date(baselineTimestamp * 1000).toLocaleDateString('en-US', {
+        month: 'numeric',
+        day: 'numeric',
+        year: 'numeric',
+      })
+    : 'unknown';
+  const commitUrl = baselineCommit
+    ? `https://github.com/MetaMask/metamask-extension/commit/${baselineCommit}`
+    : undefined;
+  const commitLink = commitUrl
+    ? `<a href="${commitUrl}">${commitHash}</a>`
+    : commitHash;
+  const pipelineLink = runUrl
+    ? `<a href="${runUrl}">${benchmarkRunId}</a>`
+    : (benchmarkRunId ?? '');
+  const baselineLogsUrl =
+    'https://raw.githubusercontent.com/MetaMask/extension_benchmark_stats/main/stats/main/performance_data.json';
+  const baselineLogsLink = `<a href="${baselineLogsUrl}">Baseline logs</a>`;
+  const commitInfo = `\n\n<p><strong>Baseline (latest main)</strong>: ${commitLink} | <strong>Date</strong>: ${commitDate} | <strong>Pipeline</strong>: ${pipelineLink} | ${baselineLogsLink}</p>\n\n`;
+
+  // Plain text only inside <summary> (no block elements like <p>).
+  const summaryLine = `${sectionTitle} (Total: ${HEALTH_ICON[EntryHealth.Pass]} ${passes} pass · ${HEALTH_ICON[EntryHealth.Warn]} ${warnings} warn · ${HEALTH_ICON[EntryHealth.Fail]} ${failures} fail)`;
+  const subsectionsHtml = interactionHtml + startupHtml + userJourneyHtml;
+  const content =
+    commitInfo + matrixHtml + regressionDetailsHtml + subsectionsHtml;
 
-  const content = `${interactionHtml}${startupHtml}${userJourneyHtml}`;
-  return `<details><summary>${sectionTitle}</summary>\n<blockquote>\n${content}</blockquote>\n</details>\n\n`;
+  return `<details><summary>${summaryLine}</summary>\n<blockquote>\n${content}</blockquote>\n</details>\n\n`;
 }
diff --git a/development/metamaskbot-build-announce/test-plan.ts b/development/metamaskbot-build-announce/test-plan.ts
new file mode 100644
index 000000000000..2e5b55c6e3ad
--- /dev/null
+++ b/development/metamaskbot-build-announce/test-plan.ts
@@ -0,0 +1,259 @@
+/**
+ * Test Plan Markdown Generator
+ *
+ * Converts the AI-generated test plan JSON to formatted markdown
+ * with collapsible sections for PR comments.
+ */
+
+type TestingScenario = {
+  area: string;
+  riskLevel: 'high' | 'medium' | 'low';
+  testSteps: string[];
+  whyThisMatters: string;
+};
+
+type TestingPlan = {
+  prNumber: number;
+  prTitle: string;
+  generatedAt: string;
+  modelUsed: string;
+  summary: {
+    totalFilesChanged: number;
+    totalCommitsInRelease: number;
+    releaseRiskScore: string;
+    highRiskScenarios: number;
+    mediumRiskScenarios: number;
+  };
+  testScenarios: {
+    cherryPickScenarios: TestingScenario[];
+    initialScenarios: TestingScenario[];
+  };
+};
+
+/**
+ * Fetches the test plan JSON from the given URL
+ *
+ * @param url - The URL to fetch the test plan from
+ * @returns The parsed test plan or null if fetch fails
+ */
+async function fetchTestPlan(url: string): Promise<TestingPlan | null> {
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      console.warn(`Failed to fetch test plan: ${response.status}`);
+      return null;
+    }
+    return (await response.json()) as TestingPlan;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(`Error fetching test plan: ${message}`);
+    return null;
+  }
+}
+
+/**
+ * Formats a single scenario as markdown
+ *
+ * @param scenario - The testing scenario to format
+ * @param index - The scenario index number
+ * @returns Formatted markdown string
+ */
+function formatScenarioMarkdown(
+  scenario: TestingScenario,
+  index: number,
+): string {
+  let md = `### ${index}. ${scenario.area}\n`;
+  md += `**Risk Level:** ${scenario.riskLevel.toUpperCase()}\n\n`;
+  md += `**Why This Matters:** ${scenario.whyThisMatters}\n\n`;
+  md += `**Test Steps:**\n`;
+  scenario.testSteps.forEach((step) => {
+    md += `${step}\n`;
+  });
+  md += '\n---\n\n';
+  return md;
+}
+
+/**
+ * Formats scenarios by risk level into collapsible sections
+ *
+ * @param scenarios - Array of testing scenarios to format
+ * @param sectionTitle - Title for the collapsible section
+ * @returns Formatted markdown string with collapsible details
+ */
+function formatScenariosSection(
+  scenarios: TestingScenario[],
+  sectionTitle: string,
+): string {
+  if (scenarios.length === 0) {
+    return '';
+  }
+
+  const highRisk = scenarios.filter((s) => s.riskLevel === 'high');
+  const mediumRisk = scenarios.filter((s) => s.riskLevel === 'medium');
+  const lowRisk = scenarios.filter((s) => s.riskLevel === 'low');
+
+  let md = `<details>\n<summary><strong>${sectionTitle} (${scenarios.length})</strong></summary>\n\n`;
+
+  if (highRisk.length > 0) {
+    md += `## High Risk Scenarios (${highRisk.length})\n\n`;
+    highRisk.forEach((scenario, index) => {
+      md += formatScenarioMarkdown(scenario, index + 1);
+    });
+  }
+
+  if (mediumRisk.length > 0) {
+    md += `## Medium Risk Scenarios (${mediumRisk.length})\n\n`;
+    mediumRisk.forEach((scenario, index) => {
+      md += formatScenarioMarkdown(scenario, index + 1);
+    });
+  }
+
+  if (lowRisk.length > 0) {
+    md += `## Low Risk Scenarios (${lowRisk.length})\n\n`;
+    lowRisk.forEach((scenario, index) => {
+      md += formatScenarioMarkdown(scenario, index + 1);
+    });
+  }
+
+  md += `</details>\n\n`;
+  return md;
+}
+
+/**
+ * Extracts team names from scenarios based on area keywords.
+ * Uses word boundary matching to avoid false positives (e.g., "sign" in "design").
+ *
+ * @param scenarios - Array of testing scenarios to extract teams from
+ * @returns Sorted array of unique team names
+ */
+function extractTeamsFromScenarios(scenarios: TestingScenario[]): string[] {
+  const teamKeywords: Record<string, string> = {
+    account: 'Accounts',
+    wallet: 'Wallet',
+    transaction: 'Transactions',
+    confirmation: 'Confirmations',
+    signing: 'Confirmations',
+    swap: 'Swaps',
+    bridge: 'Swaps and Bridge',
+    network: 'Networks',
+    token: 'Assets',
+    nft: 'Assets',
+    asset: 'Assets',
+    permission: 'Permissions',
+    dapp: 'Wallet Integrations',
+    snap: 'Snaps',
+    setting: 'Settings',
+    security: 'Security',
+    privacy: 'Security',
+    onboarding: 'Onboarding',
+    'seed phrase': 'Onboarding',
+    backup: 'Onboarding',
+    notification: 'Notifications',
+    phishing: 'Product Safety',
+    blockaid: 'Product Safety',
+  };
+
+  const teams = new Set<string>();
+
+  scenarios.forEach((scenario) => {
+    const areaLower = scenario.area.toLowerCase();
+    Object.entries(teamKeywords).forEach(([keyword, team]) => {
+      // Use word boundary regex to avoid substring false positives
+      // Allow optional trailing 's' to match plural forms (e.g., "token" matches "Tokens")
+      const regex = new RegExp(String.raw`\b${keyword}s?\b`, 'iu');
+      if (regex.test(areaLower)) {
+        teams.add(team);
+      }
+    });
+  });
+
+  if (teams.size === 0) {
+    teams.add('Extension Platform');
+  }
+
+  return Array.from(teams).sort((a, b) => a.localeCompare(b));
+}
+
+/**
+ * Converts the test plan JSON to formatted markdown
+ *
+ * @param plan - The test plan object to convert
+ * @returns Formatted markdown string
+ */
+function convertTestPlanToMarkdown(plan: TestingPlan): string {
+  const { summary, testScenarios } = plan;
+  const allScenarios = [
+    ...testScenarios.cherryPickScenarios,
+    ...testScenarios.initialScenarios,
+  ];
+
+  const teams = extractTeamsFromScenarios(allScenarios);
+
+  let md = `## AI Test Plan\n\n`;
+
+  // Stats table
+  md += `| Risk Score | High Risk | Medium Risk | Files Changed | Commits |\n`;
+  md += `|------------|-----------|-------------|---------------|----------|\n`;
+  md += `| **${summary.releaseRiskScore}** | ${summary.highRiskScenarios} | ${summary.mediumRiskScenarios} | ${summary.totalFilesChanged} | ${summary.totalCommitsInRelease} |\n\n`;
+
+  // Cherry-pick scenarios (if any)
+  if (testScenarios.cherryPickScenarios.length > 0) {
+    md += formatScenariosSection(
+      testScenarios.cherryPickScenarios,
+      'Cherry-Pick Scenarios',
+    );
+  }
+
+  // Initial scenarios
+  if (testScenarios.initialScenarios.length > 0) {
+    md += formatScenariosSection(
+      testScenarios.initialScenarios,
+      'Release Scenarios',
+    );
+  }
+
+  // Teams sign-off section
+  md += `<details>\n<summary><strong>Teams Sign-off Status</strong></summary>\n\n`;
+  md += `**Signed off:** None yet\n\n`;
+  md += `**Awaiting sign-off (${teams.length}):**\n`;
+  md += `${teams.join(', ')}\n\n`;
+  md += `</details>\n\n`;
+
+  // Footer
+  md += `---\n`;
+  md += `*Generated by AI Test Plan Analyzer (${plan.modelUsed}) at ${plan.generatedAt}*\n\n`;
+
+  return md;
+}
+
+/**
+ * Builds the test plan section for the PR comment.
+ * Fetches JSON, converts to markdown, and returns both the markdown and JSON link.
+ *
+ * @param hostUrl - The base URL where test plan artifacts are hosted
+ * @param testPlanVersion - The version identifier for the test plan
+ * @returns Formatted markdown section with test plan content and JSON link
+ */
+export async function buildTestPlanSection(
+  hostUrl: string,
+  testPlanVersion: string,
+): Promise<string> {
+  const testPlanFileName = `test-plan-${testPlanVersion}.json`;
+  const testPlanUrl = `${hostUrl}/build-test-plan/builds/${testPlanFileName}`;
+  const testPlanLink = `<a href="${testPlanUrl}">${testPlanFileName}</a>`;
+
+  // Try to fetch and convert the test plan
+  const plan = await fetchTestPlan(testPlanUrl);
+
+  if (plan) {
+    try {
+      const markdown = convertTestPlanToMarkdown(plan);
+      return `${markdown}AI generated test plan (JSON): ${testPlanLink}\n\n`;
+    } catch {
+      // If conversion fails (malformed JSON structure), fall through to link-only
+    }
+  }
+
+  // Fallback to just the link if fetch fails
+  return `AI generated test plan: ${testPlanLink}\n\n`;
+}
diff --git a/development/metamaskbot-build-announce/utils.test.ts b/development/metamaskbot-build-announce/utils.test.ts
index da71cc3ffb1f..7fef1f851c3d 100644
--- a/development/metamaskbot-build-announce/utils.test.ts
+++ b/development/metamaskbot-build-announce/utils.test.ts
@@ -1,4 +1,15 @@
-import { buildSectionWithFallback, postCommentWithMetamaskBot } from './utils';
+import {
+  buildSectionWithFallback,
+  postCommentWithMetamaskBot,
+  buildCombo,
+  buildEntryKey,
+  buildArtifactFilename,
+  buildArtifactUrl,
+  resolveBaseline,
+  extractPresetFromArtifactName,
+  resolveBaselineFromArtifactName,
+} from './utils';
+import type { HistoricalBaselineReference } from './historical-comparison';
 
 describe('buildSectionWithFallback', () => {
   it('returns the builder result when it resolves with a string', async () => {
@@ -137,3 +148,276 @@ describe('postCommentWithMetamaskBot', () => {
     );
   });
 });
+
+describe('artifact utilities', () => {
+  it('builds combo, entry key, filename and URL', () => {
+    expect(buildCombo('chrome', 'browserify')).toBe('chrome-browserify');
+    expect(buildEntryKey('loadNewAccount', 'chrome', 'browserify')).toBe(
+      'loadNewAccount|chrome-browserify',
+    );
+    expect(
+      buildArtifactFilename('chrome', 'browserify', 'interactionUserActions'),
+    ).toBe('benchmark-chrome-browserify-interactionUserActions.json');
+    expect(
+      buildArtifactUrl(
+        'https://ci.example.com',
+        'chrome',
+        'browserify',
+        'interactionUserActions',
+      ),
+    ).toBe(
+      'https://ci.example.com/benchmarks/benchmark-chrome-browserify-interactionUserActions.json',
+    );
+  });
+});
+
+describe('extractPresetFromArtifactName', () => {
+  it('extracts preset from artifact names', () => {
+    expect(
+      extractPresetFromArtifactName(
+        'benchmark-chrome-browserify-interactionUserActions',
+      ),
+    ).toBe('interactionUserActions');
+    expect(
+      extractPresetFromArtifactName(
+        'benchmark-chrome-browserify-userJourneyOnboardingImport',
+      ),
+    ).toBe('userJourneyOnboardingImport');
+  });
+
+  it('maps startup presets to pageLoad', () => {
+    expect(
+      extractPresetFromArtifactName(
+        'benchmark-chrome-browserify-startupStandardHome',
+      ),
+    ).toBe('pageLoad');
+  });
+
+  it('returns undefined for invalid artifact names', () => {
+    expect(extractPresetFromArtifactName('invalid-name')).toBeUndefined();
+  });
+});
+
+/* eslint-disable @typescript-eslint/naming-convention -- benchmark metric IDs use snake_case (match emitted timer IDs) */
+describe('resolveBaseline', () => {
+  const mockBaseline: HistoricalBaselineReference = {
+    'interactionUserActions/loadNewAccount': {
+      load_new_account: { mean: 500, stdDev: 30, p75: 540, p95: 600 },
+    },
+    'userJourneyOnboardingImport/onboardingImportWallet': {
+      importWalletToSocialScreen: {
+        mean: 1100,
+        stdDev: 50,
+        p75: 1400,
+        p95: 1900,
+      },
+    },
+    'pageLoad/chrome-browserify-startupStandardHome': {
+      uiStartup: { mean: 1400, stdDev: 80, p75: 1700, p95: 2100 },
+    },
+    'pageLoad/firefox-webpack-startupPowerUserHome': {
+      uiStartup: { mean: 3000, stdDev: 200, p75: 3500, p95: 5000 },
+    },
+  };
+
+  it('resolves interaction and user journey baselines', () => {
+    expect(
+      resolveBaseline(mockBaseline, 'interactionUserActions', 'loadNewAccount')
+        ?.load_new_account.mean,
+    ).toBe(500);
+    expect(
+      resolveBaseline(
+        mockBaseline,
+        'userJourneyOnboardingImport',
+        'onboardingImportWallet',
+      )?.importWalletToSocialScreen.mean,
+    ).toBe(1100);
+  });
+
+  it('maps startup preset to pageLoad and resolves platform-specific baseline', () => {
+    expect(
+      resolveBaseline(
+        mockBaseline,
+        'startupStandardHome',
+        'chrome-browserify-startupStandardHome',
+      )?.uiStartup.mean,
+    ).toBe(1400);
+    expect(
+      resolveBaseline(
+        mockBaseline,
+        'startupPowerUserHome',
+        'firefox-webpack-startupPowerUserHome',
+      )?.uiStartup.mean,
+    ).toBe(3000);
+  });
+
+  it('returns undefined for missing benchmarks', () => {
+    expect(
+      resolveBaseline(mockBaseline, 'interactionUserActions', 'unknown'),
+    ).toBeUndefined();
+    expect(
+      resolveBaseline(
+        mockBaseline,
+        'startupStandardHome',
+        'firefox-browserify-startupStandardHome',
+      ),
+    ).toBeUndefined();
+  });
+});
+
+describe('resolveBaselineFromArtifactName', () => {
+  const mockBaseline: HistoricalBaselineReference = {
+    'interactionUserActions/loadNewAccount': {
+      load_new_account: { mean: 500, p75: 540, p95: 600 },
+    },
+    'pageLoad/chrome-browserify-startupStandardHome': {
+      uiStartup: { mean: 1400, p75: 1700, p95: 2100 },
+    },
+    'userJourneyOnboardingImport/onboardingImportWallet': {
+      importWalletToSocialScreen: { mean: 1100, p75: 1400, p95: 1900 },
+    },
+  };
+
+  it('extracts preset and resolves baseline for all benchmark types', () => {
+    expect(
+      resolveBaselineFromArtifactName(
+        mockBaseline,
+        'loadNewAccount',
+        'benchmark-chrome-browserify-interactionUserActions',
+      )?.load_new_account.mean,
+    ).toBe(500);
+    expect(
+      resolveBaselineFromArtifactName(
+        mockBaseline,
+        'onboardingImportWallet',
+        'benchmark-chrome-browserify-userJourneyOnboardingImport',
+      )?.importWalletToSocialScreen.mean,
+    ).toBe(1100);
+    expect(
+      resolveBaselineFromArtifactName(
+        mockBaseline,
+        'chrome-browserify-startupStandardHome',
+        'benchmark-chrome-browserify-startupStandardHome',
+      )?.uiStartup.mean,
+    ).toBe(1400);
+  });
+
+  it('returns undefined for invalid inputs', () => {
+    expect(
+      resolveBaselineFromArtifactName(
+        mockBaseline,
+        'loadNewAccount',
+        'invalid',
+      ),
+    ).toBeUndefined();
+    expect(
+      resolveBaselineFromArtifactName(
+        mockBaseline,
+        'unknown',
+        'benchmark-chrome-browserify-unknownPreset',
+      ),
+    ).toBeUndefined();
+  });
+});
+
+describe('multi-platform scenarios', () => {
+  it('handles interaction on all 4 platform combos with shared baseline', () => {
+    const baseline: HistoricalBaselineReference = {
+      'interactionUserActions/loadNewAccount': {
+        load_new_account: { mean: 500, p75: 540, p95: 600 },
+      },
+    };
+
+    const chromeBrowserify = resolveBaselineFromArtifactName(
+      baseline,
+      'loadNewAccount',
+      'benchmark-chrome-browserify-interactionUserActions',
+    );
+    const chromeWebpack = resolveBaselineFromArtifactName(
+      baseline,
+      'loadNewAccount',
+      'benchmark-chrome-webpack-interactionUserActions',
+    );
+    const firefoxBrowserify = resolveBaselineFromArtifactName(
+      baseline,
+      'loadNewAccount',
+      'benchmark-firefox-browserify-interactionUserActions',
+    );
+    const firefoxWebpack = resolveBaselineFromArtifactName(
+      baseline,
+      'loadNewAccount',
+      'benchmark-firefox-webpack-interactionUserActions',
+    );
+
+    expect(chromeBrowserify).toBeDefined();
+    expect(chromeWebpack).toStrictEqual(chromeBrowserify);
+    expect(firefoxBrowserify).toStrictEqual(chromeBrowserify);
+    expect(firefoxWebpack).toStrictEqual(chromeBrowserify);
+  });
+
+  it('handles user journey with chrome-browserify and chrome-webpack sharing baseline', () => {
+    const baseline: HistoricalBaselineReference = {
+      'userJourneyOnboardingImport/onboardingImportWallet': {
+        importWalletToSocialScreen: { mean: 1100, p75: 1400, p95: 1900 },
+      },
+    };
+
+    const chromeBrowserify = resolveBaselineFromArtifactName(
+      baseline,
+      'onboardingImportWallet',
+      'benchmark-chrome-browserify-userJourneyOnboardingImport',
+    );
+    const chromeWebpack = resolveBaselineFromArtifactName(
+      baseline,
+      'onboardingImportWallet',
+      'benchmark-chrome-webpack-userJourneyOnboardingImport',
+    );
+
+    expect(chromeBrowserify).toBeDefined();
+    expect(chromeWebpack).toStrictEqual(chromeBrowserify);
+  });
+
+  it('handles startup with platform-specific baselines for each of 4 combos', () => {
+    const baseline: HistoricalBaselineReference = {
+      'pageLoad/chrome-browserify-startupStandardHome': {
+        uiStartup: { mean: 1400, p75: 1700, p95: 2100 },
+      },
+      'pageLoad/chrome-webpack-startupStandardHome': {
+        uiStartup: { mean: 1450, p75: 1750, p95: 2150 },
+      },
+      'pageLoad/firefox-browserify-startupStandardHome': {
+        uiStartup: { mean: 1600, p75: 1900, p95: 2400 },
+      },
+      'pageLoad/firefox-webpack-startupStandardHome': {
+        uiStartup: { mean: 1650, p75: 1950, p95: 2450 },
+      },
+    };
+
+    const chromeBrowserify = resolveBaseline(
+      baseline,
+      'startupStandardHome',
+      'chrome-browserify-startupStandardHome',
+    );
+    const chromeWebpack = resolveBaseline(
+      baseline,
+      'startupStandardHome',
+      'chrome-webpack-startupStandardHome',
+    );
+    const firefoxBrowserify = resolveBaseline(
+      baseline,
+      'startupStandardHome',
+      'firefox-browserify-startupStandardHome',
+    );
+    const firefoxWebpack = resolveBaseline(
+      baseline,
+      'startupStandardHome',
+      'firefox-webpack-startupStandardHome',
+    );
+
+    expect(chromeBrowserify?.uiStartup.mean).toBe(1400);
+    expect(chromeWebpack?.uiStartup.mean).toBe(1450);
+    expect(firefoxBrowserify?.uiStartup.mean).toBe(1600);
+    expect(firefoxWebpack?.uiStartup.mean).toBe(1650);
+  });
+});
+/* eslint-enable @typescript-eslint/naming-convention */
diff --git a/development/metamaskbot-build-announce/utils.ts b/development/metamaskbot-build-announce/utils.ts
index ec4bda3881fd..ca5dae788a28 100644
--- a/development/metamaskbot-build-announce/utils.ts
+++ b/development/metamaskbot-build-announce/utils.ts
@@ -2,6 +2,12 @@
  * Cross-cutting utilities for the PR announcement comment builder.
  */
 
+import {
+  BENCHMARK_PLATFORMS,
+  BENCHMARK_BUILD_TYPES,
+} from '../../shared/constants/benchmarks';
+import type { HistoricalBaselineReference } from './historical-comparison';
+
 /**
  * Runs a section builder and returns its result, or a "data not available"
  * message for `sectionName` if the builder returns null/undefined/'' or throws.
@@ -84,3 +90,169 @@ export async function postCommentWithMetamaskBot({
 
   return response;
 }
+
+const ENTRY_KEY_SEPARATOR = '|';
+
+const COMBO_SEPARATOR = '-';
+
+/**
+ * Builds a platform-buildType combo string.
+ *
+ * @param platform - Browser platform (e.g., 'chrome', 'firefox').
+ * @param buildType - Build type (e.g., 'browserify', 'webpack').
+ * @returns Combo string (e.g., 'chrome-browserify').
+ */
+export function buildCombo(platform: string, buildType: string): string {
+  return `${platform}${COMBO_SEPARATOR}${buildType}`;
+}
+
+/**
+ * Builds a unique key for a benchmark entry.
+ * Used to track entries across different data structures (maps, lookups).
+ *
+ * @param benchmarkName - Benchmark name (e.g., 'loadNewAccount').
+ * @param platform - Browser platform (e.g., 'chrome').
+ * @param buildType - Build type (e.g., 'browserify').
+ * @returns Entry key (e.g., 'loadNewAccount|chrome-browserify').
+ */
+export function buildEntryKey(
+  benchmarkName: string,
+  platform: string,
+  buildType: string,
+): string {
+  return `${benchmarkName}${ENTRY_KEY_SEPARATOR}${buildCombo(platform, buildType)}`;
+}
+
+/**
+ * Builds a CI artifact filename.
+ *
+ * @param platform - Browser platform (e.g., 'chrome').
+ * @param buildType - Build type (e.g., 'browserify').
+ * @param preset - Preset name (e.g., 'interactionUserActions').
+ * @returns Artifact filename (e.g., 'benchmark-chrome-browserify-interactionUserActions.json').
+ */
+export function buildArtifactFilename(
+  platform: string,
+  buildType: string,
+  preset: string,
+): string {
+  return `benchmark-${platform}-${buildType}-${preset}.json`;
+}
+
+/**
+ * Builds a full CI artifact URL.
+ *
+ * @param hostUrl - Base URL for artifacts (e.g., 'https://ci.example.com').
+ * @param platform - Browser platform (e.g., 'chrome').
+ * @param buildType - Build type (e.g., 'browserify').
+ * @param preset - Preset name (e.g., 'interactionUserActions').
+ * @returns Full artifact URL.
+ */
+export function buildArtifactUrl(
+  hostUrl: string,
+  platform: string,
+  buildType: string,
+  preset: string,
+): string {
+  return `${hostUrl}/benchmarks/${buildArtifactFilename(platform, buildType, preset)}`;
+}
+
+/**
+ * Maps preset names to their historical baseline keys.
+ *
+ * @param presetName - Preset name (e.g., 'startupStandardHome', 'interactionUserActions').
+ * @returns Baseline preset key (e.g., 'pageLoad', 'interactionUserActions').
+ */
+function mapPresetToBaselineKey(presetName: string): string {
+  if (presetName.startsWith('startup')) {
+    return 'pageLoad';
+  }
+  return presetName;
+}
+
+/**
+ * Resolves historical baseline metrics for a benchmark entry.
+ *
+ * Automatically maps startup preset names to 'pageLoad' since that's how
+ * they're stored in the historical baseline data.
+ *
+ * @param baseline - Full historical reference map.
+ * @param presetName - Preset name (e.g., 'startupStandardHome', 'interactionUserActions').
+ * @param benchmarkName - Benchmark name (e.g., 'loadNewAccount', 'chrome-browserify-startupStandardHome').
+ * @returns Baseline metrics or undefined if not found.
+ *
+ * @example
+ * // Interaction benchmark
+ * resolveBaseline(baseline, 'interactionUserActions', 'loadNewAccount')
+ * // → looks up: 'interactionUserActions/loadNewAccount'
+ *
+ * @example
+ * // Startup benchmark - preset name is automatically mapped to 'pageLoad'
+ * resolveBaseline(baseline, 'startupStandardHome', 'chrome-browserify-startupStandardHome')
+ * // → looks up: 'pageLoad/chrome-browserify-startupStandardHome'
+ */
+export function resolveBaseline(
+  baseline: HistoricalBaselineReference,
+  presetName: string,
+  benchmarkName: string,
+): HistoricalBaselineReference[string] | undefined {
+  const baselinePresetKey = mapPresetToBaselineKey(presetName);
+  const key = `${baselinePresetKey}/${benchmarkName}`;
+  return baseline[key];
+}
+
+/**
+ * Extracts the preset name from a CI artifact filename.
+ *
+ * Examples:
+ * - `benchmark-chrome-browserify-interactionUserActions` → `interactionUserActions`
+ * - `benchmark-firefox-webpack-startupStandardHome` → `pageLoad` (startup artifacts map to historical `pageLoad` key)
+ *
+ * @param artifactFileName - CI artifact filename without extension.
+ * @returns Preset name, or undefined if not a valid artifact filename.
+ */
+export function extractPresetFromArtifactName(
+  artifactFileName: string,
+): string | undefined {
+  const platforms = Object.values(BENCHMARK_PLATFORMS).join('|');
+  const buildTypes = Object.values(BENCHMARK_BUILD_TYPES).join('|');
+  const pattern = new RegExp(
+    `^benchmark-(?:${platforms})-(?:${buildTypes})-(.+)$`,
+    'u',
+  );
+  const match = pattern.exec(artifactFileName);
+  if (!match) {
+    return undefined;
+  }
+
+  const presetName = match[1];
+
+  // Special case: startup benchmarks are stored under 'pageLoad' preset
+  if (presetName.startsWith('startup')) {
+    return 'pageLoad';
+  }
+
+  return presetName;
+}
+
+/**
+ * Resolves baseline metrics using a CI artifact filename.
+ *
+ *
+ * @param baseline - Full historical reference map.
+ * @param benchmarkName - Benchmark name (e.g., 'loadNewAccount').
+ * @param artifactFileName - CI artifact filename (e.g., 'benchmark-chrome-browserify-interactionUserActions').
+ * @returns Baseline metrics or undefined if not found.
+ */
+export function resolveBaselineFromArtifactName(
+  baseline: HistoricalBaselineReference,
+  benchmarkName: string,
+  artifactFileName: string,
+): HistoricalBaselineReference[string] | undefined {
+  const presetName = extractPresetFromArtifactName(artifactFileName);
+  if (!presetName) {
+    return undefined;
+  }
+
+  return resolveBaseline(baseline, presetName, benchmarkName);
+}
diff --git a/development/ts-migration-dashboard/files-to-convert.json b/development/ts-migration-dashboard/files-to-convert.json
index b3d2873debfb..a08bd5051a2a 100644
--- a/development/ts-migration-dashboard/files-to-convert.json
+++ b/development/ts-migration-dashboard/files-to-convert.json
@@ -1,64 +1,31 @@
 [
   ".eslintrc.js",
+  "app/scripts/app-init.js",
   "app/scripts/background.js",
-  "app/scripts/constants/contracts.js",
-  "app/scripts/constants/on-ramp.js",
   "app/scripts/contentscript.js",
-  "app/scripts/controllers/cached-balances.js",
-  "app/scripts/controllers/cached-balances.test.js",
-  "app/scripts/controllers/ens/ens.js",
-  "app/scripts/controllers/ens/index.js",
-  "app/scripts/controllers/ens/index.test.js",
-  "app/scripts/controllers/incoming-transactions.js",
-  "app/scripts/controllers/incoming-transactions.test.js",
-  "app/scripts/controllers/metametrics.js",
-  "app/scripts/controllers/metametrics.test.js",
-  "app/scripts/controllers/network/createInfuraClient.js",
-  "app/scripts/controllers/network/createJsonRpcClient.js",
-  "app/scripts/controllers/network/createMetamaskMiddleware.js",
-  "app/scripts/controllers/network/index.js",
-  "app/scripts/controllers/network/middleware/pending.js",
-  "app/scripts/controllers/network/network-controller.test.js",
-  "app/scripts/controllers/network/network.js",
-  "app/scripts/controllers/network/pending-middleware.test.js",
-  "app/scripts/controllers/network/util.js",
-  "app/scripts/controllers/network/util.test.js",
-  "app/scripts/controllers/onboarding.js",
-  "app/scripts/controllers/permissions/background-api.js",
-  "app/scripts/controllers/permissions/background-api.test.js",
-  "app/scripts/controllers/permissions/caveat-mutators.js",
-  "app/scripts/controllers/permissions/caveat-mutators.test.js",
-  "app/scripts/controllers/permissions/enums.js",
-  "app/scripts/controllers/permissions/flask/snap-permissions.js",
-  "app/scripts/controllers/permissions/flask/snap-permissions.test.js",
   "app/scripts/controllers/permissions/index.js",
-  "app/scripts/controllers/permissions/permission-log.js",
-  "app/scripts/controllers/permissions/permission-log.test.js",
   "app/scripts/controllers/permissions/selectors.js",
   "app/scripts/controllers/permissions/selectors.test.js",
   "app/scripts/controllers/permissions/specifications.js",
   "app/scripts/controllers/permissions/specifications.test.js",
-  "app/scripts/controllers/swaps.js",
-  "app/scripts/controllers/swaps.test.js",
-  "app/scripts/controllers/transactions/index.js",
-  "app/scripts/controllers/transactions/index.test.js",
-  "app/scripts/controllers/transactions/lib/tx-state-history-helpers.js",
-  "app/scripts/controllers/transactions/lib/tx-state-history-helpers.test.js",
-  "app/scripts/controllers/transactions/lib/util.js",
-  "app/scripts/controllers/transactions/lib/util.test.js",
-  "app/scripts/controllers/transactions/pending-tx-tracker.js",
-  "app/scripts/controllers/transactions/pending-tx-tracker.test.js",
-  "app/scripts/controllers/transactions/tx-gas-utils.js",
-  "app/scripts/controllers/transactions/tx-gas-utils.test.js",
-  "app/scripts/controllers/transactions/tx-state-manager.js",
-  "app/scripts/controllers/transactions/tx-state-manager.test.js",
   "app/scripts/detect-multiple-instances.js",
   "app/scripts/detect-multiple-instances.test.js",
   "app/scripts/disable-console.js",
   "app/scripts/first-time-state.js",
+  "app/scripts/fixtures/generate-wallet-state.js",
+  "app/scripts/fixtures/with-address-book.js",
+  "app/scripts/fixtures/with-app-state.js",
+  "app/scripts/fixtures/with-confirmed-transactions.js",
+  "app/scripts/fixtures/with-erc20-tokens.js",
+  "app/scripts/fixtures/with-networks.js",
+  "app/scripts/fixtures/with-preferences.js",
+  "app/scripts/fixtures/with-unread-notifications.js",
+  "app/scripts/init-globals.js",
   "app/scripts/inpage.js",
   "app/scripts/lib/ComposableObservableStore.js",
   "app/scripts/lib/ComposableObservableStore.test.js",
+  "app/scripts/lib/backup.js",
+  "app/scripts/lib/backup.test.js",
   "app/scripts/lib/cleanErrorStack.js",
   "app/scripts/lib/cleanErrorStack.test.js",
   "app/scripts/lib/createLoggerMiddleware.js",
@@ -69,46 +36,36 @@
   "app/scripts/lib/createRPCMethodTrackingMiddleware.js",
   "app/scripts/lib/createRPCMethodTrackingMiddleware.test.js",
   "app/scripts/lib/createTabIdMiddleware.js",
-  "app/scripts/lib/ens-ipfs/contracts/registry.js",
-  "app/scripts/lib/ens-ipfs/contracts/resolver.js",
   "app/scripts/lib/ens-ipfs/resolver.js",
   "app/scripts/lib/ens-ipfs/setup.js",
   "app/scripts/lib/extractEthjsErrorMessage.js",
-  "app/scripts/lib/get-first-preferred-lang-code.js",
   "app/scripts/lib/getObjStructure.js",
-  "app/scripts/lib/local-store.js",
-  "app/scripts/lib/message-manager.js",
-  "app/scripts/lib/message-manager.test.js",
-  "app/scripts/lib/metaRPCClientFactory.js",
   "app/scripts/lib/metaRPCClientFactory.test.js",
   "app/scripts/lib/migrator/index.js",
   "app/scripts/lib/migrator/index.test.js",
-  "app/scripts/lib/network-store.js",
   "app/scripts/lib/notification-manager.js",
-  "app/scripts/lib/personal-message-manager.js",
-  "app/scripts/lib/personal-message-manager.test.js",
+  "app/scripts/lib/ppom/ppom.js",
   "app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js",
+  "app/scripts/lib/rpc-method-middleware/createMethodMiddleware.test.js",
   "app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/eth-accounts.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/get-provider-state.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/index.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/send-metadata.js",
+  "app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.test.js",
+  "app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js",
   "app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js",
-  "app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js",
+  "app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.test.js",
+  "app/scripts/lib/rpc-method-middleware/handlers/watch-asset.test.js",
   "app/scripts/lib/rpc-method-middleware/index.js",
-  "app/scripts/lib/seed-phrase-verifier.js",
-  "app/scripts/lib/seed-phrase-verifier.test.js",
-  "app/scripts/lib/segment.js",
+  "app/scripts/lib/segment/analytics.js",
+  "app/scripts/lib/segment/analytics.test.js",
+  "app/scripts/lib/segment/index.js",
+  "app/scripts/lib/setup-initial-state-hooks.js",
   "app/scripts/lib/setupSentry.js",
+  "app/scripts/lib/setupSentry.test.js",
   "app/scripts/lib/stream-utils.js",
-  "app/scripts/lib/typed-message-manager.js",
-  "app/scripts/lib/typed-message-manager.test.js",
-  "app/scripts/lib/util.js",
   "app/scripts/lib/util.test.js",
+  "app/scripts/lockdown-install.js",
   "app/scripts/lockdown-more.js",
   "app/scripts/lockdown-run.js",
+  "app/scripts/metamask-controller.actions.test.js",
   "app/scripts/metamask-controller.js",
   "app/scripts/metamask-controller.test.js",
   "app/scripts/migrations/002.js",
@@ -235,123 +192,167 @@
   "app/scripts/migrations/072.test.js",
   "app/scripts/migrations/073.js",
   "app/scripts/migrations/073.test.js",
+  "app/scripts/migrations/074.js",
+  "app/scripts/migrations/074.test.js",
+  "app/scripts/migrations/075.js",
+  "app/scripts/migrations/075.test.js",
+  "app/scripts/migrations/076.js",
+  "app/scripts/migrations/076.test.js",
+  "app/scripts/migrations/077.js",
+  "app/scripts/migrations/077.test.js",
+  "app/scripts/migrations/078.test.js",
+  "app/scripts/migrations/079.js",
+  "app/scripts/migrations/079.test.js",
+  "app/scripts/migrations/080.js",
+  "app/scripts/migrations/080.test.js",
+  "app/scripts/migrations/081.test.js",
+  "app/scripts/migrations/082.test.js",
+  "app/scripts/migrations/083.test.js",
+  "app/scripts/migrations/084.test.js",
+  "app/scripts/migrations/085.test.js",
+  "app/scripts/migrations/086.test.js",
+  "app/scripts/migrations/087.test.js",
+  "app/scripts/migrations/090.test.js",
+  "app/scripts/migrations/101.test.js",
+  "app/scripts/migrations/103.test.js",
+  "app/scripts/migrations/106.js",
+  "app/scripts/migrations/106.test.js",
   "app/scripts/migrations/fail-tx.js",
   "app/scripts/migrations/index.js",
   "app/scripts/migrations/migrations.test.js",
-  "app/scripts/migrations/template.js",
   "app/scripts/migrations/template.test.js",
+  "app/scripts/offscreen.js",
   "app/scripts/platforms/extension.js",
   "app/scripts/platforms/extension.test.js",
   "app/scripts/sentry-install.js",
   "app/scripts/ui.js",
+  "app/scripts/use-snow.js",
+  "development/build/config.js",
   "development/build/constants.js",
   "development/build/display.js",
   "development/build/etc.js",
   "development/build/index.js",
   "development/build/manifest.js",
-  "development/build/sass-compiler.js",
   "development/build/scripts.js",
+  "development/build/set-environment-variables.js",
   "development/build/static.js",
   "development/build/styles.js",
   "development/build/task.js",
+  "development/build/transforms/import-meta-url.js",
   "development/build/transforms/remove-fenced-code.js",
   "development/build/transforms/remove-fenced-code.test.js",
   "development/build/transforms/utils.js",
   "development/build/transforms/utils.test.js",
   "development/build/utils.js",
   "development/lib/build-type.js",
+  "development/lib/create-segment-server.js",
+  "development/lib/exit-with-error.js",
   "development/lib/get-version.js",
+  "development/lib/locales.js",
+  "development/lib/parse-port.js",
+  "development/lib/retry.js",
+  "development/lib/run-command.js",
+  "development/lib/variables.js",
   "development/stream-flat-map.js",
-  "shared/constants/alerts.js",
-  "shared/constants/app.js",
-  "shared/constants/gas.js",
-  "shared/constants/hardware-wallets.js",
-  "shared/constants/labels.js",
-  "shared/constants/metametrics.js",
-  "shared/constants/network.js",
-  "shared/constants/permissions.js",
+  "shared/constants/alarms.js",
   "shared/constants/permissions.test.js",
-  "shared/constants/phishing.js",
-  "shared/constants/smartTransactions.js",
-  "shared/constants/swaps.js",
-  "shared/constants/time.js",
-  "shared/constants/transaction.js",
-  "shared/lib/buffer-utils.js",
-  "shared/lib/buffer-utils.test.js",
-  "shared/lib/contract-utils.js",
+  "shared/lib/browser-runtime.utils.js",
+  "shared/lib/browser-runtime.utils.test.js",
   "shared/lib/contract-utils.test.js",
-  "shared/lib/conversion.utils.js",
   "shared/lib/conversion.utils.test.js",
-  "shared/lib/fetch-with-timeout.js",
-  "shared/lib/fetch-with-timeout.test.js",
+  "shared/lib/deep-linking.js",
+  "shared/lib/deep-linking.test.js",
+  "shared/lib/error-utils.js",
+  "shared/lib/error-utils.test.js",
+  "shared/lib/fetch-with-cache.test.js",
   "shared/lib/gas.utils.js",
   "shared/lib/gas.utils.test.js",
-  "shared/lib/hexstring-utils.js",
+  "shared/lib/get-first-preferred-lang-code.js",
   "shared/lib/hexstring-utils.test.js",
   "shared/lib/mv3.utils.js",
-  "shared/lib/network.utils.js",
-  "shared/lib/object.utils.js",
-  "shared/lib/random-id.js",
-  "shared/lib/rpc.utils.js",
-  "shared/lib/siwe.js",
-  "shared/lib/string-utils.js",
+  "shared/lib/provider-injection.js",
+  "shared/lib/sentry-release.js",
+  "shared/lib/storage-helpers.js",
+  "shared/lib/string-utils.test.js",
+  "shared/lib/swaps-utils.js",
+  "shared/lib/swaps-utils.test.js",
   "shared/lib/swaps.utils.js",
-  "shared/lib/transaction.utils.js",
   "shared/lib/transaction.utils.test.js",
-  "shared/notifications/index.js",
+  "shared/lib/updateTxData.js",
+  "shared/lib/updateTxData.test.js",
+  "test/data/mock-data.js",
+  "test/e2e/.mocharc.js",
+  "test/e2e/changedFilesUtil.js",
+  "test/e2e/fixtures/default-fixture.js",
+  "test/e2e/fixtures/fixture-builder.js",
+  "test/e2e/fixtures/fixture-server.js",
+  "test/e2e/helpers.js",
+  "test/e2e/helpers.test.js",
+  "test/e2e/lavamoat-stats.js",
+  "test/e2e/mock-cdn/update-mock-cdn-files.js",
+  "test/e2e/mock-e2e-allowlist.js",
+  "test/e2e/mock-e2e.js",
+  "test/e2e/phishing-warning-page-server.js",
+  "test/e2e/provider/bfcache.spec.js",
+  "test/e2e/provider/eip-6963.spec.js",
+  "test/e2e/reporters/enhanced-spec-reporter.js",
+  "test/e2e/run-e2e-test.js",
+  "test/e2e/seeder/anvil-seeder.js",
+  "test/e2e/seeder/contract-address-registry.js",
+  "test/e2e/seeder/ganache-seeder.js",
+  "test/e2e/seeder/smart-contracts.js",
+  "test/e2e/send-eth-with-private-key-test/ethereumjs-tx.js",
+  "test/e2e/send-eth-with-private-key-test/send-eth-with-private-key.js",
+  "test/e2e/send-eth-with-private-key-test/web3js.js",
+  "test/e2e/snaps/enums.js",
+  "test/e2e/tests/metrics/swaps.spec.js",
+  "test/e2e/tests/phishing-controller/helpers.js",
+  "test/e2e/tests/phishing-controller/mocks.js",
+  "test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js",
+  "test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js",
+  "test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js",
+  "test/e2e/tests/ppom/ppom-blockaid-alert.spec.js",
+  "test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js",
+  "test/e2e/tests/tokens/nft/mocks.js",
+  "test/e2e/webdriver/chrome.js",
+  "test/e2e/webdriver/driver.js",
+  "test/e2e/webdriver/firefox.js",
+  "test/e2e/webdriver/index.js",
+  "test/env.js",
+  "test/helpers/file.js",
   "test/helpers/protect-intrinsics-helpers.js",
-  "test/jest/background.js",
+  "test/helpers/setup-after-helper.js",
+  "test/helpers/setup-helper.js",
+  "test/integration/config/env.js",
+  "test/integration/config/setup.js",
+  "test/integration/config/setupAfter.js",
+  "test/integration/config/transforms/css-link.js",
+  "test/jest/console-baseline-reporter.js",
+  "test/jest/console-categorizer.js",
+  "test/jest/console-reporter-rules-integration.js",
+  "test/jest/console-reporter-rules-unit.js",
   "test/jest/constants.js",
   "test/jest/index.js",
   "test/jest/mock-store.js",
-  "test/jest/mocks.js",
-  "test/jest/rendering.js",
+  "test/jest/setup.js",
   "test/lib/createTxMeta.js",
   "test/lib/mock-encryptor.js",
+  "test/lib/render-helpers-navigate.js",
   "test/lib/render-helpers.js",
-  "test/lib/tick.js",
-  "test/mocks/permissions.js",
+  "test/lib/timer-helpers.js",
+  "test/mocks/lightweight-charts.js",
+  "test/setup.js",
+  "test/stub/keyring-bridge.js",
+  "test/stub/keyring-utils.js",
   "test/stub/provider.js",
   "test/stub/tx-meta-stub.js",
   "test/unit-global/balance-formatter.test.js",
-  "test/unit-global/protect-intrinsics.test.js",
+  "ui/__mocks__/actions.js",
+  "ui/__mocks__/webextension-polyfill.js",
   "ui/components/app/account-list-item/account-list-item-component.test.js",
   "ui/components/app/account-list-item/account-list-item.js",
   "ui/components/app/account-list-item/account-list-item.stories.js",
   "ui/components/app/account-list-item/index.js",
-  "ui/components/app/account-menu/account-menu.component.js",
-  "ui/components/app/account-menu/account-menu.container.js",
-  "ui/components/app/account-menu/account-menu.test.js",
-  "ui/components/app/account-menu/index.js",
-  "ui/components/app/add-network/add-network.js",
-  "ui/components/app/add-network/add-network.stories.js",
-  "ui/components/app/add-network/add-network.test.js",
-  "ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js",
-  "ui/components/app/advanced-gas-controls/advanced-gas-controls.stories.js",
-  "ui/components/app/advanced-gas-controls/advanced-gas-controls.test.js",
-  "ui/components/app/advanced-gas-controls/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js",
-  "ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/index.js",
-  "ui/components/app/advanced-gas-fee-popover/context/advancedGasFeePopover.js",
-  "ui/components/app/advanced-gas-fee-popover/context/index.js",
-  "ui/components/app/advanced-gas-fee-popover/index.js",
   "ui/components/app/alerts/alerts.js",
   "ui/components/app/alerts/index.js",
   "ui/components/app/alerts/invalid-custom-network-alert/index.js",
@@ -359,58 +360,31 @@
   "ui/components/app/alerts/unconnected-account-alert/index.js",
   "ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.js",
   "ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js",
-  "ui/components/app/app-header/app-header.component.js",
-  "ui/components/app/app-header/app-header.container.js",
-  "ui/components/app/app-header/app-header.stories.js",
-  "ui/components/app/app-header/app-header.test.js",
-  "ui/components/app/app-header/index.js",
   "ui/components/app/app-loading-spinner/app-loading-spinner.js",
+  "ui/components/app/app-loading-spinner/app-loading-spinner.stories.js",
   "ui/components/app/app-loading-spinner/app-loading-spinner.test.js",
   "ui/components/app/app-loading-spinner/index.js",
-  "ui/components/app/asset-list-item/asset-list-item.js",
-  "ui/components/app/asset-list-item/index.js",
-  "ui/components/app/asset-list/asset-list.js",
-  "ui/components/app/asset-list/detected-tokens-link/detected-tokens-link.js",
-  "ui/components/app/asset-list/detected-tokens-link/detected-tokens-link.stories.js",
-  "ui/components/app/asset-list/detected-tokens-link/detected-tokens-link.test.js",
-  "ui/components/app/asset-list/index.js",
+  "ui/components/app/assets/asset-list/asset-list.stories.js",
+  "ui/components/app/assets/nfts/nft-default-image/index.js",
+  "ui/components/app/assets/nfts/nft-default-image/nft-default-image.stories.js",
+  "ui/components/app/assets/nfts/nft-default-image/nft-default-image.test.js",
+  "ui/components/app/assets/nfts/nft-default-image/toggle-ipfs-modal.js",
+  "ui/components/app/assets/nfts/nft-details/nft-detail-description.stories.js",
+  "ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.stories.js",
+  "ui/components/app/assets/nfts/nft-details/nft-detail-information-row.stories.js",
+  "ui/components/app/assets/nfts/nft-details/nft-details.stories.js",
+  "ui/components/app/assets/nfts/nft-details/nft-details.test.js",
+  "ui/components/app/assets/nfts/nft-details/nft-full-image.test.js",
+  "ui/components/app/assets/nfts/nft-options/nft-options.stories.js",
+  "ui/components/app/assets/nfts/nft-options/nft-options.test.js",
+  "ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.stories.js",
+  "ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice.stories.js",
+  "ui/components/app/assets/nfts/nfts-tab/nfts-tab.test.js",
+  "ui/components/app/assets/token-cell/token-cell.stories.js",
+  "ui/components/app/cancel-button/cancel-buitton.stories.js",
   "ui/components/app/cancel-button/cancel-button.js",
   "ui/components/app/cancel-button/index.js",
-  "ui/components/app/nft-default-image/nft-default-image.js",
-  "ui/components/app/nft-default-image/nft-default-image.stories.js",
-  "ui/components/app/nft-default-image/index.js",
-  "ui/components/app/nft-details/nft-details.js",
-  "ui/components/app/nft-details/nft-details.stories.js",
-  "ui/components/app/nft-options/nft-options.js",
-  "ui/components/app/nfts-detection-notice/nfts-detection-notice.js",
-  "ui/components/app/nfts-detection-notice/index.js",
-  "ui/components/app/nfts-items/nfts-items.js",
-  "ui/components/app/nfts-items/index.js",
-  "ui/components/app/nfts-tab/nfts-tab.js",
-  "ui/components/app/nfts-tab/nfts-tab.test.js",
-  "ui/components/app/nfts-tab/index.js",
-  "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js",
-  "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js",
-  "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js",
-  "ui/components/app/confirm-page-container/confirm-detail-row/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-container.test.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.stories.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-content/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.stories.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-header/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container-navigation/index.js",
-  "ui/components/app/confirm-page-container/confirm-page-container.component.js",
-  "ui/components/app/confirm-page-container/confirm-page-container.container.js",
-  "ui/components/app/confirm-page-container/index.js",
+  "ui/components/app/configure-snap-popup/index.js",
   "ui/components/app/connected-accounts-list/connected-accounts-list-item/connected-accounts-list-item.component.js",
   "ui/components/app/connected-accounts-list/connected-accounts-list-item/index.js",
   "ui/components/app/connected-accounts-list/connected-accounts-list-options/connected-accounts-list-options.component.js",
@@ -418,14 +392,17 @@
   "ui/components/app/connected-accounts-list/connected-accounts-list.component.js",
   "ui/components/app/connected-accounts-list/connected-accounts-list.stories.js",
   "ui/components/app/connected-accounts-list/index.js",
+  "ui/components/app/connected-accounts-permissions/connected-account-permissions.stories.js",
   "ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js",
   "ui/components/app/connected-accounts-permissions/index.js",
   "ui/components/app/connected-sites-list/connected-sites-list.component.js",
+  "ui/components/app/connected-sites-list/connected-sites-list.container.js",
+  "ui/components/app/connected-sites-list/connected-sites-list.js",
+  "ui/components/app/connected-sites-list/connected-snaps.js",
   "ui/components/app/connected-sites-list/index.js",
-  "ui/components/app/connected-status-indicator/connected-status-indicator.js",
-  "ui/components/app/connected-status-indicator/index.js",
   "ui/components/app/create-new-vault/create-new-vault.js",
   "ui/components/app/create-new-vault/create-new-vault.stories.js",
+  "ui/components/app/create-new-vault/create-new-vault.test.js",
   "ui/components/app/create-new-vault/index.js",
   "ui/components/app/currency-input/currency-input.js",
   "ui/components/app/currency-input/currency-input.stories.js",
@@ -449,77 +426,34 @@
   "ui/components/app/detected-token/detected-token-values/detected-token-values.test.js",
   "ui/components/app/detected-token/detected-token.js",
   "ui/components/app/detected-token/detected-token.test.js",
-  "ui/components/app/edit-gas-display/edit-gas-display.component.js",
-  "ui/components/app/edit-gas-display/edit-gas-display.stories.js",
-  "ui/components/app/edit-gas-display/edit-gas-display.test.js",
-  "ui/components/app/edit-gas-display/index.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-item/index.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-item/useGasItemFeeDetails.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js",
-  "ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js",
-  "ui/components/app/edit-gas-fee-popover/index.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/index.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.test.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js",
-  "ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js",
-  "ui/components/app/edit-gas-popover/edit-gas-popover.component.js",
-  "ui/components/app/edit-gas-popover/edit-gas-popover.stories.js",
-  "ui/components/app/edit-gas-popover/index.js",
+  "ui/components/app/detected-token/index.js",
   "ui/components/app/flask/experimental-area/experimental-area.js",
   "ui/components/app/flask/experimental-area/experimental-area.stories.js",
   "ui/components/app/flask/experimental-area/index.js",
-  "ui/components/app/flask/snap-install-warning/index.js",
-  "ui/components/app/flask/snap-install-warning/snap-install-warning.js",
-  "ui/components/app/flask/snap-remove-warning/index.js",
-  "ui/components/app/flask/snap-remove-warning/snap-remove-warning.js",
-  "ui/components/app/flask/snap-settings-card/index.js",
-  "ui/components/app/flask/snap-settings-card/snap-settings-card.js",
-  "ui/components/app/flask/snap-settings-card/snap-settings-card.stories.js",
-  "ui/components/app/flask/snap-settings-card/snap-settings-card.test.js",
-  "ui/components/app/flask/snaps-authorship-pill/index.js",
-  "ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js",
-  "ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js",
-  "ui/components/app/flask/update-snap-permission-list/index.js",
-  "ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js",
-  "ui/components/app/advanced-gas-inputs/advanced-gas-inputs.component.js",
-  "ui/components/app/advanced-gas-inputs/advanced-gas-inputs.container.js",
-  "ui/components/app/advanced-gas-inputs/advanced-gas-inputs.test.js",
-  "ui/components/app/advanced-gas-inputs/index.js",
-  "ui/components/app/gas-timing/gas-timing.component.js",
-  "ui/components/app/gas-timing/gas-timing.component.test.js",
-  "ui/components/app/gas-timing/index.js",
   "ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js",
   "ui/components/app/hold-to-reveal-button/hold-to-reveal-button.stories.js",
   "ui/components/app/hold-to-reveal-button/hold-to-reveal-button.test.js",
+  "ui/components/app/hold-to-reveal-button/index.js",
   "ui/components/app/home-notification/home-notification.component.js",
   "ui/components/app/home-notification/home-notification.stories.js",
   "ui/components/app/home-notification/index.js",
-  "ui/components/app/import-token-link/import-token-link.component.js",
-  "ui/components/app/import-token-link/index.js",
-  "ui/components/app/ledger-instruction-field/index.js",
-  "ui/components/app/ledger-instruction-field/ledger-instruction-field.js",
-  "ui/components/app/loading-network-screen/index.js",
-  "ui/components/app/loading-network-screen/loading-network-screen.component.js",
-  "ui/components/app/loading-network-screen/loading-network-screen.container.js",
-  "ui/components/app/menu-bar/account-options-menu.js",
-  "ui/components/app/menu-bar/accoutn-options-menu.stories.js",
-  "ui/components/app/menu-bar/index.js",
-  "ui/components/app/menu-bar/menu-bar.js",
-  "ui/components/app/menu-bar/menu-bar.test.js",
+  "ui/components/app/import-token/token-list/index.js",
+  "ui/components/app/import-token/token-list/token-list-placeholder/index.js",
+  "ui/components/app/import-token/token-list/token-list-placeholder/token-list-placeholder.component.js",
+  "ui/components/app/import-token/token-list/token-list-placeholder/token-list-placeholder.stories.js",
+  "ui/components/app/import-token/token-list/token-list.component.js",
+  "ui/components/app/import-token/token-list/token-list.container.js",
+  "ui/components/app/import-token/token-search/index.js",
+  "ui/components/app/import-token/token-search/token-search.component.js",
+  "ui/components/app/import-token/token-search/token-search.stories.js",
   "ui/components/app/menu-droppo.js",
   "ui/components/app/metamask-template-renderer/index.js",
   "ui/components/app/metamask-template-renderer/metamask-template-renderer.js",
   "ui/components/app/metamask-template-renderer/metamask-template-renderer.stories.js",
   "ui/components/app/metamask-template-renderer/safe-component-list.js",
+  "ui/components/app/metamask-template-renderer/section-shape.js",
   "ui/components/app/metamask-translation/index.js",
   "ui/components/app/metamask-translation/metamask-translation.js",
-  "ui/components/app/metamask-translation/metamask-translation.stories.js",
   "ui/components/app/modal/index.js",
   "ui/components/app/modal/modal-content/index.js",
   "ui/components/app/modal/modal-content/modal-content.component.js",
@@ -529,10 +463,6 @@
   "ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.js",
   "ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js",
   "ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/index.js",
-  "ui/components/app/modals/cancel-transaction/cancel-transaction.component.js",
-  "ui/components/app/modals/cancel-transaction/cancel-transaction.component.test.js",
-  "ui/components/app/modals/cancel-transaction/cancel-transaction.container.js",
-  "ui/components/app/modals/cancel-transaction/index.js",
   "ui/components/app/modals/confirm-delete-network/confirm-delete-network.component.js",
   "ui/components/app/modals/confirm-delete-network/confirm-delete-network.container.js",
   "ui/components/app/modals/confirm-delete-network/confirm-delete-network.test.js",
@@ -543,12 +473,19 @@
   "ui/components/app/modals/confirm-reset-account/index.js",
   "ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js",
   "ui/components/app/modals/customize-nonce/customize-nonce.component.js",
+  "ui/components/app/modals/customize-nonce/customize-nonce.stories.js",
+  "ui/components/app/modals/customize-nonce/customize-nonce.test.js",
   "ui/components/app/modals/customize-nonce/index.js",
   "ui/components/app/modals/fade-modal.js",
   "ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js",
+  "ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.test.js",
   "ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js",
   "ui/components/app/modals/hide-token-confirmation-modal/index.js",
+  "ui/components/app/modals/hold-to-reveal-modal/hold-to-reveal-modal.test.js",
   "ui/components/app/modals/index.js",
+  "ui/components/app/modals/loading-network-error/index.js",
+  "ui/components/app/modals/loading-network-error/loading-network-error.component.js",
+  "ui/components/app/modals/loading-network-error/loading-network-error.container.js",
   "ui/components/app/modals/modal.js",
   "ui/components/app/modals/new-account-modal/index.js",
   "ui/components/app/modals/new-account-modal/new-account-modal.component.js",
@@ -559,10 +496,22 @@
   "ui/components/app/modals/qr-scanner/index.js",
   "ui/components/app/modals/qr-scanner/qr-scanner.component.js",
   "ui/components/app/modals/qr-scanner/qr-scanner.container.js",
-  "ui/components/app/multilayer-fee-message/index.js",
-  "ui/components/app/multilayer-fee-message/multi-layer-fee-message.js",
+  "ui/components/app/modals/qr-scanner/qr-scanner.test.js",
   "ui/components/app/multiple-notifications/index.js",
   "ui/components/app/multiple-notifications/multiple-notifications.component.js",
+  "ui/components/app/network-account-balance-header/index.js",
+  "ui/components/app/network-account-balance-header/network-account-balance-header.js",
+  "ui/components/app/network-account-balance-header/network-account-balance-header.stories.js",
+  "ui/components/app/permission-cell/index.js",
+  "ui/components/app/permission-cell/permission-cell-options.js",
+  "ui/components/app/permission-cell/permission-cell-status.js",
+  "ui/components/app/permission-cell/permission-cell.js",
+  "ui/components/app/permission-cell/permission-cell.stories.js",
+  "ui/components/app/permission-cell/permission-cell.test.js",
+  "ui/components/app/permission-connect-header/index.js",
+  "ui/components/app/permission-connect-header/permission-connect-header.js",
+  "ui/components/app/permission-connect-header/permission-connect-header.stories.js",
+  "ui/components/app/permission-connect-header/permission-connect-header.test.js",
   "ui/components/app/permission-page-container/index.js",
   "ui/components/app/permission-page-container/permission-page-container-content/index.js",
   "ui/components/app/permission-page-container/permission-page-container-content/permission-page-container-content.component.js",
@@ -576,61 +525,115 @@
   "ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js",
   "ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.stories.js",
   "ui/components/app/qr-hardware-popover/base-reader.js",
+  "ui/components/app/qr-hardware-popover/base-reader.test.js",
   "ui/components/app/qr-hardware-popover/enhanced-reader.js",
   "ui/components/app/qr-hardware-popover/index.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-popover.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-sign-request/index.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js",
+  "ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.stories.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-sign-request/qr-hardware-sign-request.component.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-sign-request/reader.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/index.js",
   "ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/qr-hardware-wallet-importer.component.js",
   "ui/components/app/recovery-phrase-reminder/index.js",
   "ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js",
+  "ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.stories.js",
   "ui/components/app/selected-account/index.js",
   "ui/components/app/selected-account/selected-account-component.test.js",
   "ui/components/app/selected-account/selected-account.component.js",
   "ui/components/app/selected-account/selected-account.container.js",
-  "ui/components/app/signature-request-siwe/index.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-header/index.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-header/signature-request-siwe-header.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-header/signature-request-siwe-header.stories.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-message/index.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.stories.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe.js",
-  "ui/components/app/signature-request-siwe/signature-request-siwe.stories.js",
-  "ui/components/app/signature-request/index.js",
-  "ui/components/app/signature-request/signature-request-footer/index.js",
-  "ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js",
-  "ui/components/app/signature-request/signature-request-header/index.js",
-  "ui/components/app/signature-request/signature-request-header/signature-request-header.component.js",
-  "ui/components/app/signature-request/signature-request-header/signature-request-header.stories.js",
-  "ui/components/app/signature-request/signature-request-message/index.js",
-  "ui/components/app/signature-request/signature-request-message/signature-request-message.js",
-  "ui/components/app/signature-request/signature-request.component.js",
-  "ui/components/app/signature-request/signature-request.component.test.js",
-  "ui/components/app/signature-request/signature-request.container.js",
-  "ui/components/app/signature-request/signature-request.container.test.js",
-  "ui/components/app/signature-request/signature-request.stories.js",
+  "ui/components/app/selected-account/selected-account.stories.js",
+  "ui/components/app/snaps/copyable/copyable.js",
+  "ui/components/app/snaps/copyable/copyable.stories.js",
+  "ui/components/app/snaps/copyable/copyable.test.js",
+  "ui/components/app/snaps/copyable/index.js",
+  "ui/components/app/snaps/install-error/index.js",
+  "ui/components/app/snaps/install-error/install-error.js",
+  "ui/components/app/snaps/install-error/install-error.stories.js",
+  "ui/components/app/snaps/keyring-snap-removal-warning/keyring-snap-removal-warning.stories.js",
+  "ui/components/app/snaps/show-more/index.js",
+  "ui/components/app/snaps/show-more/show-more.js",
+  "ui/components/app/snaps/snap-authorship-expanded/index.js",
+  "ui/components/app/snaps/snap-authorship-expanded/snap-authorship-expanded.js",
+  "ui/components/app/snaps/snap-authorship-header/index.js",
+  "ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js",
+  "ui/components/app/snaps/snap-authorship-header/snap-authorship-header.stories.js",
+  "ui/components/app/snaps/snap-connect-cell/index.js",
+  "ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js",
+  "ui/components/app/snaps/snap-connect-cell/snap-connect-cell.stories.js",
+  "ui/components/app/snaps/snap-delineator/index.js",
+  "ui/components/app/snaps/snap-delineator/snap-delineator.js",
+  "ui/components/app/snaps/snap-delineator/snap-delineator.stories.js",
+  "ui/components/app/snaps/snap-delineator/snap-delineator.test.js",
+  "ui/components/app/snaps/snap-home-menu/index.js",
+  "ui/components/app/snaps/snap-home-menu/snap-home-menu.js",
+  "ui/components/app/snaps/snap-home-page/snap-home-renderer.js",
+  "ui/components/app/snaps/snap-home-page/useSnapHome.js",
+  "ui/components/app/snaps/snap-install-warning/index.js",
+  "ui/components/app/snaps/snap-install-warning/snap-install-warning.js",
+  "ui/components/app/snaps/snap-link-warning/index.js",
+  "ui/components/app/snaps/snap-link-warning/snap-link-warning.js",
+  "ui/components/app/snaps/snap-list-item/index.js",
+  "ui/components/app/snaps/snap-list-item/snap-list-item.js",
+  "ui/components/app/snaps/snap-list-item/snap-list-item.stories.js",
+  "ui/components/app/snaps/snap-list-item/snap-list-item.test.js",
+  "ui/components/app/snaps/snap-metadata-modal/index.js",
+  "ui/components/app/snaps/snap-metadata-modal/snap-metadata-modal.js",
+  "ui/components/app/snaps/snap-permission-adapter/index.js",
+  "ui/components/app/snaps/snap-permission-adapter/snap-permission-adapter.js",
+  "ui/components/app/snaps/snap-permission-adapter/snap-permission-adapter.test.js",
+  "ui/components/app/snaps/snap-permission-cell/index.js",
+  "ui/components/app/snaps/snap-permission-cell/snap-permission-cell.js",
+  "ui/components/app/snaps/snap-permission-cell/snap-permission-cell.test.js",
+  "ui/components/app/snaps/snap-permissions-list/index.js",
+  "ui/components/app/snaps/snap-permissions-list/snap-permissions-list.js",
+  "ui/components/app/snaps/snap-permissions-list/snap-permissions-list.stories.js",
+  "ui/components/app/snaps/snap-permissions-list/snap-permissions-list.test.js",
+  "ui/components/app/snaps/snap-privacy-warning/index.js",
+  "ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.js",
+  "ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.stories.js",
+  "ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.test.js",
+  "ui/components/app/snaps/snap-remove-warning/index.js",
+  "ui/components/app/snaps/snap-remove-warning/snap-remove-warning.js",
+  "ui/components/app/snaps/snap-remove-warning/snap-remove-warning.stories.js",
+  "ui/components/app/snaps/snap-ui-link/index.js",
+  "ui/components/app/snaps/snap-ui-link/snap-ui-link.js",
+  "ui/components/app/snaps/snap-ui-markdown/index.js",
+  "ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js",
+  "ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.stories.js",
+  "ui/components/app/snaps/snap-ui-renderer/index.js",
+  "ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js",
+  "ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.stories.js",
+  "ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.test.js",
+  "ui/components/app/snaps/snap-update-alert/index.js",
+  "ui/components/app/snaps/snap-update-alert/snap-update-alert.js",
+  "ui/components/app/snaps/snap-update-alert/snap-update-alert.stories.js",
+  "ui/components/app/snaps/snap-version/index.js",
+  "ui/components/app/snaps/snap-version/snap-external-pill.js",
+  "ui/components/app/snaps/snap-version/snap-external-pill.stories.js",
+  "ui/components/app/snaps/snap-version/snap-external-pill.test.js",
+  "ui/components/app/snaps/update-snap-permission-list/index.js",
+  "ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.js",
+  "ui/components/app/snaps/update-snap-permission-list/update-snap-permission-list.stories.js",
   "ui/components/app/srp-input/index.js",
   "ui/components/app/srp-input/parse-secret-recovery-phrase.js",
   "ui/components/app/srp-input/parse-secret-recovery-phrase.test.js",
   "ui/components/app/srp-input/srp-input.js",
   "ui/components/app/srp-input/srp-input.stories.js",
   "ui/components/app/srp-input/srp-input.test.js",
+  "ui/components/app/srp-quiz-modal/SRPQuiz/SRPQuiz.test.js",
   "ui/components/app/step-progress-bar/index.js",
   "ui/components/app/step-progress-bar/step-progress-bar.js",
+  "ui/components/app/step-progress-bar/step-progress-bar.stories.js",
   "ui/components/app/tab-bar/index.js",
   "ui/components/app/tab-bar/tab-bar.js",
   "ui/components/app/tab-bar/tab-bar.stories.js",
-  "ui/components/app/token-cell/index.js",
-  "ui/components/app/token-cell/token-cell.js",
-  "ui/components/app/token-cell/token-cell.test.js",
-  "ui/components/app/token-list-display/index.js",
-  "ui/components/app/token-list-display/token-list-display.js",
-  "ui/components/app/token-list/index.js",
-  "ui/components/app/token-list/token-list.js",
+  "ui/components/app/terms-of-use-popup/index.js",
+  "ui/components/app/terms-of-use-popup/terms-of-use-popup.js",
+  "ui/components/app/terms-of-use-popup/terms-of-use-popup.stories.js",
+  "ui/components/app/terms-of-use-popup/terms-of-use-popup.test.js",
+  "ui/components/app/toast-master/toast-master.js",
   "ui/components/app/transaction-breakdown/index.js",
   "ui/components/app/transaction-breakdown/transaction-breakdown-row/index.js",
   "ui/components/app/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js",
@@ -638,23 +641,6 @@
   "ui/components/app/transaction-breakdown/transaction-breakdown.component.js",
   "ui/components/app/transaction-breakdown/transaction-breakdown.container.js",
   "ui/components/app/transaction-breakdown/transaction-breakdown.test.js",
-  "ui/components/app/transaction-decoding/components/decoding/address/address.component.js",
-  "ui/components/app/transaction-decoding/components/decoding/address/index.js",
-  "ui/components/app/transaction-decoding/components/ui/accreditation/accreditation.component.js",
-  "ui/components/app/transaction-decoding/components/ui/accreditation/index.js",
-  "ui/components/app/transaction-decoding/components/ui/copy-raw-data/copy-raw-data.component.js",
-  "ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.js",
-  "ui/components/app/transaction-decoding/constants.js",
-  "ui/components/app/transaction-decoding/index.js",
-  "ui/components/app/transaction-decoding/transaction-decoding.component.js",
-  "ui/components/app/transaction-decoding/transaction-decoding.util.js",
-  "ui/components/app/transaction-detail-item/index.js",
-  "ui/components/app/transaction-detail-item/transaction-detail-item.component.js",
-  "ui/components/app/transaction-detail-item/transaction-detail-item.stories.js",
-  "ui/components/app/transaction-detail/index.js",
-  "ui/components/app/transaction-detail/transaction-detail.component.js",
-  "ui/components/app/transaction-detail/transaction-detail.component.test.js",
-  "ui/components/app/transaction-detail/transaction-detail.stories.js",
   "ui/components/app/transaction-icon/index.js",
   "ui/components/app/transaction-icon/transaction-icon.js",
   "ui/components/app/transaction-list-item-details/index.js",
@@ -666,36 +652,135 @@
   "ui/components/app/transaction-list-item/transaction-list-item.component.js",
   "ui/components/app/transaction-list-item/transaction-list-item.component.test.js",
   "ui/components/app/transaction-list-item/transaction-list-item.stories.js",
-  "ui/components/app/transaction-list/index.js",
-  "ui/components/app/transaction-list/transaction-list.component.js",
-  "ui/components/app/transaction-list/transaction-list.stories.js",
+  "ui/components/app/transaction-status-label/index.js",
   "ui/components/app/transaction-status-label/transaction-status-label.js",
   "ui/components/app/transaction-status-label/transaction-status-label.test.js",
-  "ui/components/app/transaction-total-banner/index.js",
-  "ui/components/app/transaction-total-banner/transaction-total-banner.component.js",
-  "ui/components/app/transaction-total-banner/transaction-total-banner.stories.js",
-  "ui/components/app/transaction-total-banner/transaction-total-banner.stories.test.js",
   "ui/components/app/user-preferenced-currency-display/index.js",
   "ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js",
-  "ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js",
   "ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.stories.js",
+  "ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js",
   "ui/components/app/user-preferenced-currency-input/index.js",
   "ui/components/app/user-preferenced-currency-input/user-preferenced-currency-input.component.js",
-  "ui/components/app/user-preferenced-currency-input/user-preferenced-currency-input.component.test.js",
   "ui/components/app/user-preferenced-currency-input/user-preferenced-currency-input.container.js",
-  "ui/components/app/user-preferenced-currency-input/user-preferenced-currency-input.container.test.js",
+  "ui/components/app/user-preferenced-currency-input/user-preferenced-currency-input.test.js",
+  "ui/components/app/wallet-overview/coin-buttons.stories.js",
   "ui/components/app/wallet-overview/eth-overview.js",
+  "ui/components/app/wallet-overview/eth-overview.stories.js",
+  "ui/components/app/wallet-overview/eth-overview.test.js",
   "ui/components/app/wallet-overview/index.js",
-  "ui/components/app/wallet-overview/token-overview.js",
-  "ui/components/app/wallet-overview/token-overview.test.js",
   "ui/components/app/wallet-overview/wallet-overview.js",
-  "ui/components/app/whats-new-popup/index.js",
-  "ui/components/app/whats-new-popup/whats-new-popup.js",
-  "ui/components/component-library/base-avatar/base-avatar.js",
-  "ui/components/component-library/base-avatar/base-avatar.stories.js",
-  "ui/components/component-library/base-avatar/base-avatar.test.js",
+  "ui/components/component-library/form-text-field/deprecated/form-text-field.js",
+  "ui/components/component-library/form-text-field/deprecated/index.js",
+  "ui/components/component-library/text-field-search/deprecated/index.js",
+  "ui/components/component-library/text-field-search/deprecated/text-field-search.js",
+  "ui/components/multichain/account-details/account-details-authenticate.js",
+  "ui/components/multichain/account-details/account-details-display.js",
+  "ui/components/multichain/account-details/account-details-key.js",
+  "ui/components/multichain/account-details/account-details.stories.js",
+  "ui/components/multichain/account-details/account-details.test.js",
+  "ui/components/multichain/account-details/index.js",
+  "ui/components/multichain/account-list-item-menu/account-list-item-menu.js",
+  "ui/components/multichain/account-list-item-menu/account-list-item-menu.stories.js",
+  "ui/components/multichain/account-list-item-menu/account-list-item-menu.test.js",
+  "ui/components/multichain/account-list-item-menu/index.js",
+  "ui/components/multichain/account-list-item/account-list-item.js",
+  "ui/components/multichain/account-list-item/account-list-item.stories.js",
+  "ui/components/multichain/account-list-item/account-list-item.test.js",
+  "ui/components/multichain/account-list-item/account-list-item.types.js",
+  "ui/components/multichain/account-list-item/index.js",
+  "ui/components/multichain/account-overview/index.js",
+  "ui/components/multichain/account-picker/account-picker.js",
+  "ui/components/multichain/account-picker/account-picker.stories.js",
+  "ui/components/multichain/account-picker/account-picker.test.js",
+  "ui/components/multichain/account-picker/index.js",
+  "ui/components/multichain/activity-list-item/activity-list-item.js",
+  "ui/components/multichain/activity-list-item/activity-list-item.stories.js",
+  "ui/components/multichain/activity-list-item/activity-list-item.test.js",
+  "ui/components/multichain/activity-list-item/index.js",
+  "ui/components/multichain/address-copy-button/address-copy-button.js",
+  "ui/components/multichain/address-copy-button/address-copy-button.stories.js",
+  "ui/components/multichain/address-copy-button/address-copy-button.test.js",
+  "ui/components/multichain/address-copy-button/index.js",
+  "ui/components/multichain/app-header/app-header.js",
+  "ui/components/multichain/app-header/app-header.stories.js",
+  "ui/components/multichain/app-header/app-header.test.js",
+  "ui/components/multichain/app-header/index.js",
+  "ui/components/multichain/app-header/multichain-meta-fox-logo.js",
+  "ui/components/multichain/badge-status/badge-status.test.js",
+  "ui/components/multichain/connected-site-menu/connected-site-menu.js",
+  "ui/components/multichain/connected-site-menu/connected-site-menu.stories.js",
+  "ui/components/multichain/connected-site-menu/connected-site-menu.test.js",
+  "ui/components/multichain/connected-site-menu/index.js",
+  "ui/components/multichain/create-account/index.js",
+  "ui/components/multichain/create-eth-account/create-eth-account.js",
+  "ui/components/multichain/create-eth-account/create-eth-account.stories.js",
+  "ui/components/multichain/create-eth-account/create-eth-account.test.js",
+  "ui/components/multichain/create-eth-account/index.js",
+  "ui/components/multichain/detected-token-banner/detected-token-banner.js",
+  "ui/components/multichain/detected-token-banner/detected-token-banner.stories.js",
+  "ui/components/multichain/detected-token-banner/detected-token-banner.test.js",
+  "ui/components/multichain/detected-token-banner/index.js",
+  "ui/components/multichain/edit-networks-modal/edit-networks-modal.js",
+  "ui/components/multichain/edit-networks-modal/edit-networks-modal.stories.js",
+  "ui/components/multichain/edit-networks-modal/edit-networks-modal.test.js",
+  "ui/components/multichain/edit-networks-modal/index.js",
+  "ui/components/multichain/import-account/bottom-buttons.js",
+  "ui/components/multichain/import-account/bottom-buttons.stories.js",
+  "ui/components/multichain/import-account/import-account.js",
+  "ui/components/multichain/import-account/import-account.stories.js",
+  "ui/components/multichain/import-account/index.js",
+  "ui/components/multichain/import-account/json.js",
+  "ui/components/multichain/import-account/json.stories.js",
+  "ui/components/multichain/import-account/private-key.js",
+  "ui/components/multichain/import-account/private-key.stories.js",
+  "ui/components/multichain/import-nfts-modal/import-nfts-modal.js",
+  "ui/components/multichain/import-nfts-modal/import-nfts-modal.stories.js",
+  "ui/components/multichain/import-nfts-modal/import-nfts-modal.test.js",
+  "ui/components/multichain/import-nfts-modal/index.js",
+  "ui/components/multichain/import-tokens-modal/import-tokens-modal-confirm.js",
+  "ui/components/multichain/import-tokens-modal/import-tokens-modal-confirm.stories.js",
+  "ui/components/multichain/import-tokens-modal/import-tokens-modal.js",
+  "ui/components/multichain/import-tokens-modal/import-tokens-modal.stories.js",
+  "ui/components/multichain/import-tokens-modal/import-tokens-modal.test.js",
+  "ui/components/multichain/import-tokens-modal/index.js",
+  "ui/components/multichain/index.js",
+  "ui/components/multichain/menu-items/account-details-menu-item.js",
+  "ui/components/multichain/menu-items/account-details-menu-item.test.js",
+  "ui/components/multichain/menu-items/index.js",
+  "ui/components/multichain/network-list-item-menu/index.js",
+  "ui/components/multichain/network-list-item-menu/network-list-item-menu.js",
+  "ui/components/multichain/network-list-item/index.js",
+  "ui/components/multichain/network-list-item/network-list-item.stories.js",
+  "ui/components/multichain/network-list-item/network-list-item.test.js",
+  "ui/components/multichain/network-list-menu/index.js",
+  "ui/components/multichain/network-list-menu/network-list-menu.stories.js",
+  "ui/components/multichain/network-list-menu/popular-network-list/PopularNetworkList.stories.js",
+  "ui/components/multichain/nft-item/nft-item.stories.js",
+  "ui/components/multichain/nft-item/nft-item.test.js",
+  "ui/components/multichain/notification-list-item-icon/index.js",
+  "ui/components/multichain/pages/permissions-page/connection-list-item.js",
+  "ui/components/multichain/pages/permissions-page/connection-list-item.stories.js",
+  "ui/components/multichain/pages/permissions-page/connection-list-item.test.js",
+  "ui/components/multichain/pages/permissions-page/permissions-page.js",
+  "ui/components/multichain/pages/permissions-page/permissions-page.test.js",
+  "ui/components/multichain/pages/review-permissions-page/site-cell/site-cell-connection-list-item.js",
+  "ui/components/multichain/pages/review-permissions-page/site-cell/site-cell-connection-list-item.test.js",
+  "ui/components/multichain/pages/review-permissions-page/site-cell/site-cell-tooltip.js",
+  "ui/components/multichain/pages/review-permissions-page/site-cell/site-cell-tooltip.test.js",
+  "ui/components/multichain/product-tour-popover/index.js",
+  "ui/components/multichain/product-tour-popover/product-tour-popover.js",
+  "ui/components/multichain/product-tour-popover/product-tour-popover.stories.js",
+  "ui/components/multichain/product-tour-popover/product-tour-popover.test.js",
+  "ui/components/multichain/receive-modal/index.js",
+  "ui/components/multichain/receive-modal/receive-modal.js",
+  "ui/components/multichain/receive-modal/receive-modal.stories.js",
+  "ui/components/multichain/receive-modal/receive-modal.test.js",
+  "ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.stories.js",
+  "ui/components/multichain/token-list-item/price/percentage-change/percentage-change.stories.js",
+  "ui/components/multichain/token-list-item/token-list-item.stories.js",
   "ui/components/ui/account-mismatch-warning/acccount-mismatch-warning.component.test.js",
   "ui/components/ui/account-mismatch-warning/account-mismatch-warning.component.js",
+  "ui/components/ui/account-mismatch-warning/account-mismatch-warning.stories.js",
   "ui/components/ui/actionable-message/actionable-message.js",
   "ui/components/ui/actionable-message/actionable-message.stories.js",
   "ui/components/ui/actionable-message/actionable-message.test.js",
@@ -704,19 +789,13 @@
   "ui/components/ui/alert/index.js",
   "ui/components/ui/alert/index.test.js",
   "ui/components/ui/box/box.js",
-  "ui/components/ui/box/box.stories.js",
-  "ui/components/ui/box/box.test.js",
   "ui/components/ui/box/index.js",
-  "ui/components/ui/breadcrumbs/breadcrumbs.component.js",
-  "ui/components/ui/breadcrumbs/breadcrumbs.component.test.js",
-  "ui/components/ui/breadcrumbs/breadcrumbs.stories.js",
   "ui/components/ui/button-group/button-group-component.test.js",
   "ui/components/ui/button-group/button-group.component.js",
   "ui/components/ui/button-group/button-group.stories.js",
   "ui/components/ui/button-group/index.js",
   "ui/components/ui/button/button.component.js",
   "ui/components/ui/button/button.stories.js",
-  "ui/components/ui/button/button.stories.test.js",
   "ui/components/ui/button/index.js",
   "ui/components/ui/callout/callout.js",
   "ui/components/ui/callout/callout.stories.js",
@@ -741,12 +820,14 @@
   "ui/components/ui/confusable/index.js",
   "ui/components/ui/currency-display/currency-display.component.js",
   "ui/components/ui/currency-display/currency-display.component.test.js",
+  "ui/components/ui/currency-display/currency-display.stories.js",
   "ui/components/ui/currency-display/index.js",
   "ui/components/ui/definition-list/definition-list.js",
   "ui/components/ui/definition-list/definition-list.stories.js",
   "ui/components/ui/definition-list/index.js",
   "ui/components/ui/disclosure/disclosure.js",
   "ui/components/ui/disclosure/disclosure.stories.js",
+  "ui/components/ui/disclosure/disclosure.test.js",
   "ui/components/ui/disclosure/index.js",
   "ui/components/ui/dropdown/dropdown.js",
   "ui/components/ui/dropdown/dropdown.stories.js",
@@ -754,10 +835,6 @@
   "ui/components/ui/editable-label/editable-label.js",
   "ui/components/ui/editable-label/editable-label.stories.js",
   "ui/components/ui/editable-label/index.js",
-  "ui/components/ui/error-message/error-message.component.js",
-  "ui/components/ui/error-message/error-message.component.test.js",
-  "ui/components/ui/error-message/error-message.stories.js",
-  "ui/components/ui/error-message/index.js",
   "ui/components/ui/export-text-container/export-text-container.component.js",
   "ui/components/ui/export-text-container/export-text.stories.js",
   "ui/components/ui/export-text-container/index.js",
@@ -769,24 +846,22 @@
   "ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js",
   "ui/components/ui/hex-to-decimal/index.js",
   "ui/components/ui/icon-border/icon-border.js",
+  "ui/components/ui/icon-border/icon-border.stories.js",
   "ui/components/ui/icon-border/index.js",
-  "ui/components/ui/icon-button/icon-button.js",
-  "ui/components/ui/icon-button/index.js",
   "ui/components/ui/icon-with-fallback/icon-with-fallback.component.js",
   "ui/components/ui/icon-with-fallback/icon-with-fallback.stories.js",
   "ui/components/ui/icon-with-fallback/icon-with-fallback.test.js",
   "ui/components/ui/icon-with-fallback/index.js",
   "ui/components/ui/icon/approve-icon.component.js",
-  "ui/components/ui/icon/copy-icon.component.js",
-  "ui/components/ui/icon/icon-check.js",
   "ui/components/ui/icon/icon-eye-slash.js",
   "ui/components/ui/icon/icon-eye.js",
-  "ui/components/ui/icon/icon-import.js",
+  "ui/components/ui/icon/icon-times.js",
   "ui/components/ui/icon/icon-token-search.js",
   "ui/components/ui/icon/icon.stories.js",
   "ui/components/ui/icon/info-icon-inverted.component.js",
   "ui/components/ui/icon/info-icon.component.js",
   "ui/components/ui/icon/interaction-icon.component.js",
+  "ui/components/ui/icon/overview-buy-icon.component.js",
   "ui/components/ui/icon/preloader/index.js",
   "ui/components/ui/icon/preloader/preloader-icon.component.js",
   "ui/components/ui/icon/receive-icon.component.js",
@@ -795,26 +870,24 @@
   "ui/components/ui/icon/sign-icon.component.js",
   "ui/components/ui/icon/sun-check-icon.component.js",
   "ui/components/ui/icon/swap-icon-for-list.component.js",
-  "ui/components/ui/identicon/identicon.component.js",
-  "ui/components/ui/identicon/identicon.component.test.js",
-  "ui/components/ui/identicon/identicon.container.js",
-  "ui/components/ui/identicon/identicon.stories.js",
-  "ui/components/ui/identicon/index.js",
   "ui/components/ui/info-tooltip/index.js",
   "ui/components/ui/info-tooltip/info-tooltip-icon.js",
   "ui/components/ui/info-tooltip/info-tooltip.js",
   "ui/components/ui/info-tooltip/info-tooltip.stories.js",
   "ui/components/ui/jazzicon/index.js",
-  "ui/components/ui/jazzicon/jazzicon.component.js",
+  "ui/components/ui/jazzicon/jazzicon.stories.js",
   "ui/components/ui/list-item/index.js",
   "ui/components/ui/list-item/list-item.component.js",
   "ui/components/ui/list-item/list-item.component.test.js",
   "ui/components/ui/list-item/list-item.stories.js",
   "ui/components/ui/loading-heartbeat/index.js",
+  "ui/components/ui/loading-heartbeat/loading-heartbeat.stories.js",
   "ui/components/ui/loading-indicator/index.js",
   "ui/components/ui/loading-indicator/loading-indicator.js",
+  "ui/components/ui/loading-indicator/loading-indicator.stories.js",
   "ui/components/ui/loading-screen/index.js",
   "ui/components/ui/loading-screen/loading-screen.component.js",
+  "ui/components/ui/loading-screen/loading-screen.stories.js",
   "ui/components/ui/logo/logo-lattice.js",
   "ui/components/ui/logo/logo-ledger.js",
   "ui/components/ui/logo/logo-qr-based.js",
@@ -823,17 +896,17 @@
   "ui/components/ui/mascot/index.js",
   "ui/components/ui/mascot/mascot.component.js",
   "ui/components/ui/mascot/mascot.stories.js",
-  "ui/components/ui/menu/index.js",
-  "ui/components/ui/menu/menu-item.js",
   "ui/components/ui/menu/menu.js",
   "ui/components/ui/menu/menu.stories.js",
   "ui/components/ui/metafox-logo/horizontal-logo.js",
   "ui/components/ui/metafox-logo/index.js",
   "ui/components/ui/metafox-logo/metafox-logo.component.js",
   "ui/components/ui/metafox-logo/metafox-logo.component.test.js",
+  "ui/components/ui/metafox-logo/metafox-logo.stories.js",
   "ui/components/ui/nickname-popover/index.js",
   "ui/components/ui/nickname-popover/nickname-popover.component.js",
   "ui/components/ui/nickname-popover/nickname-popover.stories.js",
+  "ui/components/ui/nickname-popover/nickname-popover.test.js",
   "ui/components/ui/numeric-input/index.js",
   "ui/components/ui/numeric-input/numeric-input.component.js",
   "ui/components/ui/numeric-input/numeric-input.stories.js",
@@ -844,7 +917,7 @@
   "ui/components/ui/page-container/page-container-footer/page-container-footer.component.test.js",
   "ui/components/ui/page-container/page-container-header/index.js",
   "ui/components/ui/page-container/page-container-header/page-container-header.component.js",
-  "ui/components/ui/page-container/page-container-header/page-container-header.component.test.js",
+  "ui/components/ui/page-container/page-container-header/page-container-header.test.js",
   "ui/components/ui/page-container/page-container.component.js",
   "ui/components/ui/page-container/page-container.stories.js",
   "ui/components/ui/popover/index.js",
@@ -853,9 +926,8 @@
   "ui/components/ui/pulse-loader/index.js",
   "ui/components/ui/pulse-loader/pulse-loader.js",
   "ui/components/ui/pulse-loader/pulse-loader.stories.js",
-  "ui/components/ui/qr-code/index.js",
-  "ui/components/ui/qr-code/qr-code.js",
-  "ui/components/ui/qr-code/qr-code.stories.js",
+  "ui/components/ui/qr-code-view/index.js",
+  "ui/components/ui/qr-code-view/qr-code-view.stories.js",
   "ui/components/ui/sender-to-recipient/index.js",
   "ui/components/ui/sender-to-recipient/sender-to-recipient.component.js",
   "ui/components/ui/sender-to-recipient/sender-to-recipient.constants.js",
@@ -867,6 +939,7 @@
   "ui/components/ui/site-origin/index.js",
   "ui/components/ui/site-origin/site-origin.js",
   "ui/components/ui/site-origin/site-origin.stories.js",
+  "ui/components/ui/site-origin/site-origin.test.js",
   "ui/components/ui/slider/index.js",
   "ui/components/ui/slider/slider.component.js",
   "ui/components/ui/slider/slider.component.test.js",
@@ -880,6 +953,7 @@
   "ui/components/ui/text-field/text-field.component.js",
   "ui/components/ui/text-field/text-field.stories.js",
   "ui/components/ui/textarea/index.js",
+  "ui/components/ui/textarea/textarea.constants.js",
   "ui/components/ui/textarea/textarea.js",
   "ui/components/ui/textarea/textarea.stories.js",
   "ui/components/ui/textarea/textarea.test.js",
@@ -888,6 +962,8 @@
   "ui/components/ui/toggle-button/toggle-button.stories.js",
   "ui/components/ui/token-balance/index.js",
   "ui/components/ui/token-balance/token-balance.js",
+  "ui/components/ui/token-currency-display/index.js",
+  "ui/components/ui/token-currency-display/token-currency-display.component.js",
   "ui/components/ui/tooltip/index.js",
   "ui/components/ui/tooltip/tooltip.js",
   "ui/components/ui/tooltip/tooltip.stories.js",
@@ -904,116 +980,72 @@
   "ui/components/ui/update-nickname-popover/index.js",
   "ui/components/ui/update-nickname-popover/update-nickname-popover.js",
   "ui/components/ui/update-nickname-popover/update-nickname-popover.stories.js",
+  "ui/components/ui/update-nickname-popover/update-nickname-popover.test.js",
   "ui/components/ui/url-icon/index.js",
   "ui/components/ui/url-icon/url-icon.js",
   "ui/components/ui/url-icon/url-icon.stories.js",
+  "ui/constants/index.js",
   "ui/contexts/gasFee.js",
   "ui/contexts/i18n.js",
-  "ui/contexts/metametrics.js",
   "ui/contexts/transaction-modal.js",
   "ui/ducks/alerts/enums.js",
   "ui/ducks/alerts/index.js",
   "ui/ducks/alerts/invalid-custom-network.js",
   "ui/ducks/alerts/unconnected-account.js",
-  "ui/ducks/app/app.js",
   "ui/ducks/app/app.test.js",
   "ui/ducks/confirm-transaction/confirm-transaction.duck.js",
   "ui/ducks/confirm-transaction/confirm-transaction.duck.test.js",
-  "ui/ducks/ens.js",
-  "ui/ducks/gas/gas-action-constants.js",
+  "ui/ducks/domains.js",
   "ui/ducks/gas/gas-duck.test.js",
   "ui/ducks/gas/gas.duck.js",
   "ui/ducks/history/history.js",
   "ui/ducks/index.js",
-  "ui/ducks/locale/locale.js",
   "ui/ducks/metamask/metamask.js",
   "ui/ducks/metamask/metamask.test.js",
-  "ui/ducks/send/helpers.js",
-  "ui/ducks/send/helpers.test.js",
-  "ui/ducks/send/index.js",
-  "ui/ducks/send/send.js",
-  "ui/ducks/send/send.test.js",
   "ui/ducks/swaps/swaps.js",
   "ui/ducks/swaps/swaps.test.js",
-  "ui/helpers/constants/common.js",
+  "ui/helpers/constants/beta.js",
   "ui/helpers/constants/connected-sites.js",
-  "ui/helpers/constants/critical-error.js",
-  "ui/helpers/constants/design-system.js",
   "ui/helpers/constants/error-keys.js",
   "ui/helpers/constants/gas.js",
-  "ui/helpers/constants/notifications.js",
-  "ui/helpers/constants/onboarding.js",
-  "ui/helpers/constants/routes.js",
   "ui/helpers/constants/settings.js",
+  "ui/helpers/constants/snaps/index.js",
   "ui/helpers/constants/transactions.js",
-  "ui/helpers/constants/zendesk-url.js",
-  "ui/helpers/higher-order-components/authenticated/authenticated.component.js",
-  "ui/helpers/higher-order-components/authenticated/authenticated.container.js",
-  "ui/helpers/higher-order-components/authenticated/index.js",
   "ui/helpers/higher-order-components/feature-toggled-route.js",
-  "ui/helpers/higher-order-components/initialized/index.js",
-  "ui/helpers/higher-order-components/initialized/initialized.component.js",
-  "ui/helpers/higher-order-components/initialized/initialized.container.js",
   "ui/helpers/higher-order-components/with-modal-props/index.js",
   "ui/helpers/higher-order-components/with-modal-props/with-modal-props.js",
   "ui/helpers/higher-order-components/with-modal-props/with-modal-props.test.js",
+  "ui/helpers/utils/accounts.js",
+  "ui/helpers/utils/accounts.test.js",
   "ui/helpers/utils/common.util.js",
   "ui/helpers/utils/common.util.test.js",
-  "ui/helpers/utils/confirm-tx.util.js",
   "ui/helpers/utils/confirm-tx.util.test.js",
-  "ui/helpers/utils/conversions.util.js",
-  "ui/helpers/utils/conversions.util.test.js",
-  "ui/helpers/utils/error-utils.js",
-  "ui/helpers/utils/error-utils.test.js",
-  "ui/helpers/utils/fetch-with-cache.js",
-  "ui/helpers/utils/fetch-with-cache.test.js",
+  "ui/helpers/utils/export-utils.js",
+  "ui/helpers/utils/export-utils.test.js",
   "ui/helpers/utils/formatters.js",
   "ui/helpers/utils/gas.js",
   "ui/helpers/utils/gas.test.js",
   "ui/helpers/utils/hardware.js",
-  "ui/helpers/utils/i18n-helper.js",
   "ui/helpers/utils/i18n-helper.test.js",
-  "ui/helpers/utils/icon-factory.js",
   "ui/helpers/utils/is-mobile-view.js",
-  "ui/helpers/utils/metric.test.js",
   "ui/helpers/utils/metrics.js",
-  "ui/helpers/utils/optimism/buildUnserializedTransaction.js",
-  "ui/helpers/utils/optimism/buildUnserializedTransaction.test.js",
+  "ui/helpers/utils/metrics.test.js",
   "ui/helpers/utils/permission.js",
+  "ui/helpers/utils/portfolio.js",
   "ui/helpers/utils/settings-search.js",
   "ui/helpers/utils/settings-search.test.js",
-  "ui/helpers/utils/storage-helpers.js",
-  "ui/helpers/utils/switch-direction.js",
   "ui/helpers/utils/token-util.js",
+  "ui/helpers/utils/token-util.test.js",
   "ui/helpers/utils/transactions.util.js",
   "ui/helpers/utils/transactions.util.test.js",
-  "ui/helpers/utils/tx-helper.js",
   "ui/helpers/utils/tx-helper.test.js",
   "ui/helpers/utils/util.js",
   "ui/helpers/utils/util.test.js",
   "ui/helpers/utils/webcam-utils.js",
-  "ui/hooks/gasFeeInput/test-utils.js",
-  "ui/hooks/gasFeeInput/useGasEstimates.js",
-  "ui/hooks/gasFeeInput/useGasEstimates.test.js",
-  "ui/hooks/gasFeeInput/useGasFeeErrors.js",
-  "ui/hooks/gasFeeInput/useGasFeeErrors.test.js",
-  "ui/hooks/gasFeeInput/useGasFeeInputs.js",
-  "ui/hooks/gasFeeInput/useGasFeeInputs.test.js",
-  "ui/hooks/gasFeeInput/useGasPriceInput.js",
-  "ui/hooks/gasFeeInput/useGasPriceInput.test.js",
-  "ui/hooks/gasFeeInput/useMaxFeePerGasInput.js",
-  "ui/hooks/gasFeeInput/useMaxFeePerGasInput.test.js",
-  "ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.js",
-  "ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.test.js",
-  "ui/hooks/gasFeeInput/useTransactionFunction.test.js",
-  "ui/hooks/gasFeeInput/useTransactionFunctions.js",
-  "ui/hooks/gasFeeInput/utils.js",
-  "ui/hooks/useAddressDetails.js",
-  "ui/hooks/useAddressDetails.test.js",
-  "ui/hooks/useApproveTransaction.js",
-  "ui/hooks/useAssetDetails.js",
-  "ui/hooks/useAssetDetails.test.js",
-  "ui/hooks/useNftsCollections.js",
+  "ui/hooks/snaps/useInsightSnaps.js",
+  "ui/hooks/snaps/useIsOverflowing.js",
+  "ui/hooks/useAccountTotalFiatBalance.js",
+  "ui/hooks/useAccountTotalFiatBalance.test.js",
   "ui/hooks/useCurrencyDisplay.js",
   "ui/hooks/useCurrencyDisplay.test.js",
   "ui/hooks/useCurrentAsset.js",
@@ -1021,15 +1053,14 @@
   "ui/hooks/useEthFiatAmount.js",
   "ui/hooks/useEventFragment.js",
   "ui/hooks/useEventFragment.test.js",
-  "ui/hooks/useGasFeeErrors.js",
-  "ui/hooks/useGasFeeErrors.test.js",
   "ui/hooks/useGasFeeEstimates.js",
   "ui/hooks/useGasFeeEstimates.test.js",
   "ui/hooks/useI18nContext.js",
-  "ui/hooks/useIncrementedGasFees.js",
+  "ui/hooks/useIsOriginalTokenSymbol.js",
+  "ui/hooks/useIsOriginalTokenSymbol.test.js",
+  "ui/hooks/useNftsCollections.js",
   "ui/hooks/useOriginMetadata.js",
-  "ui/hooks/usePrevious.js",
-  "ui/hooks/useSegmentContext.js",
+  "ui/hooks/useScrollRequired.js",
   "ui/hooks/useShouldAnimateGasEstimations.js",
   "ui/hooks/useShouldShowSpeedUp.js",
   "ui/hooks/useSwappedTokenValue.js",
@@ -1043,82 +1074,165 @@
   "ui/hooks/useTokensToSearch.js",
   "ui/hooks/useTransactionDisplayData.js",
   "ui/hooks/useTransactionDisplayData.test.js",
-  "ui/hooks/useTransactionEventFragment.js",
   "ui/hooks/useUserPreferencedCurrency.js",
   "ui/hooks/useUserPreferencedCurrency.test.js",
   "ui/index.js",
   "ui/index.test.js",
-  "ui/pages/asset/asset.js",
   "ui/pages/asset/components/asset-breadcrumb.js",
   "ui/pages/asset/components/asset-navigation.js",
   "ui/pages/asset/components/asset-options.js",
-  "ui/pages/asset/components/native-asset.js",
-  "ui/pages/asset/components/token-asset.js",
   "ui/pages/asset/index.js",
+  "ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js",
+  "ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.stories.js",
+  "ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.test.js",
+  "ui/pages/confirm-add-suggested-nft/index.js",
   "ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js",
   "ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.stories.js",
   "ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.test.js",
   "ui/pages/confirm-add-suggested-token/index.js",
-  "ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js",
-  "ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js",
-  "ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js",
-  "ui/pages/confirm-approve/confirm-approve-content/index.js",
-  "ui/pages/confirm-approve/confirm-approve.js",
-  "ui/pages/confirm-approve/confirm-approve.stories.js",
-  "ui/pages/confirm-approve/confirm-approve.util.js",
-  "ui/pages/confirm-approve/index.js",
   "ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js",
-  "ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js",
+  "ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js",
   "ui/pages/confirm-decrypt-message/index.js",
-  "ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js",
-  "ui/pages/confirm-deploy-contract/confirm-deploy-contract.container.js",
-  "ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js",
-  "ui/pages/confirm-deploy-contract/index.js",
   "ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js",
+  "ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.test.js",
   "ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js",
   "ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.stories.js",
   "ui/pages/confirm-encryption-public-key/index.js",
-  "ui/pages/confirm-import-token/confirm-import-token.js",
-  "ui/pages/confirm-import-token/confirm-import-token.stories.js",
-  "ui/pages/confirm-import-token/confirm-import-token.test.js",
-  "ui/pages/confirm-import-token/index.js",
-  "ui/pages/confirm-send-ether/confirm-send-ether.component.js",
-  "ui/pages/confirm-send-ether/confirm-send-ether.container.js",
-  "ui/pages/confirm-send-ether/confirm-send-ether.stories.js",
-  "ui/pages/confirm-send-ether/index.js",
-  "ui/pages/confirm-send-token/confirm-send-token.component.js",
-  "ui/pages/confirm-send-token/confirm-send-token.js",
-  "ui/pages/confirm-send-token/confirm-send-token.stories.js",
-  "ui/pages/confirm-send-token/index.js",
-  "ui/pages/confirm-signature-request/index.js",
-  "ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js",
-  "ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.stories.js",
-  "ui/pages/confirm-token-transaction-base/index.js",
-  "ui/pages/confirm-transaction-base/confirm-transaction-base.component.js",
-  "ui/pages/confirm-transaction-base/confirm-transaction-base.container.js",
-  "ui/pages/confirm-transaction-base/confirm-transaction-base.stories.js",
-  "ui/pages/confirm-transaction-base/index.js",
-  "ui/pages/confirm-transaction-base/transaction-alerts/index.js",
-  "ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js",
-  "ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js",
-  "ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js",
-  "ui/pages/confirm-transaction-switch/confirm-transaction-switch.container.js",
-  "ui/pages/confirm-transaction-switch/index.js",
-  "ui/pages/confirm-transaction/confirm-token-transaction-switch.js",
-  "ui/pages/confirm-transaction/confirm-transaction.component.js",
-  "ui/pages/confirm-transaction/confirm-transaction.container.js",
-  "ui/pages/confirm-transaction/index.js",
-  "ui/pages/confirmation/components/confirmation-footer/confirmation-footer.js",
-  "ui/pages/confirmation/components/confirmation-footer/index.js",
-  "ui/pages/confirmation/components/confirmation-network-switch/confirmation-network-switch.js",
-  "ui/pages/confirmation/components/confirmation-network-switch/confirmation-network-switch.stories.js",
-  "ui/pages/confirmation/components/confirmation-network-switch/index.js",
-  "ui/pages/confirmation/confirmation.js",
-  "ui/pages/confirmation/index.js",
-  "ui/pages/confirmation/templates/add-ethereum-chain.js",
-  "ui/pages/confirmation/templates/flask/snap-confirm/snap-confirm.js",
-  "ui/pages/confirmation/templates/index.js",
-  "ui/pages/confirmation/templates/switch-ethereum-chain.js",
+  "ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.component.js",
+  "ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.stories.js",
+  "ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.test.js",
+  "ui/pages/confirmations/components/advanced-gas-controls/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/context/advancedGasFeePopover.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/context/index.js",
+  "ui/pages/confirmations/components/advanced-gas-fee-popover/index.js",
+  "ui/pages/confirmations/components/confirmation-warning-modal/confirm-warning-modal.stories.js",
+  "ui/pages/confirmations/components/confirmation-warning-modal/confirmation-warning-modal.js",
+  "ui/pages/confirmations/components/confirmation-warning-modal/index.js",
+  "ui/pages/confirmations/components/contract-token-values/contract-token-values.js",
+  "ui/pages/confirmations/components/contract-token-values/contract-token-values.stories.js",
+  "ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js",
+  "ui/pages/confirmations/components/edit-gas-display/edit-gas-display.stories.js",
+  "ui/pages/confirmations/components/edit-gas-display/edit-gas-display.test.js",
+  "ui/pages/confirmations/components/edit-gas-display/index.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useGasItemFeeDetails.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.test.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/index.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/index.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.test.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/index.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js",
+  "ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/tooltips.js",
+  "ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.component.js",
+  "ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.stories.js",
+  "ui/pages/confirmations/components/edit-gas-popover/index.js",
+  "ui/pages/confirmations/components/gas-timing/gas-timing.component.js",
+  "ui/pages/confirmations/components/gas-timing/gas-timing.component.test.js",
+  "ui/pages/confirmations/components/gas-timing/index.js",
+  "ui/pages/confirmations/components/set-approval-for-all-warning/index.js",
+  "ui/pages/confirmations/components/set-approval-for-all-warning/set-approval-for-all-warning.js",
+  "ui/pages/confirmations/components/set-approval-for-all-warning/set-approval-for-all-warning.stories.js",
+  "ui/pages/confirmations/components/simulation-error-message/index.js",
+  "ui/pages/confirmations/components/simulation-error-message/simulation-error-message.js",
+  "ui/pages/confirmations/components/simulation-error-message/simulation-error-message.test.js",
+  "ui/pages/confirmations/components/transaction-detail-item/index.js",
+  "ui/pages/confirmations/components/transaction-detail-item/transaction-detail-item.component.js",
+  "ui/pages/confirmations/components/transaction-detail-item/transaction-detail-item.stories.js",
+  "ui/pages/confirmations/components/transaction-detail/index.js",
+  "ui/pages/confirmations/components/transaction-detail/transaction-detail.component.js",
+  "ui/pages/confirmations/components/transaction-detail/transaction-detail.component.test.js",
+  "ui/pages/confirmations/components/transaction-detail/transaction-detail.stories.js",
+  "ui/pages/confirmations/confirm-approve/confirm-approve.util.js",
+  "ui/pages/confirmations/confirm-approve/confirm-approve.util.test.js",
+  "ui/pages/confirmations/confirmation/components/confirmation-footer/confirmation-footer.js",
+  "ui/pages/confirmations/confirmation/components/confirmation-footer/index.js",
+  "ui/pages/confirmations/confirmation/components/confirmation-network-switch/confirmation-network-switch.js",
+  "ui/pages/confirmations/confirmation/components/confirmation-network-switch/confirmation-network-switch.stories.js",
+  "ui/pages/confirmations/confirmation/components/confirmation-network-switch/index.js",
+  "ui/pages/confirmations/confirmation/confirmation.js",
+  "ui/pages/confirmations/confirmation/index.js",
+  "ui/pages/confirmations/confirmation/stories/add-ethereum-chain.stories.js",
+  "ui/pages/confirmations/confirmation/stories/create-snap-account.stories.js",
+  "ui/pages/confirmations/confirmation/stories/error.stories.js",
+  "ui/pages/confirmations/confirmation/stories/remove-snap-account.stories.js",
+  "ui/pages/confirmations/confirmation/stories/snap-account-redirect.stories.js",
+  "ui/pages/confirmations/confirmation/stories/success.stories.js",
+  "ui/pages/confirmations/confirmation/stories/switch-ethereum-chain.stories.js",
+  "ui/pages/confirmations/confirmation/stories/util.js",
+  "ui/pages/confirmations/confirmation/templates/add-ethereum-chain.js",
+  "ui/pages/confirmations/confirmation/templates/create-snap-account.js",
+  "ui/pages/confirmations/confirmation/templates/create-snap-account.test.js",
+  "ui/pages/confirmations/confirmation/templates/error.js",
+  "ui/pages/confirmations/confirmation/templates/error.test.js",
+  "ui/pages/confirmations/confirmation/templates/index.js",
+  "ui/pages/confirmations/confirmation/templates/remove-snap-account.js",
+  "ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js",
+  "ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js",
+  "ui/pages/confirmations/confirmation/templates/snap-account-redirect.js",
+  "ui/pages/confirmations/confirmation/templates/snap-account-redirect.test.js",
+  "ui/pages/confirmations/confirmation/templates/snaps/snap-alert/snap-alert.js",
+  "ui/pages/confirmations/confirmation/templates/snaps/snap-confirmation/snap-confirmation.js",
+  "ui/pages/confirmations/confirmation/templates/snaps/snap-default/snap-default.js",
+  "ui/pages/confirmations/confirmation/templates/snaps/snap-prompt/snap-prompt.js",
+  "ui/pages/confirmations/confirmation/templates/success.js",
+  "ui/pages/confirmations/confirmation/templates/success.test.js",
+  "ui/pages/confirmations/confirmation/templates/switch-ethereum-chain.js",
+  "ui/pages/confirmations/confirmation/templates/switch-ethereum-chain.test.js",
+  "ui/pages/confirmations/hooks/test-utils.js",
+  "ui/pages/confirmations/hooks/useAssetDetails.js",
+  "ui/pages/confirmations/hooks/useBalance.js",
+  "ui/pages/confirmations/hooks/useBalance.test.js",
+  "ui/pages/confirmations/hooks/useGasEstimates.js",
+  "ui/pages/confirmations/hooks/useGasEstimates.test.js",
+  "ui/pages/confirmations/hooks/useGasFeeErrors.js",
+  "ui/pages/confirmations/hooks/useGasFeeErrors.test.js",
+  "ui/pages/confirmations/hooks/useGasFeeInputs.js",
+  "ui/pages/confirmations/hooks/useGasFeeInputs.test.js",
+  "ui/pages/confirmations/hooks/useGasPriceInput.js",
+  "ui/pages/confirmations/hooks/useGasPriceInput.test.js",
+  "ui/pages/confirmations/hooks/useIncrementedGasFees.js",
+  "ui/pages/confirmations/hooks/useMaxFeePerGasInput.js",
+  "ui/pages/confirmations/hooks/useMaxFeePerGasInput.test.js",
+  "ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.js",
+  "ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.test.js",
+  "ui/pages/confirmations/hooks/useRouting.js",
+  "ui/pages/confirmations/hooks/useTransactionEventFragment.js",
+  "ui/pages/confirmations/hooks/useTransactionFunction.test.js",
+  "ui/pages/confirmations/hooks/useTransactionFunctions.js",
+  "ui/pages/confirmations/hooks/useTypedSignSignatureInfo.test.js",
+  "ui/pages/confirmations/hooks/utils.js",
+  "ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.component.js",
+  "ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.container.js",
+  "ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.js",
+  "ui/pages/confirmations/send-utils/send.constants.js",
+  "ui/pages/confirmations/send-utils/send.utils.js",
+  "ui/pages/confirmations/send-utils/send.utils.test.js",
   "ui/pages/connected-accounts/connected-accounts.component.js",
   "ui/pages/connected-accounts/connected-accounts.container.js",
   "ui/pages/connected-accounts/connected-accounts.stories.js",
@@ -1129,256 +1243,54 @@
   "ui/pages/connected-sites/index.js",
   "ui/pages/create-account/connect-hardware/account-list.js",
   "ui/pages/create-account/connect-hardware/account-list.stories.js",
+  "ui/pages/create-account/connect-hardware/account-list.test.js",
   "ui/pages/create-account/connect-hardware/index.js",
   "ui/pages/create-account/connect-hardware/select-hardware.js",
   "ui/pages/create-account/connect-hardware/select-hardware.stories.js",
   "ui/pages/create-account/create-account.component.js",
-  "ui/pages/create-account/import-account/index.js",
-  "ui/pages/create-account/import-account/json.js",
-  "ui/pages/create-account/import-account/private-key.js",
   "ui/pages/create-account/index.js",
-  "ui/pages/create-account/new-account.component.js",
-  "ui/pages/create-account/new-account.container.js",
-  "ui/pages/create-account/new-account.stories.js",
-  "ui/pages/error/error.component.js",
-  "ui/pages/error/index.js",
-  "ui/pages/first-time-flow/create-password/create-password.component.js",
-  "ui/pages/first-time-flow/create-password/create-password.container.js",
-  "ui/pages/first-time-flow/create-password/create-password.stories.js",
-  "ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js",
-  "ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.container.js",
-  "ui/pages/first-time-flow/create-password/import-with-seed-phrase/index.js",
-  "ui/pages/first-time-flow/create-password/index.js",
-  "ui/pages/first-time-flow/create-password/new-account/index.js",
-  "ui/pages/first-time-flow/create-password/new-account/new-account.component.js",
-  "ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js",
-  "ui/pages/first-time-flow/end-of-flow/end-of-flow.container.js",
-  "ui/pages/first-time-flow/end-of-flow/end-of-flow.stories.js",
-  "ui/pages/first-time-flow/end-of-flow/end-of-flow.test.js",
-  "ui/pages/first-time-flow/end-of-flow/index.js",
-  "ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js",
-  "ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.container.js",
-  "ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.test.js",
-  "ui/pages/first-time-flow/first-time-flow-switch/index.js",
-  "ui/pages/first-time-flow/first-time-flow.component.js",
-  "ui/pages/first-time-flow/first-time-flow.container.js",
-  "ui/pages/first-time-flow/index.js",
-  "ui/pages/first-time-flow/onboarding-initiator-util.js",
-  "ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase-component.test.js",
-  "ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/confirm-seed-phrase.component.js",
-  "ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/confirm-seed-phrase.container.js",
-  "ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/draggable-seed.component.js",
-  "ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.js",
-  "ui/pages/first-time-flow/seed-phrase/index.js",
-  "ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/index.js",
-  "ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.component.js",
-  "ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.container.js",
-  "ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.stories.js",
-  "ui/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.test.js",
-  "ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/index.js",
-  "ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js",
-  "ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js",
-  "ui/pages/first-time-flow/select-action/index.js",
-  "ui/pages/first-time-flow/select-action/select-action.component.js",
-  "ui/pages/first-time-flow/select-action/select-action.container.js",
-  "ui/pages/first-time-flow/select-action/select-action.stories.js",
-  "ui/pages/first-time-flow/select-action/select-action.test.js",
-  "ui/pages/first-time-flow/welcome/beta-welcome-footer.component.js",
-  "ui/pages/first-time-flow/welcome/index.js",
-  "ui/pages/first-time-flow/welcome/welcome-footer.component.js",
-  "ui/pages/first-time-flow/welcome/welcome.component.js",
-  "ui/pages/first-time-flow/welcome/welcome.container.js",
-  "ui/pages/first-time-flow/welcome/welcome.stories.js",
-  "ui/pages/first-time-flow/welcome/welcome.test.js",
-  "ui/pages/home/beta/beta-home-footer.component.js",
-  "ui/pages/home/flask/flask-home-footer.component.js",
   "ui/pages/home/home.component.js",
   "ui/pages/home/home.container.js",
   "ui/pages/home/index.js",
-  "ui/pages/import-token/import-token.component.js",
-  "ui/pages/import-token/import-token.container.js",
-  "ui/pages/import-token/import-token.stories.js",
-  "ui/pages/import-token/import-token.test.js",
-  "ui/pages/import-token/index.js",
-  "ui/pages/import-token/token-list/index.js",
-  "ui/pages/import-token/token-list/token-list-placeholder/index.js",
-  "ui/pages/import-token/token-list/token-list-placeholder/token-list-placeholder.component.js",
-  "ui/pages/import-token/token-list/token-list-placeholder/token-list-placeholder.stories.js",
-  "ui/pages/import-token/token-list/token-list.component.js",
-  "ui/pages/import-token/token-list/token-list.container.js",
-  "ui/pages/import-token/token-search/index.js",
-  "ui/pages/import-token/token-search/token-search.component.js",
-  "ui/pages/import-token/token-search/token-search.stories.js",
   "ui/pages/index.js",
-  "ui/pages/keychains/restore-vault.js",
-  "ui/pages/keychains/restore-vault.test.js",
-  "ui/pages/keychains/reveal-seed.js",
-  "ui/pages/keychains/reveal-seed.stories.js",
-  "ui/pages/keychains/reveal-seed.test.js",
-  "ui/pages/lock/index.js",
-  "ui/pages/lock/lock.component.js",
-  "ui/pages/lock/lock.container.js",
-  "ui/pages/lock/lock.test.js",
+  "ui/pages/notification-details/index.js",
+  "ui/pages/notifications-settings/index.js",
   "ui/pages/notifications/index.js",
-  "ui/pages/notifications/notification.test.js",
-  "ui/pages/notifications/notifications.js",
-  "ui/pages/onboarding-flow/create-password/create-password.js",
-  "ui/pages/onboarding-flow/creation-successful/creation-successful.js",
-  "ui/pages/onboarding-flow/creation-successful/creation-successful.stories.js",
-  "ui/pages/onboarding-flow/creation-successful/creation-successful.test.js",
-  "ui/pages/onboarding-flow/import-srp/import-srp.js",
-  "ui/pages/onboarding-flow/metametrics/metametrics.js",
-  "ui/pages/onboarding-flow/metametrics/metametrics.stories.js",
-  "ui/pages/onboarding-flow/onboarding-app-header/onboarding-app-header.js",
-  "ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js",
-  "ui/pages/onboarding-flow/onboarding-flow.js",
-  "ui/pages/onboarding-flow/pin-extension/pin-billboard.js",
-  "ui/pages/onboarding-flow/pin-extension/pin-extension.js",
-  "ui/pages/onboarding-flow/pin-extension/pin-extension.stories.js",
-  "ui/pages/onboarding-flow/privacy-settings/privacy-settings.js",
-  "ui/pages/onboarding-flow/privacy-settings/privacy-settings.stories.js",
-  "ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js",
-  "ui/pages/onboarding-flow/privacy-settings/setting.js",
-  "ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js",
-  "ui/pages/onboarding-flow/recovery-phrase/recovery-phrase-chips.js",
-  "ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js",
-  "ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js",
-  "ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.stories.js",
-  "ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.test.js",
-  "ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js",
-  "ui/pages/onboarding-flow/welcome/welcome.js",
-  "ui/pages/onboarding-flow/welcome/welcome.stories.js",
-  "ui/pages/permissions-connect/flask/snap-install/index.js",
-  "ui/pages/permissions-connect/flask/snap-install/snap-install.js",
-  "ui/pages/permissions-connect/flask/snap-update/index.js",
-  "ui/pages/permissions-connect/flask/snap-update/snap-update.js",
   "ui/pages/permissions-connect/index.js",
   "ui/pages/permissions-connect/permissions-connect.stories.js",
   "ui/pages/permissions-connect/redirect/index.js",
   "ui/pages/permissions-connect/redirect/permissions-redirect.component.js",
   "ui/pages/permissions-connect/redirect/permissions-redirect.stories.js",
+  "ui/pages/permissions-connect/snaps/snap-install/index.js",
+  "ui/pages/permissions-connect/snaps/snap-install/snap-install.js",
+  "ui/pages/permissions-connect/snaps/snap-install/snap-install.stories.js",
+  "ui/pages/permissions-connect/snaps/snap-result/index.js",
+  "ui/pages/permissions-connect/snaps/snap-result/snap-result.js",
+  "ui/pages/permissions-connect/snaps/snap-result/snap-result.stories.js",
+  "ui/pages/permissions-connect/snaps/snap-update/index.js",
+  "ui/pages/permissions-connect/snaps/snap-update/snap-update.js",
+  "ui/pages/permissions-connect/snaps/snap-update/snap-update.stories.js",
+  "ui/pages/permissions-connect/snaps/snaps-connect/index.js",
+  "ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js",
+  "ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.stories.js",
+  "ui/pages/permissions-connect/snaps/util.js",
   "ui/pages/routes/index.js",
-  "ui/pages/routes/routes.component.js",
-  "ui/pages/routes/routes.container.js",
-  "ui/pages/send/index.js",
-  "ui/pages/send/send-content/add-recipient/add-recipient.component.js",
-  "ui/pages/send/send-content/add-recipient/add-recipient.component.test.js",
-  "ui/pages/send/send-content/add-recipient/add-recipient.container.js",
-  "ui/pages/send/send-content/add-recipient/add-recipient.container.test.js",
-  "ui/pages/send/send-content/add-recipient/add-recipient.stories.js",
-  "ui/pages/send/send-content/add-recipient/ens-input.component.js",
-  "ui/pages/send/send-content/add-recipient/ens-input.container.js",
-  "ui/pages/send/send-content/add-recipient/ens-input.js",
-  "ui/pages/send/send-content/add-recipient/index.js",
-  "ui/pages/send/send-content/index.js",
-  "ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.js",
-  "ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js",
-  "ui/pages/send/send-content/send-amount-row/amount-max-button/index.js",
-  "ui/pages/send/send-content/send-amount-row/index.js",
-  "ui/pages/send/send-content/send-amount-row/send-amount-row.component.js",
-  "ui/pages/send/send-content/send-amount-row/send-amount-row.component.test.js",
-  "ui/pages/send/send-content/send-amount-row/send-amount-row.container.js",
-  "ui/pages/send/send-content/send-amount-row/send-amount-row.container.test.js",
-  "ui/pages/send/send-content/send-asset-row/index.js",
-  "ui/pages/send/send-content/send-asset-row/send-asset-row.component.js",
-  "ui/pages/send/send-content/send-asset-row/send-asset-row.container.js",
-  "ui/pages/send/send-content/send-asset-row/send-asset-row.stories.js",
-  "ui/pages/send/send-content/send-content.component.js",
-  "ui/pages/send/send-content/send-content.component.test.js",
-  "ui/pages/send/send-content/send-content.container.js",
-  "ui/pages/send/send-content/send-content.stories.js",
-  "ui/pages/send/send-content/send-gas-row/index.js",
-  "ui/pages/send/send-content/send-gas-row/send-gas-row.component.js",
-  "ui/pages/send/send-content/send-gas-row/send-gas-row.component.test.js",
-  "ui/pages/send/send-content/send-gas-row/send-gas-row.container.js",
-  "ui/pages/send/send-content/send-gas-row/send-gas-row.container.test.js",
-  "ui/pages/send/send-content/send-gas-row/send-gas-row.stories.js",
-  "ui/pages/send/send-content/send-hex-data-row/index.js",
-  "ui/pages/send/send-content/send-hex-data-row/send-hex-data-row.component.js",
-  "ui/pages/send/send-content/send-hex-data-row/send-hex-data-row.container.js",
-  "ui/pages/send/send-content/send-hex-data-row/send-hex-data-row.stories.js",
-  "ui/pages/send/send-content/send-row-wrapper/index.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-error-message/index.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.test.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.test.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-wrapper.component.js",
-  "ui/pages/send/send-content/send-row-wrapper/send-row-wrapper.component.test.js",
-  "ui/pages/send/send-footer/index.js",
-  "ui/pages/send/send-footer/send-footer.component.js",
-  "ui/pages/send/send-footer/send-footer.component.test.js",
-  "ui/pages/send/send-footer/send-footer.container.js",
-  "ui/pages/send/send-footer/send-footer.container.test.js",
-  "ui/pages/send/send-footer/send-footer.stories.js",
-  "ui/pages/send/send-header/index.js",
-  "ui/pages/send/send-header/send-header.component.js",
-  "ui/pages/send/send-header/send-header.component.test.js",
-  "ui/pages/send/send-header/send-header.stories.js",
-  "ui/pages/send/send.constants.js",
-  "ui/pages/send/send.js",
-  "ui/pages/send/send.test.js",
-  "ui/pages/send/send.utils.js",
-  "ui/pages/send/send.utils.test.js",
+  "ui/pages/routes/routes.component.test.js",
+  "ui/pages/routes/utils.js",
   "ui/pages/settings/advanced-tab/advanced-tab.component.js",
   "ui/pages/settings/advanced-tab/advanced-tab.component.test.js",
   "ui/pages/settings/advanced-tab/advanced-tab.container.js",
   "ui/pages/settings/advanced-tab/advanced-tab.stories.js",
   "ui/pages/settings/advanced-tab/index.js",
-  "ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js",
-  "ui/pages/settings/contact-list-tab/add-contact/add-contact.container.js",
-  "ui/pages/settings/contact-list-tab/add-contact/index.js",
-  "ui/pages/settings/contact-list-tab/contact-list-tab.component.js",
-  "ui/pages/settings/contact-list-tab/contact-list-tab.container.js",
-  "ui/pages/settings/contact-list-tab/contact-list-tab.stories.js",
-  "ui/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js",
-  "ui/pages/settings/contact-list-tab/edit-contact/edit-contact.container.js",
-  "ui/pages/settings/contact-list-tab/edit-contact/index.js",
-  "ui/pages/settings/contact-list-tab/index.js",
-  "ui/pages/settings/contact-list-tab/view-contact/index.js",
-  "ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js",
-  "ui/pages/settings/contact-list-tab/view-contact/view-contact.container.js",
-  "ui/pages/settings/experimental-tab/experimental-tab.component.js",
-  "ui/pages/settings/experimental-tab/experimental-tab.component.test.js",
-  "ui/pages/settings/experimental-tab/experimental-tab.container.js",
-  "ui/pages/settings/experimental-tab/index.js",
-  "ui/pages/settings/flask/snaps-list-tab/index.js",
-  "ui/pages/settings/flask/snaps-list-tab/snap-list-tab.js",
-  "ui/pages/settings/flask/snaps-list-tab/snap-list-tab.stories.js",
-  "ui/pages/settings/flask/view-snap/index.js",
-  "ui/pages/settings/flask/view-snap/view-snap.js",
   "ui/pages/settings/index.js",
   "ui/pages/settings/info-tab/index.js",
   "ui/pages/settings/info-tab/info-tab.stories.js",
-  "ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js",
-  "ui/pages/settings/networks-tab/custom-content-search/custom-content-search.stories.js",
-  "ui/pages/settings/networks-tab/custom-content-search/custom-content-search.test.js",
-  "ui/pages/settings/networks-tab/custom-content-search/index.js",
-  "ui/pages/settings/networks-tab/index.js",
   "ui/pages/settings/networks-tab/networks-form/index.js",
-  "ui/pages/settings/networks-tab/networks-form/networks-form.js",
   "ui/pages/settings/networks-tab/networks-form/networks-form.test.js",
-  "ui/pages/settings/networks-tab/networks-list-item/index.js",
-  "ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js",
-  "ui/pages/settings/networks-tab/networks-list-item/networks-list-item.stories.js",
-  "ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js",
-  "ui/pages/settings/networks-tab/networks-list/index.js",
-  "ui/pages/settings/networks-tab/networks-list/network-list.stories.js",
-  "ui/pages/settings/networks-tab/networks-list/networks-list.js",
-  "ui/pages/settings/networks-tab/networks-list/networks-list.test.js",
-  "ui/pages/settings/networks-tab/networks-tab-content/index.js",
-  "ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.js",
-  "ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js",
-  "ui/pages/settings/networks-tab/networks-tab-subheader/index.js",
-  "ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js",
-  "ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js",
-  "ui/pages/settings/networks-tab/networks-tab.constants.js",
-  "ui/pages/settings/networks-tab/networks-tab.js",
-  "ui/pages/settings/networks-tab/networks-tab.test.js",
   "ui/pages/settings/security-tab/index.js",
   "ui/pages/settings/security-tab/security-tab.component.js",
   "ui/pages/settings/security-tab/security-tab.container.js",
-  "ui/pages/settings/security-tab/security-tab.container.test.js",
+  "ui/pages/settings/security-tab/security-tab.test.js",
   "ui/pages/settings/settings-search-list/index.js",
   "ui/pages/settings/settings-search-list/settings-search-list.js",
   "ui/pages/settings/settings-search/index.js",
@@ -1386,13 +1298,19 @@
   "ui/pages/settings/settings-search/settings-search.stories.js",
   "ui/pages/settings/settings-tab/index.js",
   "ui/pages/settings/settings-tab/settings-tab.component.js",
-  "ui/pages/settings/settings-tab/settings-tab.component.test.js",
-  "ui/pages/settings/settings-tab/settings-tab.constant.js",
   "ui/pages/settings/settings-tab/settings-tab.container.js",
+  "ui/pages/settings/settings-tab/settings-tab.test.js",
   "ui/pages/settings/settings.component.js",
-  "ui/pages/settings/settings.component.test.js",
   "ui/pages/settings/settings.container.js",
   "ui/pages/settings/settings.stories.js",
+  "ui/pages/settings/settings.test.js",
+  "ui/pages/snaps/snap-view/index.js",
+  "ui/pages/snaps/snap-view/snap-settings.js",
+  "ui/pages/snaps/snap-view/snap-view.js",
+  "ui/pages/snaps/snap-view/snap-view.test.js",
+  "ui/pages/snaps/snaps-list/index.js",
+  "ui/pages/snaps/snaps-list/snap-list.js",
+  "ui/pages/snaps/snaps-list/snap-list.stories.js",
   "ui/pages/swaps/awaiting-signatures/awaiting-signatures.js",
   "ui/pages/swaps/awaiting-signatures/awaiting-signatures.stories.js",
   "ui/pages/swaps/awaiting-signatures/awaiting-signatures.test.js",
@@ -1431,8 +1349,6 @@
   "ui/pages/swaps/import-token/import-token.stories.js",
   "ui/pages/swaps/import-token/import-token.test.js",
   "ui/pages/swaps/import-token/index.js",
-  "ui/pages/swaps/index.js",
-  "ui/pages/swaps/index.test.js",
   "ui/pages/swaps/loading-swaps-quotes/background-animation.js",
   "ui/pages/swaps/loading-swaps-quotes/background-animation.test.js",
   "ui/pages/swaps/loading-swaps-quotes/index.js",
@@ -1441,13 +1357,16 @@
   "ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes-stories-metadata.test.js",
   "ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js",
   "ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.test.js",
-  "ui/pages/swaps/searchable-item-list/item-list/index.js",
-  "ui/pages/swaps/searchable-item-list/item-list/item-list.component.js",
+  "ui/pages/swaps/mascot-background-animation/mascot-background-animation.js",
+  "ui/pages/swaps/mascot-background-animation/mascot-background-animation.test.js",
+  "ui/pages/swaps/notification-page/notification-page.js",
+  "ui/pages/swaps/notification-page/notification-page.test.js",
   "ui/pages/swaps/select-quote-popover/index.js",
   "ui/pages/swaps/select-quote-popover/mock-quote-data.js",
   "ui/pages/swaps/select-quote-popover/mock-quote-data.test.js",
   "ui/pages/swaps/select-quote-popover/quote-details/index.js",
   "ui/pages/swaps/select-quote-popover/quote-details/quote-details.js",
+  "ui/pages/swaps/select-quote-popover/quote-details/quote-details.test.js",
   "ui/pages/swaps/select-quote-popover/select-quote-popover-constants.js",
   "ui/pages/swaps/select-quote-popover/select-quote-popover.js",
   "ui/pages/swaps/select-quote-popover/select-quote-popover.stories.js",
@@ -1455,6 +1374,8 @@
   "ui/pages/swaps/select-quote-popover/sort-list/index.js",
   "ui/pages/swaps/select-quote-popover/sort-list/sort-list.js",
   "ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js",
+  "ui/pages/swaps/selected-token/selected-token.js",
+  "ui/pages/swaps/selected-token/selected-token.test.js",
   "ui/pages/swaps/smart-transaction-status/arrow-icon.js",
   "ui/pages/swaps/smart-transaction-status/arrow-icon.test.js",
   "ui/pages/swaps/smart-transaction-status/canceled-icon.js",
@@ -1471,24 +1392,19 @@
   "ui/pages/swaps/smart-transaction-status/timer-icon.test.js",
   "ui/pages/swaps/smart-transaction-status/unknown-icon.js",
   "ui/pages/swaps/smart-transaction-status/unknown-icon.test.js",
+  "ui/pages/swaps/swaps-banner-alert/swaps-banner-alert.js",
+  "ui/pages/swaps/swaps-banner-alert/swaps-banner-alert.test.js",
   "ui/pages/swaps/swaps-footer/index.js",
   "ui/pages/swaps/swaps-footer/swaps-footer.js",
   "ui/pages/swaps/swaps-footer/swaps-footer.test.js",
   "ui/pages/swaps/swaps-util-test-constants.js",
-  "ui/pages/swaps/swaps.util.js",
   "ui/pages/swaps/swaps.util.test.js",
+  "ui/pages/swaps/transaction-settings/transaction-settings.js",
+  "ui/pages/swaps/transaction-settings/transaction-settings.stories.js",
+  "ui/pages/swaps/transaction-settings/transaction-settings.test.js",
   "ui/pages/swaps/view-on-block-explorer/index.js",
   "ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js",
   "ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js",
-  "ui/pages/token-details/index.js",
-  "ui/pages/token-details/token-details-page.js",
-  "ui/pages/token-details/token-details-page.test.js",
-  "ui/pages/unlock-page/index.js",
-  "ui/pages/unlock-page/unlock-page.component.js",
-  "ui/pages/unlock-page/unlock-page.component.test.js",
-  "ui/pages/unlock-page/unlock-page.container.js",
-  "ui/pages/unlock-page/unlock-page.container.test.js",
-  "ui/pages/unlock-page/unlock-page.stories.js",
   "ui/selectors/confirm-transaction.js",
   "ui/selectors/confirm-transaction.test.js",
   "ui/selectors/custom-gas.js",
@@ -1498,15 +1414,11 @@
   "ui/selectors/metametrics.js",
   "ui/selectors/metametrics.test.js",
   "ui/selectors/nonce-sorted-transactions-selector.test.js",
-  "ui/selectors/permissions.js",
   "ui/selectors/permissions.test.js",
   "ui/selectors/selectors.js",
   "ui/selectors/selectors.test.js",
   "ui/selectors/transactions.js",
   "ui/selectors/transactions.test.js",
-  "ui/store/actionConstants.js",
   "ui/store/actionConstants.test.js",
-  "ui/store/actions.js",
-  "ui/store/actions.test.js",
-  "ui/store/store.js"
+  "ui/store/actions.test.js"
 ]
diff --git a/development/webpack/test/helpers.ts b/development/webpack/test/helpers.ts
index 20ae928923c1..81095a411f3c 100644
--- a/development/webpack/test/helpers.ts
+++ b/development/webpack/test/helpers.ts
@@ -79,10 +79,31 @@ export function mockWebpack(
     ]),
     getAsset: mock.fn((name) => assets[name]),
     updateAsset: mock.fn(
-      (name: string, fn: (source: sources.Source) => sources.Source) => {
-        return fn(assets[name].source);
+      (
+        name: string,
+        newSourceOrFunction:
+          | sources.Source
+          | ((source: sources.Source) => sources.Source),
+      ) => {
+        assets[name].source =
+          typeof newSourceOrFunction === 'function'
+            ? newSourceOrFunction(assets[name].source)
+            : newSourceOrFunction;
       },
     ),
+    renameAsset: mock.fn((name: string, newFile: string) => {
+      const asset = assets[name];
+      delete assets[name];
+      assets[newFile] = {
+        ...asset,
+        name: newFile,
+      };
+
+      for (const chunk of compilation.chunks) {
+        chunk.files.delete(name);
+        chunk.files.add(newFile);
+      }
+    }),
     deleteAsset: mock.fn((name: string) => {
       delete assets[name];
     }),
diff --git a/development/webpack/test/plugins.ManifestPlugin.test.ts b/development/webpack/test/plugins.ManifestPlugin.test.ts
index 2db8ed919398..6bb8eb970fdd 100644
--- a/development/webpack/test/plugins.ManifestPlugin.test.ts
+++ b/development/webpack/test/plugins.ManifestPlugin.test.ts
@@ -1,8 +1,10 @@
 import { describe, it, afterEach } from 'node:test';
 import assert from 'node:assert';
 import { join, resolve } from 'node:path';
-import { type Compilation } from 'webpack';
+import { Open } from 'unzipper';
+import { sources, type Compilation } from 'webpack';
 import { ManifestPlugin } from '../utils/plugins/ManifestPlugin';
+import { createBrowserZipBuilder } from '../utils/plugins/ManifestPlugin/zip';
 import { ZipOptions } from '../utils/plugins/ManifestPlugin/types';
 import { Manifest } from '../utils/helpers';
 import {
@@ -13,9 +15,22 @@ import {
 import { transformManifest } from '../utils/plugins/ManifestPlugin/helpers';
 import { generateCases, type Combination, mockWebpack } from './helpers';
 
+const { RawSource } = sources;
+
 const endsWithPath = (value: string, ...segments: string[]) =>
   value.endsWith(join(...segments));
 
+async function readZipEntries(source: { buffer: () => Buffer }) {
+  const directory = await Open.buffer(source.buffer());
+  const files = directory.files.filter((file) => file.type === 'File');
+
+  return new Map(
+    await Promise.all(
+      files.map(async (file) => [file.path, await file.buffer()] as const),
+    ),
+  );
+}
+
 describe('ManifestPlugin', () => {
   describe('Plugin', () => {
     const matrix = {
@@ -262,6 +277,202 @@ describe('ManifestPlugin', () => {
         ]),
       );
     });
+
+    it('writes expected files into emitted zip assets and excludes source maps', async () => {
+      const files = [
+        {
+          name: 'filename.js',
+          source: Buffer.from('console.log(1 + 2);', 'utf8'),
+        },
+        {
+          name: 'filename.js.map',
+          source: Buffer.from('{}', 'utf8'),
+        },
+        {
+          name: 'pixel.png',
+          source: Buffer.from([
+            137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0,
+            0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 55, 110, 249, 36, 0, 0, 0, 10, 73,
+            68, 65, 84, 120, 1, 99, 96, 0, 0, 0, 2, 0, 1, 115, 117, 1, 24, 0, 0,
+            0, 0, 73, 69, 78, 68, 174, 66, 96, 130,
+          ]),
+        },
+      ];
+      const { compiler, compilation, promise } = mockWebpack(
+        files.map(({ name }) => name),
+        files.map(({ source }) => source),
+        files.map(() => null),
+      );
+      compiler.context = join(__dirname, 'fixtures/ManifestPlugin/empty');
+
+      const manifestPlugin = new ManifestPlugin({
+        browsers: ['chrome', 'firefox'],
+        manifest_version: 3,
+        version: '1.0.0.0',
+        versionName: '1.0.0',
+        description: null,
+        buildType: 'main',
+        zip: true,
+        zipOptions: {
+          level: 0,
+          mtime: 1711141205825,
+          excludeExtensions: ['.map'],
+          outFilePath: '[browser]/extension.zip',
+        },
+      });
+
+      manifestPlugin.apply(compiler);
+      await promise;
+
+      for (const browser of ['chrome', 'firefox'] as const) {
+        const zipEntries = await readZipEntries(
+          compilation.assets[`${browser}/extension.zip`],
+        );
+
+        assert.deepStrictEqual(
+          new Set(zipEntries.keys()),
+          new Set(['manifest.json', 'filename.js', 'pixel.png']),
+        );
+        assert.deepStrictEqual(zipEntries.get('filename.js'), files[0].source);
+        assert.deepStrictEqual(zipEntries.get('pixel.png'), files[2].source);
+        assert.strictEqual(zipEntries.has('filename.js.map'), false);
+        assert.strictEqual(
+          zipEntries.get('manifest.json')?.toString(),
+          compilation.assets[`${browser}/manifest.json`].source().toString(),
+        );
+      }
+    });
+
+    it('moves source maps to the sourcemaps directory when zipping hidden-source-map builds', async () => {
+      const files = [
+        {
+          name: 'filename.js',
+          source: Buffer.from('console.log(1 + 2);', 'utf8'),
+        },
+        {
+          name: 'filename.js.map',
+          source: Buffer.from('{}', 'utf8'),
+        },
+      ];
+      const { compiler, compilation, promise } = mockWebpack(
+        files.map(({ name }) => name),
+        files.map(({ source }) => source),
+        files.map(() => null),
+        'hidden-source-map',
+      );
+      compiler.context = join(__dirname, 'fixtures/ManifestPlugin/empty');
+
+      const manifestPlugin = new ManifestPlugin({
+        browsers: ['chrome', 'firefox'],
+        manifest_version: 3,
+        version: '1.0.0.0',
+        versionName: '1.0.0',
+        description: null,
+        buildType: 'main',
+        zip: true,
+        zipOptions: {
+          level: 0,
+          mtime: 1711141205825,
+          excludeExtensions: ['.map'],
+          outFilePath: '[browser]/extension.zip',
+        },
+      });
+
+      manifestPlugin.apply(compiler);
+      await promise;
+
+      assert.deepStrictEqual(
+        new Set(Object.keys(compilation.assets)),
+        new Set([
+          'chrome/extension.zip',
+          'chrome/manifest.json',
+          'chrome/filename.js',
+          'firefox/extension.zip',
+          'firefox/manifest.json',
+          'firefox/filename.js',
+          'sourcemaps/filename.js.map',
+        ]),
+      );
+
+      for (const browser of ['chrome', 'firefox'] as const) {
+        const zipEntries = await readZipEntries(
+          compilation.assets[`${browser}/extension.zip`],
+        );
+        assert.strictEqual(zipEntries.has('filename.js.map'), false);
+      }
+    });
+  });
+
+  describe('zip helpers', () => {
+    it('skips excluded extensions when adding assets to a browser zip', async () => {
+      const addedAssets: string[] = [];
+      const builder = createBrowserZipBuilder({
+        compressionOptions: { level: 0 },
+        excludeExtensions: ['.map'],
+        manifest: new RawSource('{"name":"test"}'),
+        mtime: 1711141205825,
+        onAssetAdded: (assetName) => addedAssets.push(assetName),
+      });
+
+      builder.addAsset('ignored.js.map', new RawSource('{}'));
+      const zipSource = await builder.finalize();
+      const zipEntries = await readZipEntries(zipSource);
+
+      assert.deepStrictEqual(addedAssets, ['manifest.json']);
+      assert.deepStrictEqual([...zipEntries.keys()], ['manifest.json']);
+    });
+
+    it('compresses javascript assets and reuses the finalized zip source', async () => {
+      const builder = createBrowserZipBuilder({
+        compressionOptions: { level: 9 },
+        excludeExtensions: ['.map'],
+        manifest: new RawSource('{"name":"test"}'),
+        mtime: 1711141205825,
+        onAssetAdded: () => undefined,
+      });
+
+      builder.addAsset(
+        'script.js',
+        new RawSource('console.log("compressed");'),
+      );
+
+      const [firstZipSource, secondZipSource] = await Promise.all([
+        builder.finalize(),
+        builder.finalize(),
+      ]);
+      const directory = await Open.buffer(firstZipSource.buffer());
+      const scriptFile = directory.files.find(
+        (file) => file.path === 'script.js',
+      );
+
+      assert.strictEqual(firstZipSource, secondZipSource);
+      assert.ok(scriptFile, 'expected script.js to be included in the zip');
+      assert.strictEqual(scriptFile.compressionMethod, 8);
+      assert.deepStrictEqual(
+        await scriptFile.buffer(),
+        Buffer.from('console.log("compressed");'),
+      );
+    });
+
+    it('throws when assets are added after the zip has been finalized', async () => {
+      const builder = createBrowserZipBuilder({
+        compressionOptions: { level: 0 },
+        excludeExtensions: ['.map'],
+        manifest: new RawSource('{"name":"test"}'),
+        mtime: 1711141205825,
+        onAssetAdded: () => undefined,
+      });
+
+      const zipSource = await builder.finalize();
+      assert.throws(
+        () =>
+          builder.addAsset('late.js', new RawSource('console.log("late");')),
+        /Cannot add asset after finalize\(\)/u,
+      );
+
+      const zipEntries = await readZipEntries(zipSource);
+      assert.deepStrictEqual([...zipEntries.keys()], ['manifest.json']);
+    });
   });
 
   describe('should transform the manifest object', () => {
diff --git a/development/webpack/test/plugins.SelfInjectPlugin.test.ts b/development/webpack/test/plugins.SelfInjectPlugin.test.ts
index 3a3ef729eacf..06af6f92f49f 100644
--- a/development/webpack/test/plugins.SelfInjectPlugin.test.ts
+++ b/development/webpack/test/plugins.SelfInjectPlugin.test.ts
@@ -42,7 +42,7 @@ describe('SelfInjectPlugin', () => {
         // we should have matched our file so it should have been updated:
 
         assert.strictEqual(compilation.updateAsset.mock.callCount(), 1);
-        const newAsset = compilation.updateAsset.mock.calls[0].result;
+        const newAsset = compilation.getAsset(filename)?.source;
         assert(newAsset, 'newAsset should be defined');
         const { source: newSource, map: newMap } = newAsset.sourceAndMap();
 
diff --git a/development/webpack/test/webpack.config.test.ts b/development/webpack/test/webpack.config.test.ts
index 89d595c52d7f..88e4ba9b458b 100644
--- a/development/webpack/test/webpack.config.test.ts
+++ b/development/webpack/test/webpack.config.test.ts
@@ -1,8 +1,9 @@
 import fs from 'node:fs';
+import { tmpdir } from 'node:os';
 import { describe, it, afterEach, before, after, mock } from 'node:test';
 import assert from 'node:assert';
 import process from 'node:process';
-import { resolve } from 'node:path';
+import { join, resolve } from 'node:path';
 import {
   type Configuration,
   webpack,
@@ -13,6 +14,7 @@ import { noop } from '../utils/helpers';
 import { ManifestPlugin } from '../utils/plugins/ManifestPlugin';
 import { getLatestCommit } from '../utils/git';
 import { ManifestPluginOptions } from '../utils/plugins/ManifestPlugin/types';
+import { version as packageVersion } from '../../../package.json';
 import { CHROME_MANIFEST_KEY_NON_PRODUCTION } from '../utils/constants';
 
 function getWebpackInstance(config: Configuration) {
@@ -231,6 +233,10 @@ ${Object.entries(env)
     assert.deepStrictEqual(manifestPlugin.options.description, null);
     assert.deepStrictEqual(manifestPlugin.options.zip, true);
     assert(manifestPlugin.options.zipOptions, 'Zip options should be present');
+    assert.strictEqual(
+      manifestPlugin.options.zipOptions.outFilePath,
+      `../builds/metamask-[browser]-${packageVersion}.zip`,
+    );
     assert.deepStrictEqual(manifestPlugin.options.transform, undefined);
 
     const progressPlugin = instance.options.plugins.find(
@@ -250,6 +256,119 @@ ${Object.entries(env)
     assert.strictEqual(instance.options.devtool, false);
   });
 
+  it('keeps the MYX provider ignore only while the warning still exists', async () => {
+    const config: Configuration = getWebpackConfig();
+    const myxWarningPattern = /MYXProvider\.mjs/u;
+    const ignoreWarnings = config.ignoreWarnings ?? [];
+    const getPerpsControllerWarnings = async (): Promise<string[]> => {
+      const tempDirectory = fs.mkdtempSync(
+        join(tmpdir(), 'webpack-perps-controller-warning-'),
+      );
+      const repositoryRoot = resolve(__dirname, '../../..');
+      const entryFilePath = join(tempDirectory, 'entry.js');
+
+      fs.writeFileSync(entryFilePath, "import '@metamask/perps-controller';\n");
+
+      try {
+        const compiler = webpack({
+          mode: 'development',
+          context: repositoryRoot,
+          entry: entryFilePath,
+          output: {
+            path: join(tempDirectory, 'dist'),
+            filename: 'bundle.js',
+            clean: true,
+          },
+          resolve: {
+            modules: [join(repositoryRoot, 'node_modules'), 'node_modules'],
+          },
+        });
+
+        return await new Promise((resolveWarnings, reject) => {
+          compiler.run((error, stats) => {
+            const closeCompiler = (callback: () => void) => {
+              compiler.close((closeError) => {
+                if (closeError) {
+                  reject(closeError);
+                  return;
+                }
+
+                callback();
+              });
+            };
+
+            if (error) {
+              closeCompiler(() => reject(error));
+              return;
+            }
+
+            if (!stats) {
+              closeCompiler(() =>
+                reject(new Error('Webpack finished without returning stats.')),
+              );
+              return;
+            }
+
+            const errors =
+              stats.toJson({ all: false, errors: true }).errors ?? [];
+            if (errors.length > 0) {
+              closeCompiler(() =>
+                reject(
+                  new Error(
+                    `Webpack build failed:\n${errors
+                      .map((item) =>
+                        typeof item === 'string' ? item : item.message,
+                      )
+                      .join('\n\n')}`,
+                  ),
+                ),
+              );
+              return;
+            }
+
+            const warnings =
+              stats.toJson({ all: false, warnings: true }).warnings ?? [];
+            closeCompiler(() =>
+              resolveWarnings(
+                warnings.map((item) =>
+                  typeof item === 'string' ? item : item.message,
+                ),
+              ),
+            );
+          });
+        });
+      } finally {
+        fs.rmSync(tempDirectory, { recursive: true, force: true });
+      }
+    };
+
+    assert.ok(
+      ignoreWarnings.some(
+        (warning) =>
+          warning instanceof RegExp && warning.test('MYXProvider.mjs'),
+      ),
+      'Expected webpack config to ignore MYXProvider.mjs while that warning still exists.',
+    );
+
+    // The published perps-controller package currently omits MYXProvider.mjs.
+    // This assertion should fail once that warning goes away, which is the cue
+    // to remove the ignoreWarnings entry from webpack.config.ts.
+    const warnings = await getPerpsControllerWarnings();
+    assert.ok(
+      warnings.some((warning) => myxWarningPattern.test(warning)),
+      [
+        'Good news: webpack no longer warns about missing MYXProvider.mjs.',
+        'That means the temporary workaround is probably no longer needed.',
+        'Cleanup steps:',
+        '1. Remove this test: "keeps the MYX provider ignore only while the warning still exists".',
+        '2. Remove /MYXProvider\\.mjs/u from ignoreWarnings in development/webpack/webpack.config.ts.',
+        '3. Re-run the webpack unit tests.',
+        'Warnings seen in this run:',
+        ...warnings,
+      ].join('\n'),
+    );
+  });
+
   it('should write the `dry-run` message then call exit(0)', () => {
     const exit = mock.method(process, 'exit', noop, { times: 1 });
     const error = mock.method(console, 'error', noop, { times: 1 });
diff --git a/development/webpack/utils/loaders/envValidationLoader.ts b/development/webpack/utils/loaders/envValidationLoader.ts
index 1eede0a9cfea..8e93025a3e88 100644
--- a/development/webpack/utils/loaders/envValidationLoader.ts
+++ b/development/webpack/utils/loaders/envValidationLoader.ts
@@ -192,11 +192,13 @@ function walkAst(node: Node, envVars: Set<string>): void {
  * This is a validation-only loader; the source code is passed through unmodified.
  *
  * @example
+ * ```ts
  * // webpack.config.ts
  * {
  *   loader: 'envValidationLoader',
- *   options: { declarations: ['NODE_ENV', 'API_URL'] }
+ *   options: { declarations: ['NODE_ENV', 'API_URL'] },
  * }
+ * ```
  * @param source - The source code content of the file being processed.
  * @throws Emits a webpack error if any `process.env.*` references
  * are found that aren't included in the `declarations` set.
diff --git a/development/webpack/utils/plugins/ManifestPlugin/index.ts b/development/webpack/utils/plugins/ManifestPlugin/index.ts
index 29e32d33bdac..de539cefcf86 100644
--- a/development/webpack/utils/plugins/ManifestPlugin/index.ts
+++ b/development/webpack/utils/plugins/ManifestPlugin/index.ts
@@ -10,16 +10,16 @@ import {
 } from 'webpack';
 import { validate } from 'schema-utils';
 import {
-  type DeflateOptions,
-  Zip,
-  AsyncZipDeflate,
-  ZipPassThrough,
-} from 'fflate';
-import { noop, extensionToJs, type Manifest, Browser } from '../../helpers';
+  noop,
+  extensionToJs,
+  type Manifest,
+  type Browser,
+} from '../../helpers';
 import { schema } from './schema';
 import type { ManifestPluginOptions } from './types';
+import { createBrowserZipBuilder, type ZipCompressionOptions } from './zip';
 
-const { RawSource, ConcatSource } = sources;
+const { CachedSource, RawSource } = sources;
 
 type Assets = Compilation['assets'];
 
@@ -29,78 +29,14 @@ export type EntryDescriptionNormalized = { import?: string[] } & Omit<
 >;
 
 const NAME = 'ManifestPlugin';
-const BROWSER_TEMPLATE_RE = /\[browser\]/gu;
 const SOURCEMAPS_DIRECTORY = 'sourcemaps';
 
-/**
- * Adds the given asset to the zip file
- *
- * @param asset - The asset to add
- * @param assetName - The name of the asset
- * @param compress - Whether to compress the asset
- * @param compressionOptions - The options to use for compression
- * @param mtime - The modification time of the asset
- * @param zip - The zip file to add the asset to
- */
-function addAssetToZip(
-  asset: Buffer,
-  assetName: string,
-  compress: boolean,
-  compressionOptions: DeflateOptions | undefined,
-  mtime: number,
-  zip: Zip,
-): void {
-  const zipFile = compress
-    ? // AsyncZipDeflate uses workers
-      new AsyncZipDeflate(assetName, compressionOptions)
-    : // ZipPassThrough doesn't use workers
-      new ZipPassThrough(assetName);
-  zipFile.mtime = mtime;
-  zip.add(zipFile);
-  // Use a copy of the Buffer via `Buffer.from(asset)`, as Zip will *consume*
-  // it, which breaks things if we are compiling for multiple browsers at once.
-  // `Buffer.from` uses the internal pool, so it's superior to `new Uint8Array`
-  // if we don't need to pass it off to a worker thread.
-  //
-  // Additionally, in Node.js 22+ a Buffer marked as "Untransferable" (like
-  // ours) can't be passed to a worker, which `AsyncZipDeflate` uses.
-  // See: https://github.com/101arrowz/fflate/issues/227#issuecomment-2540024304
-  // this can probably be simplified to `zipFile.push(Buffer.from(asset), true);`
-  // if the above issue is resolved.
-  zipFile.push(compress ? new Uint8Array(asset) : Buffer.from(asset), true);
-}
-
 /**
  * A webpack plugin that generates extension manifests for browsers and organizes
  * assets into browser-specific directories and optionally zips them.
  *
  */
 export class ManifestPlugin<Z extends boolean> {
-  /**
-   * File types that can be compressed well using DEFLATE compression, used when
-   * zipping assets.
-   */
-  static compressibleFileTypes = new Set([
-    '.bmp',
-    '.cjs',
-    '.css',
-    '.csv',
-    '.eot',
-    '.html',
-    '.js',
-    '.json',
-    '.log',
-    '.map',
-    '.md',
-    '.mjs',
-    '.svg',
-    '.txt',
-    '.wasm',
-    '.vtt', // very slow to process?
-    '.wav',
-    '.xml',
-  ]);
-
   options: ManifestPluginOptions<Z>;
 
   manifests: Map<Browser, Manifest> = new Map();
@@ -159,88 +95,142 @@ export class ManifestPlugin<Z extends boolean> {
     });
   }
 
-  private async zipAssets(
+  /**
+   * Emits each browser-specific manifest into its final output location.
+   *
+   * @param compilation - The active compilation.
+   * @param browsers - The browsers being built.
+   */
+  private emitManifestAssets(
     compilation: Compilation,
-    assets: Assets, // an object of asset names to assets
+    browsers: readonly Browser[],
+  ): void {
+    browsers.forEach((browser) => {
+      const manifest = this.manifestSources.get(browser) as sources.RawSource;
+      compilation.emitAsset(
+        path.posix.join(browser, 'manifest.json'),
+        manifest,
+        {
+          javascriptModule: false,
+          contentType: 'application/json',
+        },
+      );
+    });
+  }
+
+  /**
+   * Zips the assets for each browser into separate zip files and moves all
+   * assets into browser-specific directories. Source map assets may be moved to
+   * a dedicated `sourcemaps` directory if `devtool` is set to
+   * `hidden-source-map` to avoid exposing them in production builds.
+   *
+   * It uses a single-pass algorithm that iterates through the assets once, adding
+   * them to the appropriate zip builders and moving them to the correct
+   * location in the browser-specific directories.
+   *
+   * Note: This method uses `path.posix.join`, for the same reason
+   * {@link moveAssets} does.
+   *
+   * @param compilation - The active compilation.
+   * @param assets - The current asset map.
+   * @param options - The zip-enabled plugin options.
+   */
+  private async zipAndMoveAssets(
+    compilation: Compilation,
+    assets: Assets,
     options: ManifestPluginOptions<true>,
   ): Promise<void> {
-    // TODO(perf): this zips (and compresses) every file individually for each
-    // browser. Can we share the compression and crc steps to save time?
     const { browsers, zipOptions } = options;
     const { excludeExtensions, level, outFilePath, mtime } = zipOptions;
-    const compressionOptions: DeflateOptions = { level };
-    const assetsArray = Object.entries(assets);
+    const compressionOptions: ZipCompressionOptions = { level };
+    const moveSourceMapsToDedicatedDirectory =
+      compilation.options.devtool === 'hidden-source-map';
+    const [primaryBrowser, ...additionalBrowsers] = browsers;
+    const assetNames = Object.keys(assets);
+    const zipEligibleAssetCount = assetNames.filter(
+      (assetName) => !excludeExtensions.includes(path.extname(assetName)),
+    ).length;
 
     let filesProcessed = 0;
-    const numAssetsPerBrowser = assetsArray.length + 1;
-    const totalWork = numAssetsPerBrowser * browsers.length; // +1 for each browser's manifest.json
+    const totalWork = browsers.length * (zipEligibleAssetCount + 1);
     const reportProgress =
-      // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31880
-      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-      ProgressPlugin.getReporter(compilation.compiler) || noop;
-    // TODO(perf): run this in parallel. If you try without carefully optimizing the
-    // process will run out of memory pretty quickly, and crash. Fun!
-    for (const browser of browsers) {
+      ProgressPlugin.getReporter(compilation.compiler) ?? noop;
+    const zipBuilders = browsers.map((browser) => {
       const manifest = this.manifestSources.get(browser) as sources.RawSource;
-      const source = await new Promise<sources.Source>((resolve, reject) => {
-        // since Zipping is async, a past chunk could cause an error after we've
-        // started processing additional chunks. We'll use this errored flag to
-        // short-circuit the rest of the processing if that happens.
-        let errored = false;
-        const zipSource = new ConcatSource();
-        const zip = new Zip((error, data, final) => {
-          if (errored) return; // ignore additional errors
-          if (error) {
-            // set error flag to prevent additional processing
-            errored = true;
-            reject(error);
-          } else {
-            zipSource.add(new RawSource(Buffer.from(data)));
-            // we've received our final bit of data, return the zipSource
-            if (final) resolve(zipSource);
-          }
-        });
+      const onAssetAdded = (assetName: string) => {
+        reportProgress(
+          0,
+          `${++filesProcessed}/${totalWork} assets zipped for ${browser}`,
+          assetName,
+        );
+      };
 
-        // add the browser's manifest.json file to the zip
-        addAssetToZip(
-          manifest.buffer(),
-          'manifest.json',
-          true,
+      return {
+        browser,
+        builder: createBrowserZipBuilder({
           compressionOptions,
+          excludeExtensions,
+          manifest,
           mtime,
-          zip,
-        );
+          onAssetAdded,
+        }),
+      };
+    });
 
-        const message = `${++filesProcessed}/${totalWork} assets zipped for ${browser}`;
-        reportProgress(0, message, 'manifest.json');
+    for (const assetName of assetNames) {
+      const assetDetails = compilation.getAsset(assetName) as Readonly<Asset>;
+      const extName = path.extname(assetName);
+      const isSourceMapAsset =
+        moveSourceMapsToDedicatedDirectory && assetName.endsWith('.map');
+      const shouldZip = !excludeExtensions.includes(extName);
+      const shouldCache =
+        shouldZip || (additionalBrowsers.length > 0 && !isSourceMapAsset);
+      let { source } = assetDetails;
+
+      if (shouldCache && !(source instanceof CachedSource)) {
+        compilation.updateAsset(assetName, (currentSource) => {
+          source =
+            currentSource instanceof CachedSource
+              ? currentSource
+              : new CachedSource(currentSource);
+          return source;
+        });
+      }
 
-        for (const [assetName, asset] of assetsArray) {
-          if (errored) return;
+      if (shouldZip) {
+        zipBuilders.forEach(({ builder }) =>
+          builder.addAsset(assetName, source),
+        );
+      }
 
-          const extName = path.extname(assetName);
-          if (excludeExtensions.includes(extName)) continue;
+      if (isSourceMapAsset) {
+        compilation.renameAsset(
+          assetName,
+          path.posix.join(SOURCEMAPS_DIRECTORY, assetName),
+        );
+        continue;
+      }
 
-          addAssetToZip(
-            asset.buffer(),
-            assetName,
-            ManifestPlugin.compressibleFileTypes.has(extName),
-            compressionOptions,
-            mtime,
-            zip,
-          );
-          reportProgress(
-            0,
-            `${++filesProcessed}/${totalWork} assets zipped for ${browser}`,
-            assetName,
-          );
-        }
+      const primaryAssetPath = path.posix.join(primaryBrowser, assetName);
+      if (assetName !== primaryAssetPath) {
+        compilation.renameAsset(assetName, primaryAssetPath);
+      }
 
-        zip.end();
+      additionalBrowsers.forEach((browser) => {
+        compilation.emitAsset(
+          path.posix.join(browser, assetName),
+          source,
+          assetDetails.info,
+        );
       });
+    }
 
-      // add the zip file to webpack's assets.
-      const zipFilePath = outFilePath.replace(BROWSER_TEMPLATE_RE, browser);
-      compilation.emitAsset(zipFilePath, source, {
+    this.emitManifestAssets(compilation, browsers);
+
+    for (const { browser, builder } of zipBuilders) {
+      const data = await builder.finalize();
+      const filePath = outFilePath.replaceAll('[browser]', browser);
+      compilation.emitAsset(filePath, data, {
         javascriptModule: false,
         compressed: true,
         contentType: 'application/zip',
@@ -267,53 +257,55 @@ export class ManifestPlugin<Z extends boolean> {
     assets: Assets,
     options: ManifestPluginOptions<false>,
   ): void {
-    // we need to wait to delete assets until after we've zipped them all
-    const assetDeletions = new Set<string>();
     const moveSourceMapsToDedicatedDirectory =
       compilation.options.devtool === 'hidden-source-map';
     const { browsers } = options;
-    const assetEntries = Object.entries(assets);
+    const [primaryBrowser, ...additionalBrowsers] = browsers;
 
-    browsers.forEach((browser) => {
-      const manifest = this.manifestSources.get(browser) as sources.RawSource;
-      compilation.emitAsset(
-        path.posix.join(browser, 'manifest.json'),
-        manifest,
-        {
-          javascriptModule: false,
-          contentType: 'application/json',
-        },
-      );
-    });
+    for (const assetName of Object.keys(assets)) {
+      const assetDetails = compilation.getAsset(assetName) as Readonly<Asset>;
 
-    for (const [name, asset] of assetEntries) {
-      // move the assets to their final browser-relative locations
-      const assetDetails = compilation.getAsset(name) as Readonly<Asset>;
       const isSourceMapAsset =
-        moveSourceMapsToDedicatedDirectory && name.endsWith('.map');
+        moveSourceMapsToDedicatedDirectory && assetName.endsWith('.map');
+      let { source } = assetDetails;
+
+      if (
+        additionalBrowsers.length > 0 &&
+        !isSourceMapAsset &&
+        !(source instanceof CachedSource)
+      ) {
+        compilation.updateAsset(assetName, (currentSource) => {
+          source =
+            currentSource instanceof CachedSource
+              ? currentSource
+              : new CachedSource(currentSource);
+          return source;
+        });
+      }
 
       if (isSourceMapAsset) {
-        compilation.emitAsset(
-          path.posix.join(SOURCEMAPS_DIRECTORY, name),
-          asset,
-          assetDetails.info,
+        compilation.renameAsset(
+          assetName,
+          path.posix.join(SOURCEMAPS_DIRECTORY, assetName),
         );
-        assetDeletions.add(name);
         continue;
       }
 
-      browsers.forEach((browser) => {
+      const primaryAssetPath = path.posix.join(primaryBrowser, assetName);
+      if (assetName !== primaryAssetPath) {
+        compilation.renameAsset(assetName, primaryAssetPath);
+      }
+
+      additionalBrowsers.forEach((browser) => {
         compilation.emitAsset(
-          path.posix.join(browser, name),
-          asset,
+          path.posix.join(browser, assetName),
+          source,
           assetDetails.info,
         );
       });
-      assetDeletions.add(name);
     }
 
-    // delete the assets after we've zipped them all
-    assetDeletions.forEach((assetName) => compilation.deleteAsset(assetName));
+    this.emitManifestAssets(compilation, browsers);
   }
 
   /**
@@ -657,12 +649,7 @@ export class ManifestPlugin<Z extends boolean> {
         tapOptions,
         async (assets: Assets) => {
           this.resolveEntrypoints(compilation);
-          await this.zipAssets(compilation, assets, options);
-          this.moveAssets(
-            compilation,
-            assets,
-            this.options as ManifestPluginOptions<false>,
-          );
+          await this.zipAndMoveAssets(compilation, assets, options);
         },
       );
     } else {
diff --git a/development/webpack/utils/plugins/ManifestPlugin/zip.ts b/development/webpack/utils/plugins/ManifestPlugin/zip.ts
new file mode 100644
index 000000000000..edbb9743050f
--- /dev/null
+++ b/development/webpack/utils/plugins/ManifestPlugin/zip.ts
@@ -0,0 +1,187 @@
+import { extname } from 'node:path';
+import { ZipFile } from 'yazl';
+import { sources } from 'webpack';
+import type { ZipOptions } from './types';
+
+const { RawSource } = sources;
+
+/**
+ * File types that generally compress well with DEFLATE.
+ */
+const compressibleFileTypes = new Set([
+  '.bmp',
+  '.cjs',
+  '.css',
+  '.csv',
+  '.eot',
+  '.html',
+  '.js',
+  '.json',
+  '.log',
+  '.map',
+  '.md',
+  '.mjs',
+  '.riv',
+  '.svg',
+  '.txt',
+  '.wasm',
+  '.vtt',
+  '.wav',
+  '.xml',
+]);
+
+export type ZipCompressionOptions = Pick<ZipOptions['zipOptions'], 'level'>;
+
+type CreateBrowserZipBuilderOptions = {
+  compressionOptions: ZipCompressionOptions;
+  excludeExtensions: string[];
+  manifest: sources.RawSource;
+  mtime: number;
+  onAssetAdded: (assetName: string) => void;
+};
+
+/**
+ * Incrementally builds a browser zip asset.
+ */
+export type BrowserZipBuilder = {
+  /**
+   * Adds an emitted webpack asset to the in-progress zip.
+   */
+  addAsset: (assetName: string, asset: sources.Source) => void;
+
+  /**
+   * Finalizes the zip and resolves the emitted webpack source.
+   */
+  finalize: () => Promise<sources.Source>;
+};
+
+/**
+ * Creates a zip builder for a single browser bundle.
+ *
+ * @param options - Zip generation options.
+ * @param options.compressionOptions - ZIP compression settings.
+ * @param options.excludeExtensions - Asset extensions to skip entirely.
+ * @param options.manifest - The browser-specific manifest source.
+ * @param options.mtime - The zip entry modification time.
+ * @param options.onAssetAdded - Progress callback for each added file.
+ * @returns The zip builder.
+ */
+export function createBrowserZipBuilder({
+  compressionOptions,
+  excludeExtensions,
+  manifest,
+  mtime,
+  onAssetAdded,
+}: CreateBrowserZipBuilderOptions): BrowserZipBuilder {
+  let errored = false;
+  let finalized = false;
+  let resolveSource!: (source: sources.Source) => void;
+  let rejectSource!: (error: Error) => void;
+  const sourcePromise = new Promise<sources.Source>((resolve, reject) => {
+    resolveSource = resolve;
+    rejectSource = reject;
+  });
+
+  const zipFile = new ZipFile();
+  const zipChunks: Buffer[] = [];
+  let zipSize = 0;
+  const zipEntryDate = new Date(mtime);
+
+  const rejectOnce = (error: Error) => {
+    if (errored) {
+      return;
+    }
+
+    errored = true;
+    rejectSource(error);
+  };
+
+  zipFile.once('error', rejectOnce);
+  zipFile.outputStream.once('error', rejectOnce);
+  zipFile.outputStream.on('data', (chunk: Buffer) => {
+    if (errored) {
+      return;
+    }
+
+    zipChunks.push(chunk);
+    zipSize += chunk.length;
+  });
+  zipFile.outputStream.once('end', () => {
+    if (!errored) {
+      resolveSource(new RawSource(Buffer.concat(zipChunks, zipSize)));
+    }
+  });
+
+  addAssetToZip(
+    manifest.buffer(),
+    'manifest.json',
+    true,
+    compressionOptions,
+    zipEntryDate,
+    zipFile,
+  );
+  onAssetAdded('manifest.json');
+
+  const addAsset = (assetName: string, asset: sources.Source) => {
+    if (finalized) {
+      throw new Error('Cannot add asset after finalize()');
+    }
+
+    if (errored) {
+      return;
+    }
+
+    const extName = extname(assetName);
+    if (excludeExtensions.includes(extName)) {
+      return;
+    }
+
+    addAssetToZip(
+      asset.buffer(),
+      assetName,
+      compressibleFileTypes.has(extName),
+      compressionOptions,
+      zipEntryDate,
+      zipFile,
+    );
+    onAssetAdded(assetName);
+  };
+
+  const finalize = () => {
+    if (!finalized) {
+      finalized = true;
+      zipFile.end();
+    }
+
+    return sourcePromise;
+  };
+
+  return { addAsset, finalize };
+}
+
+/**
+ * Adds the given asset to the zip file.
+ *
+ * @param asset - The asset to add.
+ * @param assetName - The name of the asset.
+ * @param compress - Whether the asset type is compressible.
+ * @param compressionOptions - The zip compression settings.
+ * @param mtime - The modification time to apply to the zip entry.
+ * @param zipFile - The zip file to add the asset to.
+ */
+function addAssetToZip(
+  asset: Buffer,
+  assetName: string,
+  compress: boolean,
+  compressionOptions: ZipCompressionOptions,
+  mtime: Date,
+  zipFile: ZipFile,
+): void {
+  const shouldCompress = compressionOptions.level > 0 && compress;
+
+  zipFile.addBuffer(asset, assetName, {
+    compress: shouldCompress,
+    compressionLevel: shouldCompress ? compressionOptions.level : 0,
+    mtime,
+  });
+}
diff --git a/development/webpack/webpack.config.ts b/development/webpack/webpack.config.ts
index 4e434d5ea2ac..4f00e5b240f5 100644
--- a/development/webpack/webpack.config.ts
+++ b/development/webpack/webpack.config.ts
@@ -111,7 +111,7 @@ const manifestPlugin = new ManifestPlugin({
   ...(args.zip
     ? {
         zipOptions: {
-          outFilePath: `../../builds/metamask-[browser]-${version.versionName}.zip`, // relative to output.path
+          outFilePath: `../builds/metamask-[browser]-${version.versionName}.zip`, // relative to output.path
           mtime: getLatestCommit().timestamp(),
           excludeExtensions: ['.map'],
           // `level: 9` is the highest; it may increase build time by ~5% over level 1
diff --git a/docs/ab-testing.md b/docs/ab-testing.md
index c6c09231f71f..b8638a0b5932 100644
--- a/docs/ab-testing.md
+++ b/docs/ab-testing.md
@@ -17,6 +17,11 @@ Use these two mechanisms together:
 - `test/e2e/feature-flags/feature-flag-registry.ts`
 - `test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts`
 
+## Agent Note
+
+Agent workflow lives in `.agents/skills/ab-testing-implementation/SKILL.md`.
+Keep this document focused on human-readable implementation guidance, background behavior, examples, and FAQ.
+
 ---
 
 ## How Variant Assignment Works
@@ -276,20 +281,20 @@ Recommended pattern:
 
 ## FAQ
 
-**Q: What is the fallback variant?**  
+**Q: What is the fallback variant?**
 `control`.
 
-**Q: When is `isActive` false?**  
+**Q: When is `isActive` false?**
 When the hook is using the fallback because the assignment is missing, invalid,
 or unresolved.
 
-**Q: Do I manually emit `Experiment Viewed`?**  
+**Q: Do I manually emit `Experiment Viewed`?**
 No, not when using `useABTest`.
 
-**Q: Should I send both `ab_tests` and `active_ab_tests`?**  
+**Q: Should I send both `ab_tests` and `active_ab_tests`?**
 No. Use `active_ab_tests`.
 
-**Q: What if basic functionality or metrics are unavailable?**  
+**Q: What if basic functionality or metrics are unavailable?**
 If the extension does not have a usable experiment assignment, `useABTest`
 falls back to `control` and does not emit an exposure event.
 
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 2c2399ea975a..fe6104ec0d6c 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -795,7 +795,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -807,7 +807,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -839,20 +839,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -866,9 +857,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -906,9 +897,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,64 +974,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/bridge-status-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/transaction-pay-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1049,10 +982,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1103,6 +1037,11 @@
         "@metamask/base-controller": true
       }
     },
+    "@metamask/network-controller>@metamask/connectivity-controller": {
+      "packages": {
+        "@metamask/base-controller": true
+      }
+    },
     "@metamask/controller-utils": {
       "globals": {
         "URL": true,
@@ -1243,7 +1182,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1318,7 +1257,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "browserify>buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1364,15 +1303,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1484,7 +1444,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1538,11 +1498,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1554,7 +1530,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1569,29 +1545,30 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+    "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
         "@metamask/superstruct": true,
-        "@metamask/keyring-snap-client>uuid": true
+        "@metamask/utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1648,6 +1625,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1657,9 +1635,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1702,7 +1680,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1713,7 +1691,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1724,7 +1702,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1939,7 +1917,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2007,6 +1985,13 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true,
+        "@tanstack/react-query": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2049,7 +2034,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2125,7 +2110,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2139,7 +2124,7 @@
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2184,7 +2169,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2234,216 +2219,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controllers>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/gator-permissions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-account-service>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-transactions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2502,7 +2277,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2535,7 +2310,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eip-5792-middleware>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2568,7 +2343,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/shield-controller>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2601,7 +2376,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/subscription-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2622,8 +2397,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2736,7 +2512,7 @@
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
@@ -3589,7 +3365,7 @@
         "browserify>assert>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3598,7 +3374,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -4615,6 +4391,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4973,7 +4757,10 @@
         "fetch": false,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -5612,6 +5399,28 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "CheckmarkIcon": true,
+        "ErrorIcon": true,
+        "LoaderIcon": true,
+        "MutationObserver": true,
+        "ToastBar": true,
+        "ToastIcon": true,
+        "Toaster": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "resolveValue": true,
+        "setTimeout": true,
+        "toast": true,
+        "useToaster": true,
+        "useToasterStore": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -6485,6 +6294,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6574,6 +6388,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/browserify/experimental/policy.json b/lavamoat/browserify/experimental/policy.json
index 2c2399ea975a..fe6104ec0d6c 100644
--- a/lavamoat/browserify/experimental/policy.json
+++ b/lavamoat/browserify/experimental/policy.json
@@ -795,7 +795,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -807,7 +807,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -839,20 +839,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -866,9 +857,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -906,9 +897,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,64 +974,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/bridge-status-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/transaction-pay-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1049,10 +982,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1103,6 +1037,11 @@
         "@metamask/base-controller": true
       }
     },
+    "@metamask/network-controller>@metamask/connectivity-controller": {
+      "packages": {
+        "@metamask/base-controller": true
+      }
+    },
     "@metamask/controller-utils": {
       "globals": {
         "URL": true,
@@ -1243,7 +1182,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1318,7 +1257,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "browserify>buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1364,15 +1303,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1484,7 +1444,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1538,11 +1498,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1554,7 +1530,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1569,29 +1545,30 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+    "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
         "@metamask/superstruct": true,
-        "@metamask/keyring-snap-client>uuid": true
+        "@metamask/utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1648,6 +1625,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1657,9 +1635,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1702,7 +1680,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1713,7 +1691,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1724,7 +1702,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1939,7 +1917,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2007,6 +1985,13 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true,
+        "@tanstack/react-query": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2049,7 +2034,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2125,7 +2110,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2139,7 +2124,7 @@
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2184,7 +2169,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2234,216 +2219,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controllers>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/gator-permissions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-account-service>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-transactions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2502,7 +2277,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2535,7 +2310,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eip-5792-middleware>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2568,7 +2343,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/shield-controller>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2601,7 +2376,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/subscription-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2622,8 +2397,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2736,7 +2512,7 @@
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
@@ -3589,7 +3365,7 @@
         "browserify>assert>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3598,7 +3374,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -4615,6 +4391,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4973,7 +4757,10 @@
         "fetch": false,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -5612,6 +5399,28 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "CheckmarkIcon": true,
+        "ErrorIcon": true,
+        "LoaderIcon": true,
+        "MutationObserver": true,
+        "ToastBar": true,
+        "ToastIcon": true,
+        "Toaster": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "resolveValue": true,
+        "setTimeout": true,
+        "toast": true,
+        "useToaster": true,
+        "useToasterStore": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -6485,6 +6294,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6574,6 +6388,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 2c2399ea975a..fe6104ec0d6c 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -795,7 +795,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -807,7 +807,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -839,20 +839,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -866,9 +857,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -906,9 +897,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,64 +974,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/bridge-status-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/transaction-pay-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1049,10 +982,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1103,6 +1037,11 @@
         "@metamask/base-controller": true
       }
     },
+    "@metamask/network-controller>@metamask/connectivity-controller": {
+      "packages": {
+        "@metamask/base-controller": true
+      }
+    },
     "@metamask/controller-utils": {
       "globals": {
         "URL": true,
@@ -1243,7 +1182,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1318,7 +1257,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "browserify>buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1364,15 +1303,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1484,7 +1444,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1538,11 +1498,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1554,7 +1530,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1569,29 +1545,30 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+    "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
         "@metamask/superstruct": true,
-        "@metamask/keyring-snap-client>uuid": true
+        "@metamask/utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1648,6 +1625,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1657,9 +1635,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1702,7 +1680,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1713,7 +1691,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1724,7 +1702,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1939,7 +1917,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2007,6 +1985,13 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true,
+        "@tanstack/react-query": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2049,7 +2034,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2125,7 +2110,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2139,7 +2124,7 @@
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2184,7 +2169,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2234,216 +2219,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controllers>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/gator-permissions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-account-service>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-transactions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2502,7 +2277,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2535,7 +2310,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eip-5792-middleware>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2568,7 +2343,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/shield-controller>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2601,7 +2376,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/subscription-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2622,8 +2397,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2736,7 +2512,7 @@
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
@@ -3589,7 +3365,7 @@
         "browserify>assert>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3598,7 +3374,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -4615,6 +4391,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4973,7 +4757,10 @@
         "fetch": false,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -5612,6 +5399,28 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "CheckmarkIcon": true,
+        "ErrorIcon": true,
+        "LoaderIcon": true,
+        "MutationObserver": true,
+        "ToastBar": true,
+        "ToastIcon": true,
+        "Toaster": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "resolveValue": true,
+        "setTimeout": true,
+        "toast": true,
+        "useToaster": true,
+        "useToasterStore": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -6485,6 +6294,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6574,6 +6388,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 2c2399ea975a..fe6104ec0d6c 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -795,7 +795,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -807,7 +807,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -839,20 +839,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -866,9 +857,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -906,9 +897,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,64 +974,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/bridge-status-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "globals": {
-        "AbortController": true,
-        "TextDecoder": true,
-        "URLSearchParams": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@metamask/transaction-pay-controller>bignumber.js": true,
-        "browserify>buffer": true,
-        "lodash": true,
-        "reselect": true,
-        "uuid": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1049,10 +982,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1103,6 +1037,11 @@
         "@metamask/base-controller": true
       }
     },
+    "@metamask/network-controller>@metamask/connectivity-controller": {
+      "packages": {
+        "@metamask/base-controller": true
+      }
+    },
     "@metamask/controller-utils": {
       "globals": {
         "URL": true,
@@ -1243,7 +1182,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1318,7 +1257,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "browserify>buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1364,15 +1303,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1484,7 +1444,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1538,11 +1498,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1554,7 +1530,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1569,29 +1545,30 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+    "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
         "@metamask/superstruct": true,
-        "@metamask/keyring-snap-client>uuid": true
+        "@metamask/utils": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1648,6 +1625,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1657,9 +1635,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1702,7 +1680,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1713,7 +1691,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1724,7 +1702,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1939,7 +1917,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2007,6 +1985,13 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true,
+        "@tanstack/react-query": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2049,7 +2034,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2125,7 +2110,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2139,7 +2124,7 @@
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2184,7 +2169,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2234,216 +2219,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/assets-controllers>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/gator-permissions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-account-service>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
-    "@metamask/multichain-transactions-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true,
-        "navigator": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "chalk": true,
-        "cron-parser": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "luxon": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "semver": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2502,7 +2277,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2535,7 +2310,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eip-5792-middleware>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2568,7 +2343,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/shield-controller>@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2601,7 +2376,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/subscription-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "browserify>buffer": true,
@@ -2622,8 +2397,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2736,7 +2512,7 @@
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
@@ -3589,7 +3365,7 @@
         "browserify>assert>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3598,7 +3374,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -4615,6 +4391,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4973,7 +4757,10 @@
         "fetch": false,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -5612,6 +5399,28 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "CheckmarkIcon": true,
+        "ErrorIcon": true,
+        "LoaderIcon": true,
+        "MutationObserver": true,
+        "ToastBar": true,
+        "ToastIcon": true,
+        "Toaster": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "resolveValue": true,
+        "setTimeout": true,
+        "toast": true,
+        "useToaster": true,
+        "useToasterStore": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -6485,6 +6294,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6574,6 +6388,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/build-system/policy-override.json b/lavamoat/build-system/policy-override.json
index cc27b28e8654..bb5ad0606ed6 100644
--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@@ -5,7 +5,10 @@
         "$root$": true,
         "@babel/preset-env": true,
         "@babel/preset-react": true,
+        "@babel/plugin-transform-class-properties": true,
         "@babel/plugin-transform-logical-assignment-operators": true,
+        "@babel/plugin-transform-private-property-in-object": true,
+        "@babel/plugin-transform-private-methods": true,
         "@babel/plugin-transform-runtime": true,
         "@babel/plugin-proposal-class-properties": true,
         "@babel/plugin-proposal-nullish-coalescing-operator": true,
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index c54a98179f0f..f94caf9656c9 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -54,7 +54,10 @@
         "@babel/plugin-proposal-nullish-coalescing-operator": true,
         "@babel/plugin-proposal-object-rest-spread": true,
         "@babel/plugin-proposal-optional-chaining": true,
+        "@babel/plugin-transform-class-properties": true,
         "@babel/plugin-transform-logical-assignment-operators": true,
+        "@babel/plugin-transform-private-methods": true,
+        "@babel/plugin-transform-private-property-in-object": true,
         "@babel/plugin-transform-runtime": true,
         "@babel/preset-env": true,
         "@babel/preset-react": true,
@@ -112,7 +115,7 @@
         "@babel/core>@babel/generator>jsesc": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
+    "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -137,25 +140,25 @@
         "@babel/core>@babel/helper-compilation-targets>semver": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
       "globals": {
         "console.warn": true
       },
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
         "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
         "depcheck>@babel/traverse": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core": true,
         "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>semver": true
       }
@@ -178,7 +181,7 @@
         "depcheck>resolve": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -205,7 +208,7 @@
         "depcheck>@babel/traverse": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -213,7 +216,7 @@
     "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator>@babel/helper-wrap-function": true,
         "depcheck>@babel/traverse": true
       }
@@ -221,8 +224,8 @@
     "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": true,
         "depcheck>@babel/traverse": true
       }
     },
@@ -340,22 +343,22 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-class-properties": {
+    "@babel/plugin-transform-class-properties": {
       "packages": {
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-class-static-block": {
       "packages": {
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-classes": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
         "@babel/core>@babel/helper-compilation-targets": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
@@ -543,16 +546,16 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods": {
+    "@babel/plugin-transform-private-methods": {
       "packages": {
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-property-in-object": {
+    "@babel/plugin-transform-private-property-in-object": {
       "packages": {
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
@@ -581,7 +584,7 @@
     "@babel/preset-react>@babel/plugin-transform-react-jsx": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
         "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "react-compiler-webpack>@babel/plugin-syntax-jsx": true
@@ -590,7 +593,7 @@
     "@babel/preset-react>@babel/plugin-transform-react-pure-annotations": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
@@ -646,8 +649,8 @@
       },
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
         "react-compiler-webpack>@babel/plugin-syntax-typescript": true
@@ -702,7 +705,7 @@
         "@babel/preset-env>@babel/plugin-transform-async-to-generator": true,
         "@babel/preset-env>@babel/plugin-transform-block-scoped-functions": true,
         "@babel/preset-env>@babel/plugin-transform-block-scoping": true,
-        "@babel/preset-env>@babel/plugin-transform-class-properties": true,
+        "@babel/plugin-transform-class-properties": true,
         "@babel/preset-env>@babel/plugin-transform-class-static-block": true,
         "@babel/preset-env>@babel/plugin-transform-classes": true,
         "@babel/preset-env>@babel/plugin-transform-computed-properties": true,
@@ -732,8 +735,8 @@
         "@babel/preset-env>@babel/plugin-transform-optional-catch-binding": true,
         "@babel/preset-env>@babel/plugin-transform-optional-chaining": true,
         "@babel/preset-env>@babel/plugin-transform-parameters": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods": true,
-        "@babel/preset-env>@babel/plugin-transform-private-property-in-object": true,
+        "@babel/plugin-transform-private-methods": true,
+        "@babel/plugin-transform-private-property-in-object": true,
         "@babel/preset-env>@babel/plugin-transform-property-literals": true,
         "@babel/preset-env>@babel/plugin-transform-regenerator": true,
         "@babel/preset-env>@babel/plugin-transform-reserved-words": true,
@@ -6603,7 +6606,7 @@
         "process": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
       "globals": {
         "console": true,
         "process": true
diff --git a/lavamoat/webpack/build/policy.json b/lavamoat/webpack/build/policy.json
index 04e551f29bf5..6940942db164 100644
--- a/lavamoat/webpack/build/policy.json
+++ b/lavamoat/webpack/build/policy.json
@@ -69,7 +69,7 @@
         "@babel/core>@babel/generator>jsesc": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
+    "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -89,22 +89,22 @@
         "@babel/core>@babel/helper-compilation-targets>semver": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
       "globals": {
         "console.warn": true
       },
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
         "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
         "depcheck>@babel/traverse": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -131,7 +131,7 @@
         "depcheck>@babel/traverse": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": {
       "packages": {
         "@babel/core>@babel/types": true
       }
@@ -139,8 +139,8 @@
     "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-member-expression-to-functions": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>@babel/helper-optimise-call-expression": true,
         "depcheck>@babel/traverse": true
       }
     },
@@ -187,8 +187,8 @@
       },
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/plugin-transform-private-property-in-object>@babel/helper-annotate-as-pure": true,
+        "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
         "react-compiler-webpack>@babel/plugin-syntax-typescript": true
@@ -451,6 +451,101 @@
         "eslint>@nodelib/fs.walk>fastq": true
       }
     },
+    "mockttp>@peculiar/x509>@peculiar/asn1-cms": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms>@peculiar/asn1-x509-attr": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-csr": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-csr>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-ecc": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-ecc>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>@peculiar/asn1-pfx": {
+      "packages": {
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms": true,
+        "mockttp>@peculiar/asn1-pkcs8": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-rsa": true,
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>@peculiar/asn1-pfx>tslib": true
+      }
+    },
+    "mockttp>@peculiar/asn1-pkcs8": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/asn1-pkcs8>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9": {
+      "packages": {
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>@peculiar/asn1-pfx": true,
+        "mockttp>@peculiar/asn1-pkcs8": true,
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms>@peculiar/asn1-x509-attr": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-rsa": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-rsa>tslib": true
+      }
+    },
+    "mockttp>@peculiar/asn1-schema": {
+      "packages": {
+        "mockttp>@peculiar/asn1-x509>asn1js": true,
+        "mockttp>@peculiar/x509>pvtsutils": true,
+        "mockttp>@peculiar/asn1-schema>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-cms>@peculiar/asn1-x509-attr": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms>@peculiar/asn1-x509-attr>tslib": true
+      }
+    },
+    "mockttp>@peculiar/asn1-x509": {
+      "packages": {
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/x509>pvtsutils": true,
+        "mockttp>@peculiar/asn1-x509>tslib": true
+      }
+    },
+    "mockttp>@peculiar/x509": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "mockttp>@peculiar/x509>@peculiar/asn1-cms": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-csr": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-ecc": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9": true,
+        "mockttp>@peculiar/x509>@peculiar/asn1-rsa": true,
+        "mockttp>@peculiar/asn1-schema": true,
+        "mockttp>@peculiar/asn1-x509": true,
+        "mockttp>@peculiar/x509>pvtsutils": true,
+        "mockttp>@peculiar/x509>reflect-metadata": true,
+        "mockttp>@peculiar/x509>tslib": true,
+        "mockttp>@peculiar/x509>tsyringe": true
+      }
+    },
     "@pmmmwh/react-refresh-webpack-plugin": {
       "builtin": {
         "node:path.dirname": true,
@@ -665,6 +760,12 @@
         "micromatch>picomatch": true
       }
     },
+    "mockttp>@peculiar/asn1-x509>asn1js": {
+      "packages": {
+        "mockttp>@peculiar/x509>pvtsutils": true,
+        "mockttp>@peculiar/asn1-x509>asn1js>pvutils": true
+      }
+    },
     "autoprefixer": {
       "globals": {
         "console": true,
@@ -743,7 +844,7 @@
         "mockttp>body-parser>debug": true,
         "koa>cookies>depd": true,
         "koa>destroy": true,
-        "mockttp>body-parser>http-errors": true,
+        "koa>http-errors": true,
         "mockttp>body-parser>iconv-lite": true,
         "koa>on-finished": true,
         "mockttp>express>qs": true,
@@ -822,6 +923,13 @@
         "Buffer": true
       }
     },
+    "yazl>buffer-crc32": {
+      "globals": {
+        "Buffer.alloc": true,
+        "Buffer.from": true,
+        "Buffer.isBuffer": true
+      }
+    },
     "terser>source-map-support>buffer-from": {
       "globals": {
         "Buffer": true
@@ -994,16 +1102,15 @@
     },
     "webpack-dev-server>compression": {
       "builtin": {
-        "zlib.createDeflate": true,
-        "zlib.createGzip": true
+        "zlib": true
       },
       "packages": {
-        "koa>accepts": true,
-        "webpack-dev-server>compression>bytes": true,
+        "mockttp>body-parser>bytes": true,
         "webpack-dev-server>compression>compressible": true,
         "webpack-dev-server>compression>debug": true,
+        "webpack-dev-server>compression>negotiator": true,
         "webpack-dev-server>compression>on-headers": true,
-        "webpack-dev-server>compression>safe-buffer": true,
+        "koa>content-disposition>safe-buffer": true,
         "koa>vary": true
       }
     },
@@ -1446,7 +1553,7 @@
         "mockttp>express>etag": true,
         "mockttp>express>finalhandler": true,
         "koa>fresh": true,
-        "mockttp>express>http-errors": true,
+        "koa>http-errors": true,
         "mockttp>express>merge-descriptors": true,
         "mockttp>express>methods": true,
         "koa>on-finished": true,
@@ -1459,7 +1566,7 @@
         "mockttp>express>send": true,
         "mockttp>express>serve-static": true,
         "koa>http-errors>setprototypeof": true,
-        "mockttp>express>statuses": true,
+        "koa>statuses": true,
         "mockttp>express>type-is": true,
         "mockttp>connect>utils-merge": true,
         "koa>vary": true
@@ -1534,20 +1641,6 @@
         "copy-webpack-plugin>tinyglobby>picomatch": true
       }
     },
-    "fflate": {
-      "builtin": {
-        "worker_threads.Worker": true
-      },
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
-      }
-    },
     "chokidar>braces>fill-range": {
       "builtin": {
         "util.inspect": true
@@ -1569,7 +1662,7 @@
         "koa>escape-html": true,
         "koa>on-finished": true,
         "koa>parseurl": true,
-        "mockttp>express>statuses": true,
+        "koa>statuses": true,
         "mockttp>body-parser>unpipe": true
       }
     },
@@ -1740,21 +1833,12 @@
         "terser": true
       }
     },
-    "mockttp>body-parser>http-errors": {
+    "koa>http-errors": {
       "packages": {
         "koa>cookies>depd": true,
         "pumpify>inherits": true,
         "koa>http-errors>setprototypeof": true,
-        "mockttp>body-parser>http-errors>statuses": true,
-        "koa>http-errors>toidentifier": true
-      }
-    },
-    "mockttp>express>http-errors": {
-      "packages": {
-        "koa>cookies>depd": true,
-        "pumpify>inherits": true,
-        "koa>http-errors>setprototypeof": true,
-        "mockttp>express>statuses": true,
+        "koa>statuses": true,
         "koa>http-errors>toidentifier": true
       }
     },
@@ -2186,31 +2270,6 @@
         "setTimeout": true
       }
     },
-    "mockttp>node-forge": {
-      "builtin": {
-        "crypto": true
-      },
-      "globals": {
-        "Blob": true,
-        "Buffer": true,
-        "MutationObserver": true,
-        "QuotaExceededError": true,
-        "URL": true,
-        "Worker": true,
-        "addEventListener": true,
-        "console": "write",
-        "document": true,
-        "jQuery": true,
-        "localStorage": true,
-        "location": true,
-        "navigator": true,
-        "postMessage": true,
-        "process": true,
-        "removeEventListener": true,
-        "setImmediate": true,
-        "setTimeout": true
-      }
-    },
     "lavamoat>node-gyp-build": {
       "builtin": {
         "fs.existsSync": true,
@@ -2257,6 +2316,11 @@
         "koa>on-finished>ee-first": true
       }
     },
+    "webpack-dev-server>compression>on-headers": {
+      "builtin": {
+        "http.ServerResponse.prototype.appendHeader": true
+      }
+    },
     "eslint>@eslint/eslintrc>import-fresh>parent-module": {
       "packages": {
         "@metamask/test-bundler>ow>callsites": true
@@ -2426,6 +2490,13 @@
         "react-devtools>internal-ip>ipaddr.js": true
       }
     },
+    "mockttp>@peculiar/x509>pvtsutils": {
+      "globals": {
+        "Buffer.from": true,
+        "atob": true,
+        "btoa": true
+      }
+    },
     "mockttp>express>qs": {
       "packages": {
         "string.prototype.matchall>side-channel": true
@@ -2441,7 +2512,7 @@
       },
       "packages": {
         "mockttp>body-parser>bytes": true,
-        "mockttp>body-parser>http-errors": true,
+        "koa>http-errors": true,
         "mockttp>body-parser>iconv-lite": true,
         "mockttp>body-parser>unpipe": true
       }
@@ -2470,6 +2541,12 @@
         "micromatch>picomatch": true
       }
     },
+    "mockttp>@peculiar/x509>reflect-metadata": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      }
+    },
     "html-bundler-webpack-plugin>html-minifier-terser>relateurl": {
       "builtin": {
         "url.parse": true
@@ -2578,11 +2655,6 @@
         "setTimeout": true
       }
     },
-    "webpack-dev-server>compression>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
     "koa>content-disposition>safe-buffer": {
       "builtin": {
         "buffer": true
@@ -2656,8 +2728,16 @@
       }
     },
     "webpack-dev-server>selfsigned": {
+      "builtin": {
+        "crypto.createPrivateKey": true,
+        "crypto.webcrypto": true
+      },
+      "globals": {
+        "Buffer.from": true,
+        "console.warn": true
+      },
       "packages": {
-        "mockttp>node-forge": true
+        "mockttp>@peculiar/x509": true
       }
     },
     "semver": {
@@ -2678,7 +2758,7 @@
         "process": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
+    "@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
       "globals": {
         "console": true,
         "process": true
@@ -2703,16 +2783,16 @@
         "mockttp>express>debug": true,
         "koa>cookies>depd": true,
         "koa>destroy": true,
-        "mockttp>express>send>encodeurl": true,
+        "koa>encodeurl": true,
         "koa>escape-html": true,
         "mockttp>express>etag": true,
         "koa>fresh": true,
-        "mockttp>express>http-errors": true,
+        "koa>http-errors": true,
         "http-server>mime": true,
         "mocha>ms": true,
         "koa>on-finished": true,
         "mockttp>express>range-parser": true,
-        "mockttp>express>statuses": true
+        "koa>statuses": true
       }
     },
     "copy-webpack-plugin>serialize-javascript": {
@@ -3055,11 +3135,109 @@
         "Buffer": true
       }
     },
+    "mockttp>@peculiar/x509>@peculiar/asn1-cms>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-csr>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-ecc>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>@peculiar/asn1-pfx>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/asn1-pkcs8>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-pkcs9>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-rsa>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/asn1-schema>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>@peculiar/asn1-cms>@peculiar/asn1-x509-attr>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/asn1-x509>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>tslib": {
+      "globals": {
+        "AsyncIterator": true,
+        "Iterator": true,
+        "SuppressedError": true,
+        "define": true
+      }
+    },
     "webpack>chrome-trace-event>tslib": {
       "globals": {
         "define": true
       }
     },
+    "mockttp>@peculiar/x509>tsyringe>tslib": {
+      "globals": {
+        "define": true
+      }
+    },
+    "mockttp>@peculiar/x509>tsyringe": {
+      "packages": {
+        "mockttp>@peculiar/x509>tsyringe>tslib": true
+      }
+    },
     "mockttp>body-parser>type-is": {
       "packages": {
         "mockttp>body-parser>type-is>media-typer": true,
@@ -3334,17 +3512,17 @@
     },
     "webpack-dev-server": {
       "builtin": {
-        "net.Socket": true,
-        "net.createServer": true,
-        "os.hostname": true,
-        "os.networkInterfaces": true,
-        "os.tmpdir": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true,
-        "url.format": true,
-        "url.parse": true,
-        "util.deprecate": true
+        "node:net.Socket": true,
+        "node:net.createServer": true,
+        "node:os.hostname": true,
+        "node:os.networkInterfaces": true,
+        "node:os.tmpdir": true,
+        "node:path.dirname": true,
+        "node:path.join": true,
+        "node:path.resolve": true,
+        "node:url.format": true,
+        "node:url.parse": true,
+        "node:util.deprecate": true
       },
       "globals": {
         "Buffer.isBuffer": true,
@@ -3514,6 +3692,27 @@
       "globals": {
         "process": true
       }
+    },
+    "yazl": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "events.errorMonitor": true,
+        "fs.createReadStream": true,
+        "fs.stat": true,
+        "stream.PassThrough": true,
+        "stream.Transform": true,
+        "util.inherits": true,
+        "zlib.DeflateRaw": true,
+        "zlib.deflateRaw": true
+      },
+      "globals": {
+        "Buffer": true,
+        "setImmediate": true,
+        "utf8FileName.length": true
+      },
+      "packages": {
+        "yazl>buffer-crc32": true
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/lavamoat/webpack/mv2/beta/policy.json b/lavamoat/webpack/mv2/beta/policy.json
index 6e637a41cd96..8495dbe28a17 100644
--- a/lavamoat/webpack/mv2/beta/policy.json
+++ b/lavamoat/webpack/mv2/beta/policy.json
@@ -584,6 +584,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -601,9 +609,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -650,7 +655,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -667,9 +671,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -793,7 +794,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -805,7 +806,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -837,20 +838,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -864,9 +856,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -904,9 +896,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,32 +975,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "Buffer.from": true,
-        "URLSearchParams": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "buffer": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "packages": {
-        "@metamask/controller-utils": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1017,10 +983,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1228,7 +1195,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1307,7 +1274,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1362,15 +1329,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1487,7 +1475,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1524,7 +1512,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1544,11 +1532,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1560,7 +1564,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1575,15 +1579,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
-      }
-    },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1591,13 +1587,21 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
       }
     },
     "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/superstruct": true
+      }
+    },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1657,6 +1661,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1666,9 +1671,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1711,7 +1716,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1722,7 +1727,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1738,7 +1743,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1933,7 +1938,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -1986,6 +1991,12 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2028,7 +2039,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2115,7 +2126,7 @@
         ]
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2128,9 +2139,8 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2170,7 +2180,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2181,7 +2191,6 @@
         "@metamask/rpc-errors": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "luxon": true
       }
     },
@@ -2209,7 +2218,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -2221,16 +2229,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "packages": {
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2291,7 +2289,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -2312,8 +2310,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2429,23 +2428,18 @@
       "packages": {
         "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>@noble/hashes": true,
-        "@swc/helpers": true,
-        "@metamask/perps-controller>@nktkas/hyperliquid>micro-eth-signer": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>valibot": true
       }
     },
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@noble/ciphers": {
@@ -2517,9 +2511,6 @@
       "globals": {
         "TextEncoder": true,
         "crypto": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -2965,9 +2956,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -3012,13 +3000,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -3127,7 +3112,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -3163,7 +3147,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -3174,7 +3157,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -3225,7 +3207,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -3249,7 +3230,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -3263,7 +3243,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -3373,7 +3352,7 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3382,7 +3361,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3749,8 +3728,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "@ensdomains/content-hash>cids": {
@@ -4444,6 +4422,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4471,7 +4457,6 @@
       "packages": {
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
         "@metamask/eth-sig-util": true,
-        "@swc/helpers": true,
         "viem>abitype": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "bitcoin-address-validation>bech32": true,
@@ -4824,7 +4809,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -4925,9 +4913,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -5433,6 +5418,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -5892,9 +5889,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -6388,6 +6382,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6453,6 +6452,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv2/experimental/policy.json b/lavamoat/webpack/mv2/experimental/policy.json
index 6e637a41cd96..8495dbe28a17 100644
--- a/lavamoat/webpack/mv2/experimental/policy.json
+++ b/lavamoat/webpack/mv2/experimental/policy.json
@@ -584,6 +584,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -601,9 +609,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -650,7 +655,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -667,9 +671,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -793,7 +794,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -805,7 +806,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -837,20 +838,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -864,9 +856,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -904,9 +896,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,32 +975,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "Buffer.from": true,
-        "URLSearchParams": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "buffer": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "packages": {
-        "@metamask/controller-utils": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1017,10 +983,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1228,7 +1195,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1307,7 +1274,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1362,15 +1329,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1487,7 +1475,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1524,7 +1512,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1544,11 +1532,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1560,7 +1564,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1575,15 +1579,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
-      }
-    },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1591,13 +1587,21 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
       }
     },
     "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/superstruct": true
+      }
+    },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1657,6 +1661,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1666,9 +1671,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1711,7 +1716,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1722,7 +1727,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1738,7 +1743,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1933,7 +1938,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -1986,6 +1991,12 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2028,7 +2039,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2115,7 +2126,7 @@
         ]
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2128,9 +2139,8 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2170,7 +2180,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2181,7 +2191,6 @@
         "@metamask/rpc-errors": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "luxon": true
       }
     },
@@ -2209,7 +2218,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -2221,16 +2229,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "packages": {
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2291,7 +2289,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -2312,8 +2310,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2429,23 +2428,18 @@
       "packages": {
         "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>@noble/hashes": true,
-        "@swc/helpers": true,
-        "@metamask/perps-controller>@nktkas/hyperliquid>micro-eth-signer": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>valibot": true
       }
     },
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@noble/ciphers": {
@@ -2517,9 +2511,6 @@
       "globals": {
         "TextEncoder": true,
         "crypto": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -2965,9 +2956,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -3012,13 +3000,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -3127,7 +3112,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -3163,7 +3147,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -3174,7 +3157,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -3225,7 +3207,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -3249,7 +3230,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -3263,7 +3243,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -3373,7 +3352,7 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3382,7 +3361,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3749,8 +3728,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "@ensdomains/content-hash>cids": {
@@ -4444,6 +4422,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4471,7 +4457,6 @@
       "packages": {
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
         "@metamask/eth-sig-util": true,
-        "@swc/helpers": true,
         "viem>abitype": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "bitcoin-address-validation>bech32": true,
@@ -4824,7 +4809,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -4925,9 +4913,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -5433,6 +5418,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -5892,9 +5889,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -6388,6 +6382,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6453,6 +6452,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv2/flask/policy.json b/lavamoat/webpack/mv2/flask/policy.json
index 6e637a41cd96..8495dbe28a17 100644
--- a/lavamoat/webpack/mv2/flask/policy.json
+++ b/lavamoat/webpack/mv2/flask/policy.json
@@ -584,6 +584,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -601,9 +609,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -650,7 +655,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -667,9 +671,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -793,7 +794,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -805,7 +806,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -837,20 +838,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -864,9 +856,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -904,9 +896,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,32 +975,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "Buffer.from": true,
-        "URLSearchParams": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "buffer": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "packages": {
-        "@metamask/controller-utils": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1017,10 +983,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1228,7 +1195,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1307,7 +1274,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1362,15 +1329,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1487,7 +1475,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1524,7 +1512,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1544,11 +1532,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1560,7 +1564,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1575,15 +1579,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
-      }
-    },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1591,13 +1587,21 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
       }
     },
     "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/superstruct": true
+      }
+    },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1657,6 +1661,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1666,9 +1671,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1711,7 +1716,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1722,7 +1727,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1738,7 +1743,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1933,7 +1938,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -1986,6 +1991,12 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2028,7 +2039,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2115,7 +2126,7 @@
         ]
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2128,9 +2139,8 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2170,7 +2180,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2181,7 +2191,6 @@
         "@metamask/rpc-errors": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "luxon": true
       }
     },
@@ -2209,7 +2218,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -2221,16 +2229,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "packages": {
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2291,7 +2289,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -2312,8 +2310,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2429,23 +2428,18 @@
       "packages": {
         "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>@noble/hashes": true,
-        "@swc/helpers": true,
-        "@metamask/perps-controller>@nktkas/hyperliquid>micro-eth-signer": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>valibot": true
       }
     },
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@noble/ciphers": {
@@ -2517,9 +2511,6 @@
       "globals": {
         "TextEncoder": true,
         "crypto": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -2965,9 +2956,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -3012,13 +3000,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -3127,7 +3112,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -3163,7 +3147,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -3174,7 +3157,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -3225,7 +3207,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -3249,7 +3230,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -3263,7 +3243,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -3373,7 +3352,7 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3382,7 +3361,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3749,8 +3728,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "@ensdomains/content-hash>cids": {
@@ -4444,6 +4422,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4471,7 +4457,6 @@
       "packages": {
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
         "@metamask/eth-sig-util": true,
-        "@swc/helpers": true,
         "viem>abitype": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "bitcoin-address-validation>bech32": true,
@@ -4824,7 +4809,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -4925,9 +4913,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -5433,6 +5418,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -5892,9 +5889,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -6388,6 +6382,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6453,6 +6452,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv2/main/policy.json b/lavamoat/webpack/mv2/main/policy.json
index 6e637a41cd96..8495dbe28a17 100644
--- a/lavamoat/webpack/mv2/main/policy.json
+++ b/lavamoat/webpack/mv2/main/policy.json
@@ -584,6 +584,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -601,9 +609,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -650,7 +655,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -667,9 +671,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -793,7 +794,7 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/account-tree-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true
@@ -805,7 +806,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-utils": true,
@@ -837,20 +838,11 @@
         "nanoid": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/approval-controller": {
-      "globals": {
-        "console.info": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
     "@metamask/assets-controller": {
       "globals": {
         "clearInterval": true,
         "console.error": true,
+        "performance.now": true,
         "setInterval": true
       },
       "packages": {
@@ -864,9 +856,9 @@
         "@metamask/core-backend": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/polling-controller": true,
-        "@metamask/assets-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/assets-controller>bignumber.js": true,
         "lodash": true,
         "@metamask/assets-controller>p-limit": true
@@ -904,9 +896,9 @@
         "@metamask/assets-controllers>@metamask/phishing-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/assets-controllers>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "ethereumjs-util>bn.js": true,
         "immer": true,
         "lodash": true,
@@ -983,32 +975,6 @@
         "uuid": true
       }
     },
-    "@metamask/bridge-status-controller>@metamask/bridge-controller": {
-      "globals": {
-        "Buffer.from": true,
-        "URLSearchParams": true,
-        "console.warn": true
-      },
-      "packages": {
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "@ethersproject/contracts": true,
-        "@metamask/controller-utils": true,
-        "@metamask/keyring-api": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/multichain-network-controller": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "buffer": true
-      }
-    },
-    "@metamask/transaction-pay-controller>@metamask/bridge-controller": {
-      "packages": {
-        "@metamask/controller-utils": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/bridge-status-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -1017,10 +983,11 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/bridge-status-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/keyring-controller": true,
         "@metamask/polling-controller": true,
+        "@metamask/snaps-controllers": true,
         "@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -1228,7 +1195,7 @@
         "@metamask/controller-utils>@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "pify": true
       }
     },
@@ -1307,7 +1274,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1362,15 +1329,36 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/eth-snap-keyring>uuid": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "console.info": true,
+        "console.warn": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-internal-snap-client": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "mockttp>async-mutex": true,
+        "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true
+      }
+    },
     "@metamask/eth-token-tracker": {
       "globals": {
         "console.warn": true
@@ -1487,7 +1475,7 @@
         "@metamask/base-controller": true,
         "@metamask/delegation-core": true,
         "@metamask/gator-permissions-controller>@metamask/delegation-deployments": true,
-        "@metamask/gator-permissions-controller>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true
       }
@@ -1524,7 +1512,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1544,11 +1532,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1560,7 +1564,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1575,15 +1579,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-internal-api": true,
-        "@metamask/keyring-snap-client": true,
-        "@metamask/keyring-utils": true
-      }
-    },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1591,13 +1587,21 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
       }
     },
     "@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-utils": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/superstruct": true
+      }
+    },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-snap-sdk": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
@@ -1657,6 +1661,7 @@
         "clearTimeout": true,
         "console.error": true,
         "console.warn": true,
+        "performance.now": true,
         "setTimeout": true
       },
       "packages": {
@@ -1666,9 +1671,9 @@
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-account-service>@metamask/snaps-utils": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "lodash": true
       }
     },
@@ -1711,7 +1716,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-snap-client": true,
-        "@metamask/multichain-transactions-controller>@metamask/snaps-utils": true
+        "@metamask/snaps-utils": true
       }
     },
     "@metamask/name-controller": {
@@ -1722,7 +1727,7 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/network-controller": {
@@ -1738,7 +1743,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1933,7 +1938,7 @@
         "@metamask/polling-controller": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -1986,6 +1991,12 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/remote-feature-flag-controller": {
       "globals": {
         "TextEncoder": true
@@ -2028,7 +2039,7 @@
         "@metamask/utils": true,
         "@noble/ciphers": true,
         "@noble/curves": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/selected-network-controller": {
@@ -2115,7 +2126,7 @@
         ]
       },
       "packages": {
-        "@metamask/snaps-controllers>@metamask/approval-controller": true,
+        "@metamask/approval-controller": true,
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
@@ -2128,9 +2139,8 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "cron-parser": true,
         "eslint>fast-deep-equal": true,
@@ -2170,7 +2180,7 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
-        "@metamask/keyring-api>async-mutex": true
+        "mockttp>async-mutex": true
       }
     },
     "@metamask/snaps-sdk": {
@@ -2181,7 +2191,6 @@
         "@metamask/rpc-errors": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@swc/helpers": true,
         "luxon": true
       }
     },
@@ -2209,7 +2218,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -2221,16 +2229,6 @@
         "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/account-tree-controller>@metamask/snaps-utils": {
-      "packages": {
-        "@metamask/snaps-sdk": true,
-        "@metamask/superstruct": true,
-        "@metamask/utils": true,
-        "@scure/base": true,
-        "fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true
-      }
-    },
     "@metamask/storage-service": {
       "globals": {
         "console.error": true,
@@ -2291,7 +2289,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -2312,8 +2310,9 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
-        "@metamask/transaction-pay-controller>@metamask/bridge-controller": true,
+        "@metamask/bridge-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/keyring-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
@@ -2429,23 +2428,18 @@
       "packages": {
         "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>@noble/hashes": true,
-        "@swc/helpers": true,
-        "@metamask/perps-controller>@nktkas/hyperliquid>micro-eth-signer": true,
         "@metamask/perps-controller>@nktkas/hyperliquid>valibot": true
       }
     },
     "@metamask/perps-controller>@nktkas/hyperliquid>@nktkas/rews": {
       "globals": {
         "AbortController": true,
-        "AbortSignal": true,
+        "AbortSignal.timeout": true,
         "CustomEvent": true,
         "DOMException": true,
         "WebSocket": true,
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@noble/ciphers": {
@@ -2517,9 +2511,6 @@
       "globals": {
         "TextEncoder": true,
         "crypto": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -2965,9 +2956,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -3012,13 +3000,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -3127,7 +3112,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -3163,7 +3147,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -3174,7 +3157,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -3225,7 +3207,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -3249,7 +3230,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -3263,7 +3243,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -3373,7 +3352,7 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3382,7 +3361,7 @@
         "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
@@ -3749,8 +3728,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "@ensdomains/content-hash>cids": {
@@ -4444,6 +4422,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -4471,7 +4457,6 @@
       "packages": {
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
         "@metamask/eth-sig-util": true,
-        "@swc/helpers": true,
         "viem>abitype": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "bitcoin-address-validation>bech32": true,
@@ -4824,7 +4809,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -4925,9 +4913,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -5433,6 +5418,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -5892,9 +5889,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -6388,6 +6382,11 @@
         "crypto": true
       }
     },
+    "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -6453,6 +6452,23 @@
         "browserify>util": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv3/beta/policy.json b/lavamoat/webpack/mv3/beta/policy.json
index 0c3865e4d69b..a0a489083a0a 100644
--- a/lavamoat/webpack/mv3/beta/policy.json
+++ b/lavamoat/webpack/mv3/beta/policy.json
@@ -437,6 +437,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -465,9 +473,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -514,7 +519,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -529,7 +533,6 @@
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-transport": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true
       }
     },
@@ -545,9 +548,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -658,6 +658,9 @@
       }
     },
     "@metamask/assets-controller": {
+      "globals": {
+        "performance.now": true
+      },
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
@@ -876,7 +879,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1042,7 +1045,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1062,11 +1065,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1078,7 +1097,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1093,7 +1112,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1101,7 +1120,7 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
@@ -1157,7 +1176,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1275,6 +1294,12 @@
         "@metamask/providers>readable-stream": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/utils": true,
@@ -1312,8 +1337,7 @@
       "packages": {
         "@metamask/post-message-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
-        "@swc/helpers": true
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-rpc-methods": {
@@ -1358,7 +1382,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -1392,7 +1415,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -1905,9 +1928,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -1927,13 +1947,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -1988,7 +2005,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -2018,7 +2034,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -2029,7 +2044,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -2080,7 +2094,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -2104,7 +2117,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -2118,7 +2130,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -2217,19 +2228,19 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
+      },
+      "packages": {
+        "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "tslib": true
       }
     },
     "string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -2496,8 +2507,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "ethereumjs-util>create-hash>cipher-base": {
@@ -3073,6 +3083,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eslint-plugin-react>es-iterator-helpers>has-property-descriptors": {
       "packages": {
         "string.prototype.matchall>call-bind>es-define-property": true
@@ -3365,7 +3383,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -3466,9 +3487,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -3906,6 +3924,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -4315,9 +4345,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -4790,6 +4817,23 @@
         "react-markdown>vfile>vfile-message": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv3/experimental/policy.json b/lavamoat/webpack/mv3/experimental/policy.json
index 0c3865e4d69b..a0a489083a0a 100644
--- a/lavamoat/webpack/mv3/experimental/policy.json
+++ b/lavamoat/webpack/mv3/experimental/policy.json
@@ -437,6 +437,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -465,9 +473,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -514,7 +519,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -529,7 +533,6 @@
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-transport": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true
       }
     },
@@ -545,9 +548,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -658,6 +658,9 @@
       }
     },
     "@metamask/assets-controller": {
+      "globals": {
+        "performance.now": true
+      },
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
@@ -876,7 +879,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1042,7 +1045,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1062,11 +1065,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1078,7 +1097,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1093,7 +1112,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1101,7 +1120,7 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
@@ -1157,7 +1176,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1275,6 +1294,12 @@
         "@metamask/providers>readable-stream": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/utils": true,
@@ -1312,8 +1337,7 @@
       "packages": {
         "@metamask/post-message-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
-        "@swc/helpers": true
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-rpc-methods": {
@@ -1358,7 +1382,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -1392,7 +1415,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -1905,9 +1928,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -1927,13 +1947,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -1988,7 +2005,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -2018,7 +2034,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -2029,7 +2044,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -2080,7 +2094,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -2104,7 +2117,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -2118,7 +2130,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -2217,19 +2228,19 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
+      },
+      "packages": {
+        "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "tslib": true
       }
     },
     "string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -2496,8 +2507,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "ethereumjs-util>create-hash>cipher-base": {
@@ -3073,6 +3083,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eslint-plugin-react>es-iterator-helpers>has-property-descriptors": {
       "packages": {
         "string.prototype.matchall>call-bind>es-define-property": true
@@ -3365,7 +3383,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -3466,9 +3487,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -3906,6 +3924,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -4315,9 +4345,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -4790,6 +4817,23 @@
         "react-markdown>vfile>vfile-message": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv3/flask/policy.json b/lavamoat/webpack/mv3/flask/policy.json
index 0c3865e4d69b..a0a489083a0a 100644
--- a/lavamoat/webpack/mv3/flask/policy.json
+++ b/lavamoat/webpack/mv3/flask/policy.json
@@ -437,6 +437,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -465,9 +473,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -514,7 +519,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -529,7 +533,6 @@
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-transport": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true
       }
     },
@@ -545,9 +548,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -658,6 +658,9 @@
       }
     },
     "@metamask/assets-controller": {
+      "globals": {
+        "performance.now": true
+      },
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
@@ -876,7 +879,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1042,7 +1045,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1062,11 +1065,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1078,7 +1097,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1093,7 +1112,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1101,7 +1120,7 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
@@ -1157,7 +1176,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1275,6 +1294,12 @@
         "@metamask/providers>readable-stream": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/utils": true,
@@ -1312,8 +1337,7 @@
       "packages": {
         "@metamask/post-message-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
-        "@swc/helpers": true
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-rpc-methods": {
@@ -1358,7 +1382,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -1392,7 +1415,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -1905,9 +1928,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -1927,13 +1947,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -1988,7 +2005,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -2018,7 +2034,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -2029,7 +2044,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -2080,7 +2094,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -2104,7 +2117,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -2118,7 +2130,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -2217,19 +2228,19 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
+      },
+      "packages": {
+        "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "tslib": true
       }
     },
     "string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -2496,8 +2507,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "ethereumjs-util>create-hash>cipher-base": {
@@ -3073,6 +3083,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eslint-plugin-react>es-iterator-helpers>has-property-descriptors": {
       "packages": {
         "string.prototype.matchall>call-bind>es-define-property": true
@@ -3365,7 +3383,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -3466,9 +3487,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -3906,6 +3924,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -4315,9 +4345,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -4790,6 +4817,23 @@
         "react-markdown>vfile>vfile-message": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/lavamoat/webpack/mv3/main/policy.json b/lavamoat/webpack/mv3/main/policy.json
index 0c3865e4d69b..a0a489083a0a 100644
--- a/lavamoat/webpack/mv3/main/policy.json
+++ b/lavamoat/webpack/mv3/main/policy.json
@@ -437,6 +437,14 @@
     },
     "@lavamoat/lavadome-react": {
       "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Event.prototype": true,
+        "EventTarget.prototype": true,
+        "NavigateEvent.prototype": true,
+        "NavigationDestination.prototype": true,
+        "Node.prototype": true,
         "console.warn": true,
         "document": true,
         "navigation": true
@@ -465,9 +473,6 @@
     "@ledgerhq/errors": {
       "globals": {
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
@@ -514,7 +519,6 @@
       "packages": {
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true,
         "webpack>events": true
       }
@@ -529,7 +533,6 @@
         "@ledgerhq/errors": true,
         "@ledgerhq/hw-transport": true,
         "@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@swc/helpers": true,
         "buffer": true
       }
     },
@@ -545,9 +548,6 @@
       "globals": {
         "__ledgerLogsListen": "write",
         "console.error": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@material-ui/core": {
@@ -658,6 +658,9 @@
       }
     },
     "@metamask/assets-controller": {
+      "globals": {
+        "performance.now": true
+      },
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
@@ -876,7 +879,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-qr-keyring>@keystonehq/bc-ur-registry-eth": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "buffer": true,
         "@metamask/eth-qr-keyring>hdkey": true,
         "@metamask/eth-qr-keyring>uuid": true
@@ -1042,7 +1045,7 @@
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "crypto": true,
+        "crypto.subtle": true,
         "ed25519": true,
         "ed25519Bip32": true,
         "secp256k1": true
@@ -1062,11 +1065,27 @@
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "bitcoin-address-validation": true,
         "@metamask/keyring-api>uuid": true
       }
     },
+    "@metamask/keyring-internal-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-utils": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "bitcoin-address-validation": true
+      }
+    },
     "@metamask/keyring-controller": {
       "globals": {
         "console.error": true
@@ -1078,7 +1097,7 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
         "lodash": true,
         "@metamask/keyring-controller>ulid": true
@@ -1093,7 +1112,7 @@
     },
     "@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-internal-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-internal-api": true,
         "@metamask/keyring-snap-client": true,
         "@metamask/keyring-utils": true
@@ -1101,7 +1120,7 @@
     },
     "@metamask/keyring-snap-client": {
       "packages": {
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
         "@metamask/keyring-utils": true,
         "@metamask/superstruct": true,
         "@metamask/keyring-snap-client>uuid": true
@@ -1157,7 +1176,7 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/connectivity-controller": true,
+        "@metamask/network-controller>@metamask/connectivity-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
@@ -1275,6 +1294,12 @@
         "@metamask/providers>readable-stream": true
       }
     },
+    "@metamask/react-data-query": {
+      "packages": {
+        "@metamask/utils": true,
+        "@tanstack/react-query>@tanstack/query-core": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/utils": true,
@@ -1312,8 +1337,7 @@
       "packages": {
         "@metamask/post-message-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
-        "@swc/helpers": true
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-rpc-methods": {
@@ -1358,7 +1382,6 @@
         "@metamask/superstruct": true,
         "@metamask/utils": true,
         "@scure/base": true,
-        "@swc/helpers": true,
         "chalk": true,
         "cron-parser": true,
         "fast-json-stable-stringify": true,
@@ -1392,7 +1415,7 @@
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
-        "@metamask/keyring-api>async-mutex": true,
+        "mockttp>async-mutex": true,
         "@metamask/transaction-controller>bignumber.js": true,
         "ethereumjs-util>bn.js": true,
         "buffer": true,
@@ -1905,9 +1928,6 @@
     "@solana/addresses>@solana/errors": {
       "globals": {
         "btoa": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/controller-utils>@spruceid/siwe-parser": {
@@ -1927,13 +1947,10 @@
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "document": true,
+        "document.visibilityState": true,
         "removeEventListener": true,
         "setInterval": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@tanstack/react-query>@tanstack/query-core": {
@@ -1988,7 +2005,6 @@
         "window": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
         "@trezor/connect-web>@trezor/utils": true,
         "tslib": true
@@ -2018,7 +2034,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect-common": true,
         "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
@@ -2029,7 +2044,6 @@
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/connect>@trezor/device-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
@@ -2080,7 +2094,6 @@
       },
       "packages": {
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils>@sinclair/typebox": true,
-        "@swc/helpers": true,
         "buffer": true,
         "ts-mixer": true
       }
@@ -2104,7 +2117,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "buffer": true,
         "webpack>events": true,
@@ -2118,7 +2130,6 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers": true,
         "@trezor/connect-web>@trezor/utils": true,
         "webpack>events": true,
         "tslib": true
@@ -2217,19 +2228,19 @@
         "browserify>util": true
       }
     },
-    "@metamask/keyring-api>async-mutex": {
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
+      },
+      "packages": {
+        "tslib": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "mockttp>async-mutex": {
       "globals": {
         "clearTimeout": true,
         "setTimeout": true
-      },
-      "packages": {
-        "tslib": true
       }
     },
     "string.prototype.matchall>es-abstract>available-typed-arrays": {
@@ -2496,8 +2507,7 @@
         "setTimeout": true
       },
       "packages": {
-        "chart.js>@kurkle/color": true,
-        "@swc/helpers": true
+        "chart.js>@kurkle/color": true
       }
     },
     "ethereumjs-util>create-hash>cipher-base": {
@@ -3073,6 +3083,14 @@
         "string.prototype.matchall>es-object-atoms": true
       }
     },
+    "react-hot-toast>goober": {
+      "globals": {
+        "__nonce__": true,
+        "_goober": true,
+        "document.createElement": true,
+        "document.head": true
+      }
+    },
     "eslint-plugin-react>es-iterator-helpers>has-property-descriptors": {
       "packages": {
         "string.prototype.matchall>call-bind>es-define-property": true
@@ -3365,7 +3383,10 @@
         "document.getSelection": true,
         "getComputedStyle": true,
         "location.href": true,
-        "navigator": true,
+        "navigator.language": true,
+        "navigator.platform": true,
+        "navigator.userAgent.toLowerCase": true,
+        "navigator.userAgentData": true,
         "performance.now": true,
         "queueMicrotask": true,
         "requestAnimationFrame": true,
@@ -3466,9 +3487,6 @@
       "globals": {
         "console.error": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "ethereumjs-util>create-hash>md5.js": {
@@ -3906,6 +3924,18 @@
         "react-focus-lock>use-sidecar": true
       }
     },
+    "react-hot-toast": {
+      "globals": {
+        "MutationObserver": true,
+        "clearTimeout": true,
+        "matchMedia": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "react-hot-toast>goober": true,
+        "react": true
+      }
+    },
     "react-idle-timer": {
       "globals": {
         "clearTimeout": true,
@@ -4315,9 +4345,6 @@
       "globals": {
         "WeakRef": true,
         "console.warn": true
-      },
-      "packages": {
-        "@swc/helpers": true
       }
     },
     "@metamask/snaps-utils>rfdc": {
@@ -4790,6 +4817,23 @@
         "react-markdown>vfile>vfile-message": true
       }
     },
+    "web-vitals": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
+        "PerformanceObserver": true,
+        "addEventListener": true,
+        "document.addEventListener": true,
+        "document.prerendering": true,
+        "document.readyState": true,
+        "document.visibilityState": true,
+        "document.wasDiscarded": true,
+        "performance": true,
+        "removeEventListener": true,
+        "requestAnimationFrame": true,
+        "requestIdleCallback": true,
+        "setTimeout": true
+      }
+    },
     "webextension-polyfill": {
       "globals": {
         "browser": true,
diff --git a/package.json b/package.json
index 7c62e28fdd22..b79c4a4b72c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "13.25.0",
+  "version": "13.27.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -75,6 +75,7 @@
     "test:e2e:global": "yarn playwright test --project=global",
     "test:e2e:benchmark": "yarn tsx test/e2e/benchmarks/run-benchmark.ts",
     "test:e2e:pw:report": "yarn playwright show-report public/playwright/playwright-reports/html",
+    "test:e2e:feature-flag:coverage": "tsx test/e2e/scripts/feature-flag-coverage-report.ts",
     "test:e2e:chrome:rpc": "SELENIUM_BROWSER=chrome tsx test/e2e/run-all.ts --rpc",
     "test:e2e:chrome:multi-provider": "MULTIPROVIDER=true SELENIUM_BROWSER=chrome tsx test/e2e/run-all.ts --multi-provider",
     "test:e2e:firefox": "SELENIUM_BROWSER=firefox tsx test/e2e/run-all.ts",
@@ -190,7 +191,7 @@
     "plugin-error@1.0.1": "patch:plugin-error@npm%3A1.0.1#./.yarn/patches/plugin-error-npm-1.0.1-7d15e880d6.patch",
     "ws@8.13.0": "^8.17.1",
     "jsdom@^16.7.0": "patch:jsdom@npm%3A16.7.0#./.yarn/patches/jsdom-npm-16.7.0-216c5c4bf9.patch",
-    "lodash-es": "4.17.23",
+    "lodash-es": "^4.18.1",
     "trim": "^0.0.3",
     "@eslint/eslintrc@npm:^2.1.4": "patch:@eslint/eslintrc@npm%3A2.1.4#~/.yarn/patches/@eslint-eslintrc-npm-2.1.4-1ff4b5f908.patch",
     "@fortawesome/fontawesome-free@^5.13.0": "patch:@fortawesome/fontawesome-free@npm%3A5.13.0#./.yarn/patches/@fortawesome-fontawesome-free-npm-5.13.0-f20fc0388d.patch",
@@ -204,7 +205,7 @@
     "async-done@^1.2.0": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch",
-    "serialize-javascript": "7.0.3",
+    "serialize-javascript": "7.0.5",
     "@types/readable-stream-2@^2.3.15": "npm:@types/readable-stream@^2.3.15",
     "@types/readable-stream-3@^4.0.4": "npm:@types/readable-stream@^4.0.4",
     "readable-stream-2@^2.3.3": "npm:readable-stream@^2.3.3",
@@ -246,7 +247,7 @@
     "@ledgerhq/errors": "^6.21.0",
     "@trezor/connect-web": "~9.6.0",
     "nanoid@npm:^5.1.5": "^3.3.8",
-    "lodash": "patch:lodash@npm%3A4.17.23#~/.yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch",
+    "lodash": "patch:lodash@npm%3A4.18.1#~/.yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch",
     "dompurify": "patch:dompurify@npm%3A3.2.5#~/.yarn/patches/dompurify-npm-3.2.5-d9af707abe.patch",
     "jsonpath-plus": "^10.3.0",
     "@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch",
@@ -260,13 +261,10 @@
     "gridplus-sdk/uuid@npm:^13.0.0": "^8.3.2",
     "gridplus-sdk/@types/uuid@npm:^11.0.0": "^8.3.0",
     "@ledgerhq/hw-transport-webhid@npm:^6.31.0": "patch:@ledgerhq/hw-transport-webhid@npm%3A6.31.0#~/.yarn/patches/@ledgerhq-hw-transport-webhid-npm-6.31.0-efbecf27ab.patch",
-    "@metamask/accounts-controller": "37.0.0",
     "fast-xml-parser": "^5.5.7",
     "minimatch@npm:^10.1.1": "10.2.4",
-    "@metamask/snaps-controllers": "^18.0.4",
-    "@metamask/multichain-account-service@npm:^7.0.0": "patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch",
-    "@metamask/multichain-account-service@npm:^7.1.0": "patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch",
-    "@metamask/bridge-status-controller@npm:^69.0.0": "patch:@metamask/bridge-status-controller@patch%3A@metamask/bridge-status-controller@npm%253A69.0.0%23~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch%3A%3Aversion=69.0.0&hash=ca26bd#~/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch"
+    "@metamask/snaps-controllers": "^19.0.0",
+    "@metamask/messenger@npm:^0.3.0": "^1.0.0"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.26.10#~/.yarn/patches/@babel-runtime-npm-7.26.10-fe8c62510a.patch",
@@ -294,20 +292,20 @@
     "@material-ui/pickers": "^3.3.11",
     "@metamask/abi-utils": "^3.0.0",
     "@metamask/account-api": "^1.0.0",
-    "@metamask/account-tree-controller": "^5.0.0",
+    "@metamask/account-tree-controller": "^7.0.0",
     "@metamask/account-watcher": "^4.1.3",
-    "@metamask/accounts-controller": "^37.0.0",
+    "@metamask/accounts-controller": "^37.1.1",
     "@metamask/address-book-controller": "^7.1.0",
     "@metamask/announcement-controller": "^8.0.0",
     "@metamask/approval-controller": "^9.0.0",
-    "@metamask/assets-controller": "^3.1.1",
-    "@metamask/assets-controllers": "^101.0.1",
-    "@metamask/base-controller": "^9.0.0",
-    "@metamask/bitcoin-wallet-snap": "^1.10.0",
-    "@metamask/bridge-controller": "^68.0.0",
-    "@metamask/bridge-status-controller": "patch:@metamask/bridge-status-controller@patch%3A@metamask/bridge-status-controller@npm%253A69.0.0%23~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch%3A%3Aversion=69.0.0&hash=ca26bd#~/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch",
+    "@metamask/assets-controller": "^3.2.1",
+    "@metamask/assets-controllers": "^103.0.0",
+    "@metamask/base-controller": "^9.0.1",
+    "@metamask/bitcoin-wallet-snap": "^1.10.1",
+    "@metamask/bridge-controller": "^69.2.3",
+    "@metamask/bridge-status-controller": "^70.0.3",
     "@metamask/browser-passworder": "^6.0.0",
-    "@metamask/chain-agnostic-permission": "^1.4.0",
+    "@metamask/chain-agnostic-permission": "^1.5.0",
     "@metamask/claims-controller": "^0.4.2",
     "@metamask/client-controller": "^1.0.0",
     "@metamask/connectivity-controller": "^0.1.0",
@@ -317,49 +315,48 @@
     "@metamask/delegation-controller": "^2.0.2",
     "@metamask/delegation-core": "^0.2.0-rc.1",
     "@metamask/delegation-deployments": "^0.15.0",
-    "@metamask/design-system-react": "^0.11.0",
+    "@metamask/design-system-react": "^0.12.0",
     "@metamask/design-system-tailwind-preset": "^0.6.1",
     "@metamask/design-tokens": "^8.2.2",
     "@metamask/eip-5792-middleware": "3.0.0",
     "@metamask/eip-7702-internal-rpc-middleware": "^0.1.0",
     "@metamask/ens-controller": "^19.1.0",
     "@metamask/ens-resolver-snap": "^1.1.0",
-    "@metamask/error-reporting-service": "^3.0.0",
     "@metamask/eth-hd-keyring": "^13.1.0",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "^23.1.0",
     "@metamask/eth-ledger-bridge-keyring": "11.3.0",
     "@metamask/eth-qr-keyring": "^1.1.0",
     "@metamask/eth-sig-util": "^8.2.0",
-    "@metamask/eth-snap-keyring": "^19.0.0",
+    "@metamask/eth-snap-keyring": "^20.0.0",
     "@metamask/eth-token-tracker": "^10.0.2",
     "@metamask/eth-trezor-keyring": "^9.0.0",
     "@metamask/etherscan-link": "^3.0.0",
     "@metamask/gas-fee-controller": "^26.1.0",
-    "@metamask/gator-permissions-controller": "^2.1.0",
+    "@metamask/gator-permissions-controller": "^3.0.0",
     "@metamask/gator-permissions-snap": "^1.3.1",
-    "@metamask/hw-wallet-sdk": "^0.5.0",
+    "@metamask/hw-wallet-sdk": "^0.8.0",
     "@metamask/institutional-wallet-snap": "1.3.4",
     "@metamask/jazzicon": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch",
     "@metamask/json-rpc-engine": "^10.2.3",
     "@metamask/json-rpc-middleware-stream": "^8.0.4",
     "@metamask/keyring-api": "^21.6.0",
-    "@metamask/keyring-controller": "^25.1.0",
+    "@metamask/keyring-controller": "^25.1.1",
     "@metamask/keyring-internal-api": "^10.0.0",
-    "@metamask/keyring-internal-snap-client": "^8.0.0",
+    "@metamask/keyring-internal-snap-client": "^9.0.1",
     "@metamask/keyring-snap-client": "^8.1.0",
     "@metamask/keyring-utils": "^3.2.0",
     "@metamask/logging-controller": "^8.0.0",
     "@metamask/logo": "^4.0.0",
     "@metamask/message-manager": "^14.0.0",
     "@metamask/message-signing-snap": "1.1.4",
-    "@metamask/messenger": "^0.3.0",
+    "@metamask/messenger": "^1.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
-    "@metamask/multichain-account-service": "patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch",
+    "@metamask/multichain-account-service": "^8.0.1",
     "@metamask/multichain-api-client": "^0.10.1",
-    "@metamask/multichain-api-middleware": "^1.2.7",
+    "@metamask/multichain-api-middleware": "^2.0.0",
     "@metamask/multichain-network-controller": "^3.0.5",
-    "@metamask/multichain-transactions-controller": "^7.0.2",
+    "@metamask/multichain-transactions-controller": "^7.0.4",
     "@metamask/name-controller": "^9.1.0",
     "@metamask/network-controller": "^30.0.0",
     "@metamask/network-enablement-controller": "^4.1.1",
@@ -376,9 +373,10 @@
     "@metamask/ppom-validator": "0.39.1",
     "@metamask/preinstalled-example-snap": "^0.7.2",
     "@metamask/profile-metrics-controller": "^3.0.3",
-    "@metamask/profile-sync-controller": "^28.0.0",
+    "@metamask/profile-sync-controller": "^28.0.2",
     "@metamask/providers": "^22.1.1",
     "@metamask/rate-limit-controller": "^7.0.0",
+    "@metamask/react-data-query": "^0.2.0",
     "@metamask/remote-feature-flag-controller": "^4.1.0",
     "@metamask/rpc-errors": "^7.0.0",
     "@metamask/safe-event-emitter": "^3.1.1",
@@ -386,20 +384,20 @@
     "@metamask/seedless-onboarding-controller": "^9.0.0",
     "@metamask/selected-network-controller": "^26.0.3",
     "@metamask/shield-controller": "^5.0.1",
-    "@metamask/signature-controller": "^39.1.0",
+    "@metamask/signature-controller": "^39.1.2",
     "@metamask/smart-transactions-controller": "^23.0.0",
-    "@metamask/snaps-controllers": "^18.0.4",
-    "@metamask/snaps-execution-environments": "^11.0.1",
-    "@metamask/snaps-rpc-methods": "^15.0.0",
+    "@metamask/snaps-controllers": "^19.0.0",
+    "@metamask/snaps-execution-environments": "^11.0.2",
+    "@metamask/snaps-rpc-methods": "^15.0.1",
     "@metamask/snaps-sdk": "^11.0.0",
-    "@metamask/snaps-utils": "^12.1.1",
+    "@metamask/snaps-utils": "^12.1.2",
     "@metamask/solana-wallet-snap": "^2.7.3",
     "@metamask/solana-wallet-standard": "^0.6.0",
     "@metamask/storage-service": "^1.0.0",
     "@metamask/subscription-controller": "^6.0.0",
-    "@metamask/transaction-controller": "^63.0.0",
-    "@metamask/transaction-pay-controller": "^17.1.0",
-    "@metamask/tron-wallet-snap": "1.22.1",
+    "@metamask/transaction-controller": "^63.3.1",
+    "@metamask/transaction-pay-controller": "^19.0.0",
+    "@metamask/tron-wallet-snap": "^1.25.0",
     "@metamask/user-operation-controller": "^41.1.0",
     "@metamask/utils": "^11.10.0",
     "@ngraveio/bc-ur": "^1.1.13",
@@ -454,7 +452,7 @@
     "lavamoat-browserify": "^19.0.2",
     "lightweight-charts": "^5.1.0",
     "localforage": "^1.9.0",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "loglevel": "^1.8.1",
     "lottie-web": "^5.12.2",
     "luxon": "^3.2.1",
@@ -470,6 +468,7 @@
     "react-compiler-runtime": "^1.0.0",
     "react-dom": "^17.0.2",
     "react-focus-lock": "^2.9.4",
+    "react-hot-toast": "^2.6.0",
     "react-idle-timer": "4.5.6",
     "react-markdown": "^6.0.3",
     "react-popper": "^2.2.3",
@@ -500,7 +499,10 @@
     "@babel/core": "patch:@babel/core@npm%3A7.25.9#~/.yarn/patches/@babel-core-npm-7.25.9-4ae3bff7f3.patch",
     "@babel/eslint-parser": "^7.25.9",
     "@babel/eslint-plugin": "^7.25.9",
+    "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+    "@babel/plugin-transform-private-methods": "^7.28.6",
+    "@babel/plugin-transform-private-property-in-object": "^7.27.1",
     "@babel/preset-env": "^7.25.9",
     "@babel/preset-react": "^7.25.9",
     "@babel/preset-typescript": "^7.25.9",
@@ -615,6 +617,7 @@
     "@types/xml2js": "^0",
     "@types/yargs": "^17.0.32",
     "@types/yargs-parser": "^21.0.3",
+    "@types/yazl": "^3.3.0",
     "@typescript-eslint/eslint-plugin": "^8.1.0",
     "@typescript-eslint/parser": "^8.1.0",
     "@viem/anvil": "^0.0.10",
@@ -665,7 +668,6 @@
     "fake-indexeddb": "^6.1.0",
     "fancy-log": "^1.3.3",
     "fast-glob": "^3.2.2",
-    "fflate": "^0.8.2",
     "fs-extra": "^8.1.0",
     "ganache": "patch:ganache@npm%3A7.9.2#~/.yarn/patches/ganache-npm-7.9.2-a70dc8da34.patch",
     "gh-pages": "^5.0.0",
@@ -704,7 +706,7 @@
     "mini-css-extract-plugin": "^2.9.1",
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
-    "mockttp": "^3.10.1",
+    "mockttp": "^4.2.3",
     "navigator.locks": "^0.8.6",
     "nock": "patch:nock@npm%3A13.5.4#~/.yarn/patches/nock-npm-13.5.4-2c4f77b249.patch",
     "node-fetch": "^2.6.1",
@@ -767,14 +769,16 @@
     "vinyl-sourcemaps-apply": "^0.2.1",
     "wait-on": "^7.0.1",
     "watchify": "^4.0.0",
+    "web-vitals": "^4.2.4",
     "webextension-polyfill": "^0.8.0",
     "webpack": "^5.104.1",
     "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.2",
+    "webpack-dev-server": "^5.2.3",
     "ws": "^8.17.1",
     "yaml": "^2.4.1",
     "yargs": "^17.7.2",
-    "yargs-parser": "^21.1.1"
+    "yargs-parser": "^21.1.1",
+    "yazl": "^3.3.1"
   },
   "engines": {
     "node": ">=24.13.0",
diff --git a/shared/constants/benchmarks.ts b/shared/constants/benchmarks.ts
index cacb52f699e4..f514c960d90d 100644
--- a/shared/constants/benchmarks.ts
+++ b/shared/constants/benchmarks.ts
@@ -6,41 +6,137 @@ export type StatisticalResult = {
   [key: string]: number;
 };
 
-export type Persona = 'standard' | 'powerUser';
+export const BENCHMARK_PERSONA = {
+  STANDARD: 'standard',
+  POWER_USER: 'powerUser',
+} as const;
+
+export type Persona =
+  (typeof BENCHMARK_PERSONA)[keyof typeof BENCHMARK_PERSONA];
+
+export const BENCHMARK_TYPE = {
+  BENCHMARK: 'benchmark',
+  PERFORMANCE: 'performance',
+  USER_ACTION: 'userAction',
+} as const;
+
+export type BenchmarkType =
+  (typeof BENCHMARK_TYPE)[keyof typeof BENCHMARK_TYPE];
+
+/** Web Vitals rating per web.dev thresholds */
+export type WebVitalsRating = 'good' | 'needs-improvement' | 'poor';
+
+/**
+ * Core Web Vitals metrics from the web-vitals library.
+ * INP requires actual user interactions to measure meaningful data.
+ */
+export type WebVitalsMetrics = {
+  /** Interaction to Next Paint in milliseconds */
+  inp: number | null;
+  /** First Contentful Paint in milliseconds (always available on extension pages) */
+  fcp: number | null;
+  /** Largest Contentful Paint in milliseconds (null on chrome-extension:// pages) */
+  lcp: number | null;
+  /** Cumulative Layout Shift (unitless score) */
+  cls: number | null;
+  /** Rating for INP metric */
+  inpRating: WebVitalsRating | null;
+  /** Rating for FCP metric */
+  fcpRating: WebVitalsRating | null;
+  /** Rating for LCP metric */
+  lcpRating: WebVitalsRating | null;
+  /** Rating for CLS metric */
+  clsRating: WebVitalsRating | null;
+};
+
+/** Distribution of rating buckets across benchmark runs */
+export type RatingDistribution = {
+  good: number;
+  'needs-improvement': number;
+  poor: number;
+  null: number;
+};
 
-export type BenchmarkType = 'benchmark' | 'performance' | 'userAction';
+/** Per-metric statistics (mean, percentiles, etc.) */
+export type TimerStatistics = {
+  id: string;
+  mean: number;
+  min: number;
+  max: number;
+  stdDev: number;
+  cv: number;
+  p50: number;
+  p75: number;
+  p95: number;
+  p99: number;
+  samples: number;
+  outliers: number;
+  dataQuality: 'good' | 'poor' | 'unreliable';
+};
+
+/** Per-metric aggregated web vitals with full statistical analysis */
+export type WebVitalsAggregated = {
+  inp: TimerStatistics | null;
+  fcp: TimerStatistics | null;
+  lcp: TimerStatistics | null;
+  cls: TimerStatistics | null;
+  ratings: {
+    inp: RatingDistribution;
+    fcp: RatingDistribution;
+    lcp: RatingDistribution;
+    cls: RatingDistribution;
+  };
+};
+
+export type WebVitalsRun = WebVitalsMetrics & { iteration: number };
+
+/** Full web vitals summary: per-run snapshots for Sentry spans + aggregated stats */
+export type WebVitalsSummary = {
+  runs: WebVitalsRun[];
+  aggregated: WebVitalsAggregated;
+};
 
 export type BenchmarkResults = {
   testTitle: string;
   persona: Persona;
   benchmarkType?: BenchmarkType;
+  platform?: string;
+  buildType?: string;
   mean: StatisticalResult;
   min: StatisticalResult;
   max: StatisticalResult;
   stdDev: StatisticalResult;
   p75: StatisticalResult;
   p95: StatisticalResult;
+  webVitals?: WebVitalsSummary;
 };
 
-export const StatKey = {
+export const STAT_KEY = {
   Mean: 'mean',
+  StdDev: 'stdDev',
   P75: 'p75',
   P95: 'p95',
 } as const;
-export type StatKey = (typeof StatKey)[keyof typeof StatKey];
+export type StatKey = (typeof STAT_KEY)[keyof typeof STAT_KEY];
 
-export const PercentileKey = {
-  P75: StatKey.P75,
-  P95: StatKey.P95,
+export const PERCENTILE_KEY = {
+  P75: STAT_KEY.P75,
+  P95: STAT_KEY.P95,
 } as const;
-export type PercentileKey = (typeof PercentileKey)[keyof typeof PercentileKey];
+export type PercentileKey =
+  (typeof PERCENTILE_KEY)[keyof typeof PERCENTILE_KEY];
+
+export type ComparisonKey =
+  | PercentileKey
+  | typeof STAT_KEY.Mean
+  | typeof STAT_KEY.StdDev;
 
-export const ThresholdSeverity = {
+export const THRESHOLD_SEVERITY = {
   Warn: 'warn',
   Fail: 'fail',
 } as const;
 export type ThresholdSeverity =
-  (typeof ThresholdSeverity)[keyof typeof ThresholdSeverity];
+  (typeof THRESHOLD_SEVERITY)[keyof typeof THRESHOLD_SEVERITY];
 
 /**
  * Threshold limits for a single percentile.
@@ -75,7 +171,12 @@ export type ThresholdViolation = {
  * Aggregated historical baseline for a single metric,
  * with values for each stat key (mean, p75, p95).
  */
-export type HistoricalBaselineMetrics = Record<StatKey, number>;
+export type HistoricalBaselineMetrics = Omit<
+  Record<StatKey, number>,
+  'stdDev'
+> & {
+  stdDev?: number;
+};
 
 export type RelativeThresholds = {
   regressionPercent: number;
@@ -86,10 +187,7 @@ export type RelativeThresholds = {
 /**
  * Uniform relative thresholds applied to all metrics.
  * These are informational only (do not affect pass/fail).
- *
- * Assumption: all benchmark metrics have similar run-to-run stability,
- * so a single set of percentages is sufficient. If specific metrics
- * prove noisier, consider making thresholds per-metric or per-percentile.
+ * Per-metric overrides can be set via relativeThresholds in ThresholdConfig.
  */
 export const DEFAULT_RELATIVE_THRESHOLDS: RelativeThresholds = {
   regressionPercent: 0.1,
@@ -107,12 +205,14 @@ export const BENCHMARK_BUILD_TYPES = {
   WEBPACK: 'webpack',
 } as const;
 
-/**
- * Platform and build-type combinations for which entry benchmarks
- * (interaction & user journey) are currently collected.
- * Extend these arrays here to automatically include more combos in
- * both the PR comment builder and the benchmark gate checks.
- */
+export const ALL_BENCHMARK_COMBOS: readonly string[] = Object.values(
+  BENCHMARK_PLATFORMS,
+).flatMap((platform) =>
+  Object.values(BENCHMARK_BUILD_TYPES).map(
+    (buildType) => `${platform}-${buildType}`,
+  ),
+);
+
 export const ENTRY_BENCHMARK_PLATFORMS: readonly (typeof BENCHMARK_PLATFORMS)[keyof typeof BENCHMARK_PLATFORMS][] =
   [BENCHMARK_PLATFORMS.CHROME];
 
diff --git a/shared/constants/data-services.ts b/shared/constants/data-services.ts
new file mode 100644
index 000000000000..6649192899f2
--- /dev/null
+++ b/shared/constants/data-services.ts
@@ -0,0 +1,2 @@
+// A list of all names of data services available in the client.
+export const DATA_SERVICES: string[] = [];
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index bc3dae02997c..b673322ed788 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -919,6 +919,7 @@ export enum MetaMetricsEventName {
   SrpHoldToRevealClickStarted = 'Reveal SRP Click Started',
   SrpHoldToRevealCloseClicked = 'Closes Hold To Reveal SRP',
   SrpHoldToRevealCompleted = 'Reveal SRP Completed',
+  SrpRevealMaliciousSiteDetected = 'Reveal SRP Malicious Site Detected',
   SrpViewsSrpQR = 'Views SRP QR Code',
   SrpViewSrpText = 'Views SRP',
   SrpCopiedToClipboard = 'Copies SRP to clipboard',
@@ -1064,6 +1065,9 @@ export enum MetaMetricsEventName {
   HardwareWalletForgotten = 'Hardware Wallet Forgotten',
   HardwareWalletMarketingButtonClicked = 'Hardware Wallet Marketing Button Clicked',
   HardwareWalletConnectionFailed = 'Hardware Wallet Connection Failed',
+  HardwareWalletRecoveryModalViewed = 'Hardware Wallet Recovery Modal Viewed',
+  HardwareWalletRecoverySuccessModalViewed = 'Hardware Wallet Recovery Success Modal Viewed',
+  HardwareWalletRecoveryCtaClicked = 'Hardware Wallet Recovery CTA Clicked',
   ViewportSwitched = 'Viewport Switched',
   // Rewards
   RewardsOptInStarted = 'REWARDS_OPT_IN_STARTED',
@@ -1102,6 +1106,41 @@ export enum MetaMetricsEventName {
   ContactDeleted = 'Contact Deleted',
 }
 
+/**
+ * Segment `location` for hardware wallet recovery.
+ * String values must match `segment-schema/libraries/properties/metamask-hardware-wallet-recovery-globals.yaml` (`location` enum).
+ */
+export enum MetaMetricsHardwareWalletRecoveryLocation {
+  Connection = 'Connection',
+  Transaction = 'Transaction',
+  Message = 'Message',
+  Swaps = 'Swaps',
+  Send = 'Send',
+}
+
+/**
+ * Segment `error_type` for hardware wallet recovery.
+ * String values must match `metamask-hardware-wallet-recovery-globals` / `metamask-hardware-wallet-recovery-error-globals` enums in segment-schema.
+ */
+export enum MetaMetricsHardwareWalletRecoveryErrorType {
+  DeviceLocked = 'Device Locked',
+  DeviceDisconnected = 'Device Disconnected',
+  EthereumAppNotOpened = 'Ethereum App Not Opened',
+  BlindSigningNotEnabled = 'Blind Signing Not Enabled',
+  GenericError = 'Generic Error',
+}
+
+/**
+ * Segment `device_type` (manufacturer) for hardware wallet events.
+ * String values must match `segment-schema/libraries/properties/metamask-hardware-wallet-globals.yaml` (`device_type` enum).
+ */
+export enum MetaMetricsHardwareWalletDeviceType {
+  Ledger = 'Ledger',
+  Trezor = 'Trezor',
+  QrHardware = 'QR Hardware',
+  Lattice = 'Lattice',
+}
+
 export enum MetaMetricsEventAccountType {
   Default = 'metamask',
   Hardware = 'hardware',
diff --git a/shared/constants/perps.ts b/shared/constants/perps.ts
index 3138cda389f8..8ed4ee4d49bd 100644
--- a/shared/constants/perps.ts
+++ b/shared/constants/perps.ts
@@ -11,3 +11,17 @@ export const VALID_MARKET_FILTERS = [
 ] as const;
 
 export type MarketFilter = (typeof VALID_MARKET_FILTERS)[number];
+
+/**
+ * Contact support (Help Center). Single source of truth aligned with mobile perpsConfig.
+ */
+export const SUPPORT_CONFIG = {
+  Url: 'https://support.metamask.io',
+} as const;
+
+/**
+ * Perps feedback survey (third-party). Single source of truth aligned with mobile perpsConfig.
+ */
+export const FEEDBACK_CONFIG = {
+  Url: 'https://survey.alchemer.com/s3/8649911/MetaMask-Perps-Trading-Feedback',
+} as const;
diff --git a/shared/constants/terms.js b/shared/constants/terms.ts
similarity index 100%
rename from shared/constants/terms.js
rename to shared/constants/terms.ts
diff --git a/shared/constants/tokens.js b/shared/constants/tokens.js
deleted file mode 100644
index 88fcf0784ea9..000000000000
--- a/shared/constants/tokens.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import contractMap from '@metamask/contract-metadata';
-import BigNumber from 'bignumber.js';
-
-/**
- * A normalized list of addresses exported as part of the contractMap in
- * `@metamask/contract-metadata`. Used primarily to validate if manually entered
- * contract addresses do not match one of our listed tokens
- */
-export const LISTED_CONTRACT_ADDRESSES = Object.keys(contractMap).map(
-  (address) => address.toLowerCase(),
-);
-
-/**
- * @typedef {object} TokenDetails
- * @property {string} address - The address of the selected 'TOKEN' or
- *  'NFT' contract.
- * @property {string} [symbol] - The symbol of the token.
- * @property {string|null} [name] - The name of the token.
- * @property {number} [decimals] - The number of decimals of the selected
- *  'ERC20' asset.
- * @property {number} [tokenId] - The id of the selected 'NFT' asset.
- * @property {string} [image] - A URL to the image of the NFT or ERC20 icon.
- * @property {TokenStandardStrings} [standard] - The standard of the selected
- *  asset.
- * @property {boolean} [isERC721] - True when the asset is a ERC721 token.
- */
-
-const STATIC_MAINNET_TOKEN_LIST = {};
-
-for (const base of Object.keys(contractMap)) {
-  const { logo, ...tokenMetadata } = contractMap[base];
-  STATIC_MAINNET_TOKEN_LIST[base.toLowerCase()] = {
-    ...tokenMetadata,
-    address: base.toLowerCase(),
-    iconUrl: `images/contract/${logo}`,
-    aggregators: [],
-  };
-}
-
-export { STATIC_MAINNET_TOKEN_LIST };
-
-export const TOKEN_API_METASWAP_CODEFI_URL =
-  'https://token.api.cx.metamask.io/tokens/';
-export const MAX_TOKEN_ALLOWANCE_AMOUNT = new BigNumber(2)
-  .pow(256)
-  .minus(1)
-  .toString(10);
-// number with optional decimal point using a comma or dot
-export const NUM_W_OPT_DECIMAL_COMMA_OR_DOT_REGEX =
-  /^[0-9]{1,}([,.][0-9]{1,})?$/u;
-export const DECIMAL_REGEX = /\.(\d*)/u;
diff --git a/shared/constants/tokens.ts b/shared/constants/tokens.ts
new file mode 100644
index 000000000000..62eceb6b3512
--- /dev/null
+++ b/shared/constants/tokens.ts
@@ -0,0 +1,71 @@
+import contractMap from '@metamask/contract-metadata/contract-map.json';
+import BigNumber from 'bignumber.js';
+
+/**
+ * A normalized list of addresses exported as part of the contractMap in
+ * `@metamask/contract-metadata`. Used primarily to validate if manually entered
+ * contract addresses do not match one of our listed tokens
+ */
+export const LISTED_CONTRACT_ADDRESSES = Object.keys(contractMap).map(
+  (address) => address.toLowerCase(),
+);
+
+/**
+ * Details about a token asset.
+ */
+export type TokenDetails = {
+  /** The address of the selected 'TOKEN' or 'NFT' contract. */
+  address: string;
+  /** The symbol of the token. */
+  symbol?: string;
+  /** The name of the token. */
+  name?: string;
+  /** The number of decimals of the selected 'ERC20' asset. */
+  decimals?: number;
+  /** The id of the selected 'NFT' asset. */
+  tokenId?: number;
+  /** A URL to the image of the NFT or ERC20 icon. */
+  image?: string;
+  /** The standard of the selected asset. */
+  standard?: string;
+  /** True when the asset is a ERC721 token. */
+  isERC721?: boolean;
+};
+
+/**
+ * Represents a single entry in the static mainnet token list.
+ */
+type StaticMainnetToken = {
+  address: string;
+  iconUrl: string;
+  aggregators: string[];
+  symbol?: string;
+  decimals?: number;
+  name?: string;
+};
+
+const STATIC_MAINNET_TOKEN_LIST: Record<string, StaticMainnetToken> = {};
+
+for (const base of Object.keys(contractMap)) {
+  const { logo, ...tokenMetadata } =
+    contractMap[base as keyof typeof contractMap];
+  STATIC_MAINNET_TOKEN_LIST[base.toLowerCase()] = {
+    ...tokenMetadata,
+    address: base.toLowerCase(),
+    iconUrl: `images/contract/${logo}`,
+    aggregators: [],
+  };
+}
+
+export { STATIC_MAINNET_TOKEN_LIST };
+
+export const TOKEN_API_METASWAP_CODEFI_URL =
+  'https://token.api.cx.metamask.io/tokens/';
+export const MAX_TOKEN_ALLOWANCE_AMOUNT = new BigNumber(2)
+  .pow(256)
+  .minus(1)
+  .toString(10);
+// number with optional decimal point using a comma or dot
+export const NUM_W_OPT_DECIMAL_COMMA_OR_DOT_REGEX =
+  /^[0-9]{1,}([,.][0-9]{1,})?$/u;
+export const DECIMAL_REGEX = /\.(\d*)/u;
diff --git a/shared/lib/accounts/accounts.ts b/shared/lib/accounts/accounts.ts
index 2b3e5de98d8b..2153ff73aefc 100644
--- a/shared/lib/accounts/accounts.ts
+++ b/shared/lib/accounts/accounts.ts
@@ -11,7 +11,7 @@ import {
 } from '@metamask/eth-snap-keyring';
 import { Messenger } from '@metamask/messenger';
 import { SnapId } from '@metamask/snaps-sdk';
-import { HandleSnapRequest as SnapControllerHandleRequest } from '@metamask/snaps-controllers';
+import { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';
 import { MultichainNetworks } from '../../constants/multichain/networks';
 import { createSentryError } from '../error';
 import { captureException } from '../sentry';
@@ -111,7 +111,7 @@ export type WalletSnapClient = {
 
 export type MultichainWalletSnapClientMessenger = Messenger<
   'MultichainWalletSnapClient',
-  SnapControllerHandleRequest,
+  SnapControllerHandleRequestAction,
   never
 >;
 
diff --git a/shared/lib/accounts/snaps.ts b/shared/lib/accounts/snaps.ts
index 10a66cc33a64..ec62349fdac6 100644
--- a/shared/lib/accounts/snaps.ts
+++ b/shared/lib/accounts/snaps.ts
@@ -45,7 +45,7 @@ export function getSnapName(
   messenger: SnapKeyringBuilderMessenger,
 ) {
   const { currentLocale } = messenger.call('PreferencesController:getState');
-  const snap = messenger.call('SnapController:get', snapId);
+  const snap = messenger.call('SnapController:getSnap', snapId);
 
   if (!snap) {
     return stripSnapPrefix(snapId);
diff --git a/shared/lib/browser-runtime.utils.test.js b/shared/lib/browser-runtime.utils.test.ts
similarity index 70%
rename from shared/lib/browser-runtime.utils.test.js
rename to shared/lib/browser-runtime.utils.test.ts
index c91f818f21fc..89d1e91e35a2 100644
--- a/shared/lib/browser-runtime.utils.test.js
+++ b/shared/lib/browser-runtime.utils.test.ts
@@ -1,64 +1,71 @@
-import sinon from 'sinon';
 import Bowser from 'bowser';
 import browser from 'webextension-polyfill';
 import log from 'loglevel';
 import * as BrowserRuntimeUtil from './browser-runtime.utils';
 
-const mockLastError = { message: 'error', stack: [] };
+const mockLastError = { message: 'error', stack: [] as string[] };
+
+let mockRuntimeLastError: { message: string; stack?: string[] } | undefined;
+
+jest.mock('webextension-polyfill', () => ({
+  runtime: {
+    get lastError() {
+      return mockRuntimeLastError;
+    },
+  },
+}));
 
 describe('Browser Runtime Utils', () => {
-  beforeAll(() => {
-    sinon.replace(browser, 'runtime', {
-      lastError: undefined,
-    });
+  beforeEach(() => {
+    mockRuntimeLastError = undefined;
   });
 
   describe('checkForLastError', () => {
-    it('should return undefined if no lastError found', () => {
+    it('returns undefined if no lastError found', () => {
       expect(BrowserRuntimeUtil.checkForLastError()).toBeUndefined();
     });
 
-    it('should return the lastError (Error object) if lastError is found', () => {
-      sinon.stub(browser.runtime, 'lastError').value(mockLastError);
+    it('returns the lastError (Error object) if lastError is found', () => {
+      mockRuntimeLastError = mockLastError;
 
       expect(BrowserRuntimeUtil.checkForLastError()).toStrictEqual(
         mockLastError,
       );
     });
 
-    it('should return an Error object if the lastError is found with no stack', () => {
-      sinon
-        .stub(browser.runtime, 'lastError')
-        .value({ message: mockLastError.message });
+    it('returns an Error object if the lastError is found with no stack', () => {
+      mockRuntimeLastError = { message: mockLastError.message };
 
       const result = BrowserRuntimeUtil.checkForLastError();
 
       expect(result).toStrictEqual(expect.any(Error));
       expect(result).toHaveProperty('stack');
-      expect(result.message).toBe(mockLastError.message);
+      expect((result as Error).message).toBe(mockLastError.message);
     });
   });
 
   describe('checkForLastErrorAndLog', () => {
-    it('should log and return error if error was found', () => {
-      sinon.stub(browser.runtime, 'lastError').value({ ...mockLastError });
-      sinon.stub(log, 'error');
+    it('logs and returns error if error was found', () => {
+      mockRuntimeLastError = { ...mockLastError };
+      const logErrorSpy = jest
+        .spyOn(log, 'error')
+        .mockImplementation(() => undefined);
 
       const result = BrowserRuntimeUtil.checkForLastErrorAndLog();
 
-      expect(log.error.calledWith(result)).toBeTruthy();
+      expect(logErrorSpy).toHaveBeenCalledWith(result);
       expect(result).toStrictEqual(mockLastError);
-
-      log.error.restore();
     });
   });
 
   describe('getIsBrowserPrerenderBroken', () => {
-    it('should call Bowser.getParser when no parameter is passed', () => {
+    it('calls Bowser.getParser when no parameter is passed', () => {
       const spy = jest.spyOn(Bowser, 'getParser');
       BrowserRuntimeUtil.getIsBrowserPrerenderBroken();
       expect(spy).toHaveBeenCalled();
     });
+
+    // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
       ['windows', '112.0.0.0', 'Windows NT 10.0; Win64; x64'],
       ['windows', '120.0.0.0', 'Windows NT 10.0; Win64; x64'],
@@ -67,8 +74,8 @@ describe('Browser Runtime Utils', () => {
       ['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) => {
+      'returns false when given a chrome browser with working prerender in %s on version %s',
+      (_: string, version: string, os: string) => {
         const bowser = Bowser.getParser(
           `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`,
         );
@@ -76,6 +83,8 @@ describe('Browser Runtime Utils', () => {
         expect(result).toStrictEqual(false);
       },
     );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
       ['windows', '113.0.0.0', 'Windows NT 10.0; Win64; x64'],
       ['windows', '119.0.0.0', 'Windows NT 10.0; Win64; x64'],
@@ -84,8 +93,8 @@ describe('Browser Runtime Utils', () => {
       ['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) => {
+      'returns true when given a chrome browser with broken prerender in %s on version %s',
+      (_: string, version: string, os: string) => {
         const bowser = Bowser.getParser(
           `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`,
         );
@@ -93,6 +102,8 @@ describe('Browser Runtime Utils', () => {
         expect(result).toStrictEqual(true);
       },
     );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
       ['windows', '112.0.0.0', 'Windows NT 10.0; Win64; x64'],
       ['windows', '120.0.0.0', 'Windows NT 10.0; Win64; x64'],
@@ -101,8 +112,8 @@ describe('Browser Runtime Utils', () => {
       ['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) => {
+      'returns false when given an edge browser with working prerender in %s on version %s',
+      (_: string, version: string, os: string) => {
         const bowser = Bowser.getParser(
           `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/i${version} Safari/537.36 Edg/${version}`,
         );
@@ -110,6 +121,8 @@ describe('Browser Runtime Utils', () => {
         expect(result).toStrictEqual(false);
       },
     );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
       ['windows', '113.0.0.0', 'Windows NT 10.0; Win64; x64'],
       ['windows', '119.0.0.0', 'Windows NT 10.0; Win64; x64'],
@@ -118,8 +131,8 @@ describe('Browser Runtime Utils', () => {
       ['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) => {
+      'returns true when given an edge browser with broken prerender in %s on version %s',
+      (_: string, version: string, os: string) => {
         const bowser = Bowser.getParser(
           `Mozilla/5.0 (${os}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/i${version} Safari/537.36 Edg/${version}`,
         );
@@ -127,21 +140,24 @@ describe('Browser Runtime Utils', () => {
         expect(result).toStrictEqual(true);
       },
     );
-    it('should return false when given a firefox browser', () => {
+
+    it('returns 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', () => {
+
+    it('returns 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', () => {
+
+    it('returns 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',
       );
@@ -151,14 +167,15 @@ describe('Browser Runtime Utils', () => {
   });
 
   describe('getBrowserName', () => {
-    it('should return the name of the browser', () => {
+    it('returns the name of the 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.getBrowserName(bowser);
       expect(result).toStrictEqual('Firefox');
     });
-    it('should return Brave when given a brave browser', () => {
+
+    it('returns Brave when given a brave browser', () => {
       const bowser = Bowser.getParser(
         'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36',
       );
@@ -166,7 +183,7 @@ describe('Browser Runtime Utils', () => {
         userAgent:
           'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36',
         brave: {},
-      });
+      } as unknown as Navigator);
       expect(result).toStrictEqual('Brave');
     });
   });
diff --git a/shared/lib/browser-runtime.utils.js b/shared/lib/browser-runtime.utils.ts
similarity index 69%
rename from shared/lib/browser-runtime.utils.js
rename to shared/lib/browser-runtime.utils.ts
index 3d2640a84221..adf5a7423ba0 100644
--- a/shared/lib/browser-runtime.utils.js
+++ b/shared/lib/browser-runtime.utils.ts
@@ -24,23 +24,25 @@ import {
  * "
  *
  * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/lastError}
- * @returns {Error|undefined}
+ * @returns The last error, or undefined
  */
-export function checkForLastError() {
+export function checkForLastError(): Error | undefined {
   const { lastError } = browser.runtime;
   if (!lastError) {
     return undefined;
   }
   // if it quacks like an Error, its an Error
-  if (lastError.stack && lastError.message) {
-    return lastError;
+  if ('stack' in lastError && lastError.stack && lastError.message) {
+    return lastError as Error;
   }
   // repair incomplete error object (eg chromium v77)
   return new Error(lastError.message);
 }
 
-/** @returns {Error|undefined} */
-export function checkForLastErrorAndLog() {
+/**
+ * @returns The last error, or undefined
+ */
+export function checkForLastErrorAndLog(): Error | undefined {
   const error = checkForLastError();
 
   if (error) {
@@ -50,8 +52,10 @@ export function checkForLastErrorAndLog() {
   return error;
 }
 
-/** @returns {Error|undefined} */
-export function checkForLastErrorAndWarn() {
+/**
+ * @returns The last error, or undefined
+ */
+export function checkForLastErrorAndWarn(): Error | undefined {
   const error = checkForLastError();
 
   if (error) {
@@ -66,12 +70,12 @@ export function checkForLastErrorAndWarn() {
  * 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
+ * @param bowser - optional Bowser instance to check against
+ * @returns Whether the browser is affected by the prerender regression
  */
 export function getIsBrowserPrerenderBroken(
-  bowser = Bowser.getParser(window.navigator.userAgent),
-) {
+  bowser: Bowser.Parser.Parser = Bowser.getParser(window.navigator.userAgent),
+): boolean {
   return (
     (bowser.satisfies(BROKEN_PRERENDER_BROWSER_VERSIONS) &&
       !bowser.satisfies(FIXED_PRERENDER_BROWSER_VERSIONS)) ??
@@ -82,14 +86,14 @@ export function getIsBrowserPrerenderBroken(
 /**
  * Returns the name of the browser
  *
- * @param {Bowser} bowser - optional Bowser instance to check against
- * @param {Navigator} navigator - optional Navigator instance to check against
- * @returns {string} The name of the browser
+ * @param bowser - optional Bowser instance to check against
+ * @param navigator - optional Navigator instance to check against
+ * @returns The name of the browser
  */
 export function getBrowserName(
-  bowser = Bowser.getParser(window.navigator.userAgent),
-  navigator = window.navigator,
-) {
+  bowser: Bowser.Parser.Parser = Bowser.getParser(window.navigator.userAgent),
+  navigator: Navigator = window.navigator,
+): string {
   // Handle case for brave by parsing navigator.userAgent
   if ('brave' in navigator) {
     return 'Brave';
diff --git a/shared/lib/environment-type.ts b/shared/lib/environment-type.ts
index 046b9f4f088f..0ea29dca632a 100644
--- a/shared/lib/environment-type.ts
+++ b/shared/lib/environment-type.ts
@@ -39,3 +39,13 @@ const getEnvironmentTypeMemo = memoize((url: string) => {
  */
 export const getEnvironmentType = (url = window.location.href): string =>
   getEnvironmentTypeMemo(url);
+
+export const isInteractiveUI = (url = globalThis.location.href) => {
+  const environmentType = getEnvironmentType(url);
+
+  return (
+    environmentType === ENVIRONMENT_TYPE_POPUP ||
+    environmentType === ENVIRONMENT_TYPE_SIDEPANEL ||
+    environmentType === ENVIRONMENT_TYPE_FULLSCREEN
+  );
+};
diff --git a/shared/lib/error-utils.test.js b/shared/lib/error-utils.test.js
deleted file mode 100644
index a4fdf0b44024..000000000000
--- a/shared/lib/error-utils.test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import { fetchLocale } from './i18n';
-import { SUPPORT_LINK } from './ui-utils';
-import { maybeGetLocaleContext, getErrorHtml } from './error-utils';
-
-jest.mock('./i18n', () => ({
-  fetchLocale: jest.fn(),
-  loadRelativeTimeFormatLocaleData: jest.fn(),
-}));
-jest.mock('./deep-linking', () => ({
-  openCustomProtocol: jest.fn(),
-}));
-
-jest.mock('webextension-polyfill', () => {
-  return {
-    runtime: {
-      reload: jest.fn(),
-    },
-  };
-});
-
-describe('Error utils Tests', function () {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-
-    global.platform = {
-      openTab: jest.fn(),
-    };
-  });
-
-  afterAll(() => {
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-    delete global.platform;
-  });
-  it('should get error html', async function () {
-    const mockStore = {
-      localeMessages: {
-        current: {
-          troubleStartingTitle: {
-            message: 'MetaMask had trouble starting.',
-          },
-          troubleStartingMessage: {
-            message:
-              'This error could be intermittent, so try restarting the extension.',
-          },
-          restartMetamask: {
-            message: 'Restart MetaMask',
-          },
-          stillGettingMessage: {
-            message: 'Still getting this message?',
-          },
-          errorPageContactSupport: {
-            message: 'Contact support',
-          },
-        },
-      },
-      metamask: {
-        currentLocale: 'en',
-      },
-    };
-
-    const error = new Error('Test error');
-    fetchLocale.mockReturnValue(mockStore.localeMessages.current);
-    const localeContext = await maybeGetLocaleContext(
-      mockStore.metamask.currentLocale,
-    );
-    const errorHtml = getErrorHtml(
-      'troubleStarting',
-      error,
-      localeContext,
-      SUPPORT_LINK,
-    );
-    const currentLocale = mockStore.localeMessages.current;
-    const troubleStartingTitle = currentLocale.troubleStartingTitle.message;
-    const troubleStartingMessage = currentLocale.troubleStartingMessage.message;
-    const restartMetamaskMessage = currentLocale.restartMetamask.message;
-    const stillGettingMessageMessage =
-      currentLocale.stillGettingMessage.message;
-    const errorPageContactSupport =
-      currentLocale.errorPageContactSupport.message;
-
-    expect(errorHtml).toContain(troubleStartingMessage);
-    expect(errorHtml).toContain(troubleStartingTitle);
-    expect(errorHtml).toContain(restartMetamaskMessage);
-    expect(errorHtml).toContain(stillGettingMessageMessage);
-    expect(errorHtml).toContain(errorPageContactSupport);
-  });
-});
diff --git a/shared/lib/error-utils.test.ts b/shared/lib/error-utils.test.ts
new file mode 100644
index 000000000000..05e2b2b47c02
--- /dev/null
+++ b/shared/lib/error-utils.test.ts
@@ -0,0 +1,276 @@
+import {
+  type I18NMessageDict,
+  fetchLocale,
+  loadRelativeTimeFormatLocaleData,
+} from './i18n';
+import { SUPPORT_LINK } from './ui-utils';
+import {
+  maybeGetLocaleContext,
+  getErrorHtml,
+  getLocaleContext,
+  setupLocale,
+  getErrorHtmlBase,
+} from './error-utils';
+import getFirstPreferredLangCode from './get-first-preferred-lang-code';
+
+jest.mock('./i18n', () => ({
+  fetchLocale: jest.fn(),
+  loadRelativeTimeFormatLocaleData: jest.fn(),
+}));
+jest.mock('./deep-linking', () => ({
+  openCustomProtocol: jest.fn(),
+}));
+jest.mock('./get-first-preferred-lang-code', () => jest.fn());
+jest.mock('./switch-direction', () => ({
+  switchDirectionForPreferredLocale: jest.fn(),
+}));
+
+jest.mock('webextension-polyfill', () => {
+  return {
+    runtime: {
+      reload: jest.fn(),
+    },
+  };
+});
+
+const enMessages: I18NMessageDict = {
+  troubleStartingTitle: { message: 'MetaMask had trouble starting.' },
+  troubleStartingMessage: {
+    message:
+      'This error could be intermittent, so try restarting the extension.',
+  },
+  somethingIsWrong: { message: 'Something is wrong.' },
+  restartMetamask: { message: 'Restart MetaMask' },
+  stillGettingMessage: { message: 'Still getting this message?' },
+  errorPageContactSupport: { message: 'Contact support' },
+  errorDetails: { message: 'Error details' },
+  reportThisError: { message: 'Report this error' },
+  errorLegalTextSummary: { message: 'Legal summary' },
+  errorLegalTextFirstInfo: { message: 'First legal info' },
+  errorLegalTextSecondInfo: { message: 'Second legal info' },
+  errorLegalTextNoPersonalInfo: { message: 'No personal info' },
+};
+
+describe('Error utils Tests', function () {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+    // Clear the memoize cache so each test gets fresh setupLocale calls
+    setupLocale.cache.clear?.();
+
+    (global as Record<string, unknown>).platform = {
+      openTab: jest.fn(),
+    };
+  });
+
+  afterAll(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+    delete (global as Record<string, unknown>).platform;
+  });
+
+  describe('getLocaleContext', () => {
+    it('returns the message from currentLocaleMessages when the key exists', () => {
+      const current: I18NMessageDict = { greeting: { message: 'Hola' } };
+      const en: I18NMessageDict = { greeting: { message: 'Hello' } };
+      const t = getLocaleContext(current, en);
+      expect(t('greeting')).toBe('Hola');
+    });
+
+    it('falls back to enLocaleMessages when key is missing from currentLocaleMessages', () => {
+      const current: I18NMessageDict = {};
+      const en: I18NMessageDict = { greeting: { message: 'Hello' } };
+      const t = getLocaleContext(current, en);
+      expect(t('greeting')).toBe('Hello');
+    });
+
+    it('returns undefined when the key is missing from both message dicts', () => {
+      const t = getLocaleContext({}, {});
+      expect(t('nonExistentKey')).toBeUndefined();
+    });
+  });
+
+  describe('setupLocale', () => {
+    it('reuses the en locale for currentLocaleMessages when currentLocale is "en"', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const result = await setupLocale('en');
+
+      // fetchLocale should only be called once (for 'en'); the same promise is reused
+      expect(fetchLocale).toHaveBeenCalledTimes(1);
+      expect(fetchLocale).toHaveBeenCalledWith('en');
+      expect(result.enLocaleMessages).toBe(result.currentLocaleMessages);
+    });
+
+    it('fetches a separate locale when currentLocale differs from "en"', async () => {
+      const esMessages: I18NMessageDict = {
+        troubleStartingTitle: { message: 'MetaMask tuvo problemas.' },
+      };
+      jest
+        .mocked(fetchLocale)
+        .mockResolvedValueOnce(enMessages) // en fetch
+        .mockResolvedValueOnce(esMessages); // es fetch
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const result = await setupLocale('es');
+
+      expect(fetchLocale).toHaveBeenCalledWith('en');
+      expect(fetchLocale).toHaveBeenCalledWith('es');
+      expect(result.enLocaleMessages).toStrictEqual(enMessages);
+      expect(result.currentLocaleMessages).toStrictEqual(esMessages);
+    });
+
+    it('returns an empty object for currentLocaleMessages when currentLocale is undefined', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const result = await setupLocale(undefined);
+
+      expect(result.currentLocaleMessages).toStrictEqual({});
+      expect(result.enLocaleMessages).toStrictEqual(enMessages);
+    });
+  });
+
+  describe('maybeGetLocaleContext', () => {
+    it('uses getFirstPreferredLangCode when no currentLocale is provided', async () => {
+      jest.mocked(getFirstPreferredLangCode).mockResolvedValue('fr');
+      const frMessages: I18NMessageDict = {
+        greeting: { message: 'Bonjour' },
+      };
+      jest
+        .mocked(fetchLocale)
+        .mockResolvedValueOnce(enMessages) // en fetch
+        .mockResolvedValueOnce(frMessages); // fr fetch
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const context = await maybeGetLocaleContext();
+
+      expect(getFirstPreferredLangCode).toHaveBeenCalledTimes(1);
+      expect(context.preferredLocale).toBe('fr');
+      expect(context.t('greeting')).toBe('Bonjour');
+    });
+
+    it('falls back gracefully and returns an identity t function when an error occurs', async () => {
+      jest.mocked(fetchLocale).mockRejectedValue(new Error('Network failure'));
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+      jest.spyOn(console, 'error').mockImplementation(() => undefined);
+
+      const context = await maybeGetLocaleContext('en');
+
+      expect(console.error).toHaveBeenCalled();
+      expect(context.preferredLocale).toBe('en');
+      expect(context.t('anyKey')).toBe('anyKey');
+    });
+
+    it('falls back to "en" as preferredLocale when locale detection also fails', async () => {
+      jest
+        .mocked(getFirstPreferredLangCode)
+        .mockRejectedValue(new Error('Detection failure'));
+      jest.mocked(fetchLocale).mockRejectedValue(new Error('Network failure'));
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+      jest.spyOn(console, 'error').mockImplementation(() => undefined);
+
+      const context = await maybeGetLocaleContext();
+
+      expect(context.preferredLocale).toBe('en');
+    });
+  });
+
+  describe('getErrorHtmlBase', () => {
+    it('wraps content in the critical-error container markup', () => {
+      const html = getErrorHtmlBase('<p>test body</p>');
+      expect(html).toContain('critical-error__container');
+      expect(html).toContain('critical-error');
+      expect(html).toContain('<p>test body</p>');
+    });
+  });
+
+  describe('getErrorHtml', () => {
+    it('renders the troubleStarting error with support link and error details', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const error = new Error('Test error');
+      const localeContext = await maybeGetLocaleContext('en');
+      const html = getErrorHtml(
+        'troubleStarting',
+        error,
+        localeContext,
+        SUPPORT_LINK,
+      );
+
+      expect(html).toContain(enMessages.troubleStartingTitle.message);
+      expect(html).toContain(enMessages.troubleStartingMessage.message);
+      expect(html).toContain(enMessages.restartMetamask.message);
+      expect(html).toContain(enMessages.stillGettingMessage.message);
+      expect(html).toContain(enMessages.errorPageContactSupport.message);
+      expect(html).toContain('Test error');
+    });
+
+    it('renders the somethingIsWrong error message when errorKey is "somethingIsWrong"', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const localeContext = await maybeGetLocaleContext('en');
+      const html = getErrorHtml('somethingIsWrong', undefined, localeContext);
+
+      expect(html).toContain(enMessages.somethingIsWrong.message);
+    });
+
+    it('omits the support link footer when supportLink is not provided', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const localeContext = await maybeGetLocaleContext('en');
+      const html = getErrorHtml('troubleStarting', undefined, localeContext);
+
+      expect(html).not.toContain('critical-error__footer');
+      expect(html).not.toContain(enMessages.stillGettingMessage.message);
+    });
+
+    it('omits the error details section when error has no message', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const localeContext = await maybeGetLocaleContext('en');
+      const html = getErrorHtml('troubleStarting', undefined, localeContext);
+
+      expect(html).not.toContain('critical-error__details');
+    });
+
+    it('includes the error details section when the error has a message', async () => {
+      jest.mocked(fetchLocale).mockResolvedValue(enMessages);
+      jest
+        .mocked(loadRelativeTimeFormatLocaleData)
+        .mockResolvedValue(undefined);
+
+      const error = new Error('Something broke');
+      const localeContext = await maybeGetLocaleContext('en');
+      const html = getErrorHtml('troubleStarting', error, localeContext);
+
+      expect(html).toContain('critical-error__details');
+      expect(html).toContain('Something broke');
+    });
+  });
+});
diff --git a/shared/lib/error-utils.js b/shared/lib/error-utils.ts
similarity index 77%
rename from shared/lib/error-utils.js
rename to shared/lib/error-utils.ts
index a0ade6b6f259..f36790d8d262 100644
--- a/shared/lib/error-utils.js
+++ b/shared/lib/error-utils.ts
@@ -1,14 +1,34 @@
 import { memoize, escape as lodashEscape } from 'lodash';
+import type { ErrorLike } from '../constants/errors';
+import type { I18NMessageDict } from './i18n';
 import { fetchLocale, loadRelativeTimeFormatLocaleData } from './i18n';
 import getFirstPreferredLangCode from './get-first-preferred-lang-code';
 import { switchDirectionForPreferredLocale } from './switch-direction';
 
 const defaultLocale = 'en';
-const _setupLocale = async (currentLocale) => {
+
+/**
+ * The context returned by {@link maybeGetLocaleContext} and accepted by
+ * {@link getErrorHtml}.
+ */
+export type LocaleContext = {
+  preferredLocale: string;
+  t: (key: string) => string | undefined;
+};
+
+const _setupLocale = async (
+  currentLocale: string | undefined,
+): Promise<{
+  currentLocaleMessages: I18NMessageDict;
+  enLocaleMessages: I18NMessageDict;
+}> => {
   const enRelativeTime = loadRelativeTimeFormatLocaleData(defaultLocale);
   const enLocale = fetchLocale(defaultLocale);
 
-  const promises = [enRelativeTime, enLocale];
+  const promises: Promise<I18NMessageDict | void>[] = [
+    enRelativeTime,
+    enLocale,
+  ];
   if (currentLocale === defaultLocale) {
     // enLocaleMessages and currentLocaleMessages are the same; reuse enLocale
     promises.push(enLocale); // currentLocaleMessages
@@ -18,18 +38,24 @@ const _setupLocale = async (currentLocale) => {
     promises.push(loadRelativeTimeFormatLocaleData(currentLocale));
   } else {
     // currentLocale is not set
-    promises.push(Promise.resolve({})); // currentLocaleMessages
+    promises.push(Promise.resolve({}) as Promise<I18NMessageDict>); // currentLocaleMessages
   }
 
   const [, enLocaleMessages, currentLocaleMessages] =
     await Promise.all(promises);
-  return { currentLocaleMessages, enLocaleMessages };
+  return {
+    currentLocaleMessages: currentLocaleMessages as I18NMessageDict,
+    enLocaleMessages: enLocaleMessages as I18NMessageDict,
+  };
 };
 
 export const setupLocale = memoize(_setupLocale);
 
-export const getLocaleContext = (currentLocaleMessages, enLocaleMessages) => {
-  return (key) => {
+export const getLocaleContext = (
+  currentLocaleMessages: I18NMessageDict,
+  enLocaleMessages: I18NMessageDict,
+): ((key: string) => string | undefined) => {
+  return (key: string) => {
     let message = currentLocaleMessages[key]?.message;
     if (!message && enLocaleMessages[key]) {
       message = enLocaleMessages[key].message;
@@ -38,7 +64,7 @@ export const getLocaleContext = (currentLocaleMessages, enLocaleMessages) => {
   };
 };
 
-export function getErrorHtmlBase(errorBody) {
+export function getErrorHtmlBase(errorBody: string): string {
   return `
     <div class="critical-error__container">
       <div class="critical-error">
@@ -67,11 +93,13 @@ export function getErrorHtmlBase(errorBody) {
  *
  * Does not throw.
  *
- * @param {string} [currentLocale] - The current locale
- * @returns {Promise<{preferredLocale: string, t: (any) => any}>} A promise that resolves to an object containing the preferred locale and a translation function.
+ * @param currentLocale - The current locale
+ * @returns A promise that resolves to an object containing the preferred locale and a translation function.
  */
-export async function maybeGetLocaleContext(currentLocale) {
-  let preferredLocale;
+export async function maybeGetLocaleContext(
+  currentLocale?: string,
+): Promise<LocaleContext> {
+  let preferredLocale: string | undefined;
   try {
     preferredLocale = currentLocale ?? (await getFirstPreferredLangCode());
     const response = await setupLocale(preferredLocale);
@@ -87,13 +115,18 @@ export async function maybeGetLocaleContext(currentLocale) {
 /**
  * Get the HTML for a critical error message.
  *
- * @param {import('../../ui/helpers/utils/display-critical-error').CriticalErrorTranslationKey} errorKey - The key for the error message.
- * @param {ErrorLike} error - The error object to log.
- * @param {{preferredLocale: string, t: (string) => string}} localeContext - The MetaMask state containing the current locale and translation function.
- * @param {string} [supportLink] - The support link to include in the footer.
- * @returns {string} The HTML string for the critical error message.
+ * @param errorKey - The key for the error message.
+ * @param error - The error object to log.
+ * @param localeContext - The MetaMask state containing the current locale and translation function.
+ * @param supportLink - The support link to include in the footer.
+ * @returns The HTML string for the critical error message.
  */
-export function getErrorHtml(errorKey, error, localeContext, supportLink) {
+export function getErrorHtml(
+  errorKey: string,
+  error: ErrorLike | undefined,
+  localeContext: LocaleContext,
+  supportLink?: string,
+): string {
   switchDirectionForPreferredLocale(localeContext.preferredLocale);
   const { t } = localeContext;
 
@@ -127,7 +160,7 @@ export function getErrorHtml(errorKey, error, localeContext, supportLink) {
 
   /**
    * The pattern ${errorKey === 'somethingIsWrong' ? t('somethingIsWrong') : ''}
-   * is necessary because we we need linter to see the string
+   * is necessary because we need linter to see the string
    * of the locale keys. If we use the variable directly, the linter will not
    * see the string and will not be able to check if the locale key exists.
    */
diff --git a/shared/lib/gas.utils.test.js b/shared/lib/gas.utils.test.ts
similarity index 56%
rename from shared/lib/gas.utils.test.js
rename to shared/lib/gas.utils.test.ts
index 04df90dbc481..7a7842ae98e0 100644
--- a/shared/lib/gas.utils.test.js
+++ b/shared/lib/gas.utils.test.ts
@@ -1,9 +1,9 @@
-const { addHexPrefix } = require('ethereumjs-util');
-const {
+import { addHexPrefix } from 'ethereumjs-util';
+import {
   getMaximumGasTotalInHexWei,
   getMinimumGasTotalInHexWei,
-} = require('./gas.utils');
-const { Numeric } = require('./Numeric');
+} from './gas.utils';
+import { Numeric } from './Numeric';
 
 const feesToTest = [10, 24, 90];
 const tipsToTest = [2, 10, 50];
@@ -131,4 +131,106 @@ describe('gas utils', () => {
       });
     });
   });
+
+  describe('error cases', () => {
+    describe('getMaximumGasTotalInHexWei', () => {
+      it('throws when neither gasPrice nor maxFeePerGas is provided', () => {
+        expect(() =>
+          getMaximumGasTotalInHexWei({ gasLimit: '0x5208' }),
+        ).toThrow(
+          'getMaximumGasTotalInHexWei requires gasPrice be provided to calculate legacy gas total',
+        );
+      });
+
+      it('throws when called with no arguments', () => {
+        expect(() => getMaximumGasTotalInHexWei()).toThrow(
+          'getMaximumGasTotalInHexWei requires gasPrice be provided to calculate legacy gas total',
+        );
+      });
+    });
+
+    describe('getMinimumGasTotalInHexWei', () => {
+      it('throws when both gasPrice and EIP-1559 fields are provided', () => {
+        expect(() =>
+          getMinimumGasTotalInHexWei({
+            gasLimitNoBuffer: '0x5208',
+            gasPrice: '0xa',
+            maxFeePerGas: '0xa',
+            maxPriorityFeePerGas: '0x2',
+            baseFeePerGas: '0x8',
+          }),
+        ).toThrow(
+          'getMinimumGasTotalInHexWei expects either gasPrice OR the EIP-1559 gas fields, but both were provided',
+        );
+      });
+
+      it('throws when neither gasPrice nor EIP-1559 fields are provided', () => {
+        expect(() =>
+          getMinimumGasTotalInHexWei({ gasLimitNoBuffer: '0x5208' }),
+        ).toThrow(
+          'getMinimumGasTotalInHexWei expects either gasPrice OR the EIP-1559 gas fields, but neither were provided',
+        );
+      });
+
+      it('throws when called with no arguments', () => {
+        expect(() => getMinimumGasTotalInHexWei()).toThrow(
+          'getMinimumGasTotalInHexWei expects either gasPrice OR the EIP-1559 gas fields, but neither were provided',
+        );
+      });
+
+      it('throws when EIP-1559 fields are present but baseFeePerGas is missing', () => {
+        expect(() =>
+          getMinimumGasTotalInHexWei({
+            gasLimitNoBuffer: '0x5208',
+            maxFeePerGas: '0xa',
+            maxPriorityFeePerGas: '0x2',
+          }),
+        ).toThrow(
+          'getMinimumGasTotalInHexWei requires baseFeePerGas be provided when calculating EIP-1559 totals',
+        );
+      });
+
+      it('throws when EIP-1559 fields are present but maxFeePerGas is missing', () => {
+        expect(() =>
+          getMinimumGasTotalInHexWei({
+            gasLimitNoBuffer: '0x5208',
+            maxPriorityFeePerGas: '0x2',
+            baseFeePerGas: '0x8',
+          }),
+        ).toThrow(
+          'getMinimumGasTotalInHexWei requires maxFeePerGas and maxPriorityFeePerGas be provided when calculating EIP-1559 totals',
+        );
+      });
+
+      it('throws when EIP-1559 fields are present but maxPriorityFeePerGas is missing', () => {
+        expect(() =>
+          getMinimumGasTotalInHexWei({
+            gasLimitNoBuffer: '0x5208',
+            maxFeePerGas: '0xa',
+            baseFeePerGas: '0x8',
+          }),
+        ).toThrow(
+          'getMinimumGasTotalInHexWei requires maxFeePerGas and maxPriorityFeePerGas be provided when calculating EIP-1559 totals',
+        );
+      });
+    });
+  });
+
+  describe('default parameter behaviour', () => {
+    it('getMaximumGasTotalInHexWei uses 0x0 as default gasLimit', () => {
+      const result = getMaximumGasTotalInHexWei({
+        maxFeePerGas: '0xa',
+      });
+      expect(new Numeric(result, 16).toBase(10).toString()).toStrictEqual('0');
+    });
+
+    it('getMinimumGasTotalInHexWei uses 0x0 as default gasLimitNoBuffer', () => {
+      const result = getMinimumGasTotalInHexWei({
+        maxFeePerGas: '0xa',
+        maxPriorityFeePerGas: '0x2',
+        baseFeePerGas: '0x8',
+      });
+      expect(new Numeric(result, 16).toBase(10).toString()).toStrictEqual('0');
+    });
+  });
 });
diff --git a/shared/lib/gas.utils.js b/shared/lib/gas.utils.ts
similarity index 51%
rename from shared/lib/gas.utils.js
rename to shared/lib/gas.utils.ts
index c73881db4d39..a9d0a6a4ccd6 100644
--- a/shared/lib/gas.utils.js
+++ b/shared/lib/gas.utils.ts
@@ -1,26 +1,40 @@
 import { Numeric } from './Numeric';
 
+type GetMaximumGasTotalInHexWeiOptions = {
+  gasLimit?: string;
+  gasPrice?: string;
+  maxFeePerGas?: string;
+};
+
+type GetMinimumGasTotalInHexWeiOptions = {
+  gasLimitNoBuffer?: string;
+  gasPrice?: string;
+  maxFeePerGas?: string;
+  maxPriorityFeePerGas?: string;
+  baseFeePerGas?: string;
+};
+
 /**
  * Accepts an options bag containing gas fee parameters in hex format and
  * returns a gasTotal parameter representing the maximum amount of wei the
  * transaction will cost.
  *
- * @param {object} options - gas fee parameters object
- * @param {string} [options.gasLimit] - the maximum amount of gas to allow this
- *  transaction to consume. Value is a hex string
- * @param {string} [options.gasPrice] - The fee in wei to pay per gas used.
- *  gasPrice is only set on Legacy type transactions. Value is hex string
- * @param {string} [options.maxFeePerGas] - The maximum fee in wei to pay per
- *  gas used. maxFeePerGas is introduced in EIP 1559 and represents the max
- *  total a user will pay per gas. Actual cost is determined by baseFeePerGas
- *  on the block + maxPriorityFeePerGas. Value is hex string
- * @returns {string} The maximum total cost of transaction in hex wei string
+ * @param options - gas fee parameters object
+ * @param options.gasLimit - the maximum amount of gas to allow this
+ * transaction to consume. Value is a hex string
+ * @param options.gasPrice - The fee in wei to pay per gas used.
+ * gasPrice is only set on Legacy type transactions. Value is hex string
+ * @param options.maxFeePerGas - The maximum fee in wei to pay per
+ * gas used. maxFeePerGas is introduced in EIP 1559 and represents the max
+ * total a user will pay per gas. Actual cost is determined by baseFeePerGas
+ * on the block + maxPriorityFeePerGas. Value is hex string
+ * @returns The maximum total cost of transaction in hex wei string
  */
 export function getMaximumGasTotalInHexWei({
   gasLimit = '0x0',
   gasPrice,
   maxFeePerGas,
-} = {}) {
+}: GetMaximumGasTotalInHexWeiOptions = {}): string {
   if (maxFeePerGas) {
     return new Numeric(gasLimit, 16)
       .times(new Numeric(maxFeePerGas, 16))
@@ -42,19 +56,19 @@ export function getMaximumGasTotalInHexWei({
  * returns a gasTotal parameter representing the minimum amount of wei the
  * transaction will cost. For gasPrice types this is the same as max.
  *
- * @param {object} options - gas fee parameters object
- * @param {string} [options.gasLimitNoBuffer] - gas limit without buffer
- * @param {string} [options.gasPrice] - The fee in wei to pay per gas used.
- *  gasPrice is only set on Legacy type transactions. Value is hex string
- * @param {string} [options.maxFeePerGas] - The maximum fee in wei to pay per
- *  gas used. maxFeePerGas is introduced in EIP 1559 and represents the max
- *  total a user will pay per gas. Actual cost is determined by baseFeePerGas
- *  on the block + maxPriorityFeePerGas. Value is hex string
- * @param {string} [options.maxPriorityFeePerGas] - The maximum fee in wei to
- *  pay a miner to include this transaction.
- * @param {string} [options.baseFeePerGas] - The estimated block baseFeePerGas
- *  that will be burned. Introduced in EIP 1559. Value in hex wei.
- * @returns {string} The minimum total cost of transaction in hex wei string
+ * @param options - gas fee parameters object
+ * @param options.gasLimitNoBuffer - gas limit without buffer
+ * @param options.gasPrice - The fee in wei to pay per gas used.
+ * gasPrice is only set on Legacy type transactions. Value is hex string
+ * @param options.maxFeePerGas - The maximum fee in wei to pay per
+ * gas used. maxFeePerGas is introduced in EIP 1559 and represents the max
+ * total a user will pay per gas. Actual cost is determined by baseFeePerGas
+ * on the block + maxPriorityFeePerGas. Value is hex string
+ * @param options.maxPriorityFeePerGas - The maximum fee in wei to
+ * pay a miner to include this transaction.
+ * @param options.baseFeePerGas - The estimated block baseFeePerGas
+ * that will be burned. Introduced in EIP 1559. Value in hex wei.
+ * @returns The minimum total cost of transaction in hex wei string
  */
 export function getMinimumGasTotalInHexWei({
   gasLimitNoBuffer = '0x0',
@@ -62,7 +76,7 @@ export function getMinimumGasTotalInHexWei({
   maxPriorityFeePerGas,
   maxFeePerGas,
   baseFeePerGas,
-} = {}) {
+}: GetMinimumGasTotalInHexWeiOptions = {}): string {
   const isEIP1559Estimate = Boolean(
     maxFeePerGas || maxPriorityFeePerGas || baseFeePerGas,
   );
@@ -95,11 +109,15 @@ export function getMinimumGasTotalInHexWei({
       gasPrice,
     });
   }
-  const minimumFeePerGas = new Numeric(baseFeePerGas, 16)
-    .add(new Numeric(maxPriorityFeePerGas, 16))
+  // baseFeePerGas, maxPriorityFeePerGas, and maxFeePerGas are guaranteed to
+  // be defined here due to the validation checks above.
+  const minimumFeePerGas = new Numeric(baseFeePerGas as string, 16)
+    .add(new Numeric(maxPriorityFeePerGas as string, 16))
     .toString();
 
-  if (new Numeric(minimumFeePerGas, 16).greaterThan(maxFeePerGas, 16)) {
+  if (
+    new Numeric(minimumFeePerGas, 16).greaterThan(maxFeePerGas as string, 16)
+  ) {
     return getMaximumGasTotalInHexWei({
       gasLimit: gasLimitNoBuffer,
       maxFeePerGas,
diff --git a/shared/lib/get-first-preferred-lang-code.test.ts b/shared/lib/get-first-preferred-lang-code.test.ts
new file mode 100644
index 000000000000..ea7a16032216
--- /dev/null
+++ b/shared/lib/get-first-preferred-lang-code.test.ts
@@ -0,0 +1,137 @@
+import browser from 'webextension-polyfill';
+import getFirstPreferredLangCode from './get-first-preferred-lang-code';
+
+jest.mock('webextension-polyfill', () => ({
+  i18n: {
+    getAcceptLanguages: jest.fn(),
+  },
+}));
+
+const mockGetAcceptLanguages = browser.i18n
+  .getAcceptLanguages as jest.MockedFunction<
+  typeof browser.i18n.getAcceptLanguages
+>;
+
+describe('getFirstPreferredLangCode', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns the first supported locale from the preferred list', async () => {
+    mockGetAcceptLanguages.mockResolvedValue(['fr', 'de']);
+
+    const result = await getFirstPreferredLangCode();
+
+    expect(result).toBe('fr');
+  });
+
+  it('returns the first supported locale when earlier entries are unsupported', async () => {
+    mockGetAcceptLanguages.mockResolvedValue(['xx', 'yy', 'de']);
+
+    const result = await getFirstPreferredLangCode();
+
+    expect(result).toBe('de');
+  });
+
+  it('returns en when no preferred locale is supported', async () => {
+    mockGetAcceptLanguages.mockResolvedValue(['xx', 'yy']);
+
+    const result = await getFirstPreferredLangCode();
+
+    expect(result).toBe('en');
+  });
+
+  it('returns en when the preferred locales list is empty', async () => {
+    mockGetAcceptLanguages.mockResolvedValue([]);
+
+    const result = await getFirstPreferredLangCode();
+
+    expect(result).toBe('en');
+  });
+
+  describe('when getAcceptLanguages throws (Brave browser)', () => {
+    beforeEach(() => {
+      jest.spyOn(console, 'error').mockImplementation(() => undefined);
+    });
+
+    afterEach(() => {
+      jest.mocked(console.error).mockRestore();
+    });
+
+    it('returns en', async () => {
+      mockGetAcceptLanguages.mockRejectedValue(new Error('Not implemented'));
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('en');
+    });
+  });
+
+  describe('when getAcceptLanguages returns undefined', () => {
+    it('returns en', async () => {
+      mockGetAcceptLanguages.mockResolvedValue(
+        undefined as unknown as string[],
+      );
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('en');
+    });
+  });
+
+  describe('Chinese locale handling', () => {
+    it('maps zh to zh_CN via the pre-seeded default', async () => {
+      mockGetAcceptLanguages.mockResolvedValue(['zh']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('zh_CN');
+    });
+
+    it('maps zh-cn (hyphen form) to zh_CN', async () => {
+      mockGetAcceptLanguages.mockResolvedValue(['zh-cn']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('zh_CN');
+    });
+
+    it('maps zh-tw (hyphen form) to zh_TW', async () => {
+      mockGetAcceptLanguages.mockResolvedValue(['zh-tw']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('zh_TW');
+    });
+  });
+
+  describe('regional code fallback', () => {
+    it('falls back to the base language code when only the base locale is supported', async () => {
+      // fr-CA is not a supported locale but fr is; the result should be fr
+      mockGetAcceptLanguages.mockResolvedValue(['fr-CA']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('fr');
+    });
+  });
+
+  describe('locale code normalisation', () => {
+    it('is case-insensitive for locale codes', async () => {
+      mockGetAcceptLanguages.mockResolvedValue(['FR']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('fr');
+    });
+
+    it('normalises underscores to hyphens before matching', async () => {
+      // Some browsers may return zh_TW; the module lowercases and replaces '_' with '-'
+      mockGetAcceptLanguages.mockResolvedValue(['zh_TW']);
+
+      const result = await getFirstPreferredLangCode();
+
+      expect(result).toBe('zh_TW');
+    });
+  });
+});
diff --git a/shared/lib/get-first-preferred-lang-code.js b/shared/lib/get-first-preferred-lang-code.ts
similarity index 78%
rename from shared/lib/get-first-preferred-lang-code.js
rename to shared/lib/get-first-preferred-lang-code.ts
index 38481a127db0..a25ca5c472fe 100644
--- a/shared/lib/get-first-preferred-lang-code.js
+++ b/shared/lib/get-first-preferred-lang-code.ts
@@ -1,14 +1,13 @@
 import browser from 'webextension-polyfill';
-// TODO: Remove restricted import
 // eslint-disable-next-line import-x/no-restricted-paths
 import allLocales from '../../app/_locales/index.json';
 
 // ensure that we default users with browser language code 'zh' to the supported 'zh_CN' language code
-const existingLocaleCodes = { zh: 'zh_CN' };
+const existingLocaleCodes: Record<string, string> = { zh: 'zh_CN' };
 
 // mapping some browsers return hyphen instead underscore in locale codes (e.g. zh_TW -> zh-tw)
 allLocales.forEach((locale) => {
-  if (locale && locale.code) {
+  if (locale?.code) {
     existingLocaleCodes[locale.code.toLowerCase().replace('_', '-')] =
       locale.code;
   }
@@ -18,15 +17,16 @@ allLocales.forEach((locale) => {
  * Returns a preferred language code, based on settings within the user's browser. If we have no translations for the
  * users preferred locales, 'en' is returned.
  *
- * @returns {Promise<string>} Promises a locale code, either one from the user's preferred list that we have a translation for, or 'en'
+ * @returns Promises a locale code, either one from the user's preferred list that we have a translation for, or 'en'
  */
-export default async function getFirstPreferredLangCode() {
-  let userPreferredLocaleCodes;
+export default async function getFirstPreferredLangCode(): Promise<string> {
+  let userPreferredLocaleCodes: string[] | undefined;
 
   try {
     userPreferredLocaleCodes = await browser.i18n.getAcceptLanguages();
   } catch (e) {
     // Brave currently throws when calling getAcceptLanguages, so this handles that.
+    console.error('Failed to get accepted languages from browser', e);
     userPreferredLocaleCodes = [];
   }
 
@@ -54,5 +54,5 @@ export default async function getFirstPreferredLangCode() {
     firstPreferredLangCode = firstPreferredLangCode.split('-')[0];
   }
 
-  return existingLocaleCodes[firstPreferredLangCode] || 'en';
+  return existingLocaleCodes[firstPreferredLangCode ?? ''] || 'en';
 }
diff --git a/shared/lib/hardware-wallet-recovery-metrics.test.ts b/shared/lib/hardware-wallet-recovery-metrics.test.ts
new file mode 100644
index 000000000000..0df90ab5b594
--- /dev/null
+++ b/shared/lib/hardware-wallet-recovery-metrics.test.ts
@@ -0,0 +1,308 @@
+/* eslint-disable @typescript-eslint/naming-convention, camelcase -- Segment-shaped assertions and destructuring match analytics schema */
+import {
+  Category,
+  ErrorCode,
+  HardwareWalletError,
+  Severity,
+} from '@metamask/hw-wallet-sdk';
+import {
+  MetaMetricsHardwareWalletDeviceType,
+  MetaMetricsHardwareWalletRecoveryErrorType,
+  MetaMetricsHardwareWalletRecoveryLocation,
+} from '../constants/metametrics';
+import {
+  buildHardwareWalletRecoverySegmentProperties,
+  extractHardwareWalletRecoveryErrorCodeAndMessage,
+  getHardwareWalletMetricDeviceModel,
+  HARDWARE_WALLET_RECOVERY_SEGMENT_PAYLOAD_KEYS,
+  mapHardwareWalletRecoveryErrorType,
+  mapHardwareWalletTypeToMetricDeviceType,
+  nextHardwareWalletRecoveryInlineCtaViewCount,
+  resetHardwareWalletRecoveryInlineCtaViewCount,
+} from './hardware-wallet-recovery-metrics';
+
+describe('hardware-wallet-recovery-metrics', () => {
+  describe('mapHardwareWalletTypeToMetricDeviceType', () => {
+    it('maps known wallet types to Segment device_type values', () => {
+      expect(mapHardwareWalletTypeToMetricDeviceType('ledger')).toBe(
+        MetaMetricsHardwareWalletDeviceType.Ledger,
+      );
+      expect(mapHardwareWalletTypeToMetricDeviceType('trezor')).toBe(
+        MetaMetricsHardwareWalletDeviceType.Trezor,
+      );
+      expect(mapHardwareWalletTypeToMetricDeviceType('qr')).toBe(
+        MetaMetricsHardwareWalletDeviceType.QrHardware,
+      );
+      expect(mapHardwareWalletTypeToMetricDeviceType('lattice')).toBe(
+        MetaMetricsHardwareWalletDeviceType.Lattice,
+      );
+    });
+
+    it('returns null for unknown or schema-unlisted wallet types', () => {
+      expect(mapHardwareWalletTypeToMetricDeviceType(undefined)).toBeNull();
+      expect(mapHardwareWalletTypeToMetricDeviceType(null)).toBeNull();
+      expect(mapHardwareWalletTypeToMetricDeviceType('unknown')).toBeNull();
+    });
+  });
+
+  describe('mapHardwareWalletRecoveryErrorType', () => {
+    it('maps locked device errors from numeric code', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.AuthenticationDeviceLocked,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.DeviceLocked);
+    });
+
+    it('maps blind signing errors from numeric code', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.DeviceStateBlindSignNotSupported,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.BlindSigningNotEnabled);
+    });
+
+    it('maps connection transport missing to DeviceDisconnected', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.ConnectionTransportMissing,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.DeviceDisconnected);
+    });
+
+    it('maps device blocked to DeviceLocked', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.AuthenticationDeviceBlocked,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.DeviceLocked);
+    });
+
+    it('maps connection timeout to DeviceDisconnected', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.ConnectionTimeout,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.DeviceDisconnected);
+    });
+
+    it('maps Ethereum app closed to EthereumAppNotOpened', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({
+          code: ErrorCode.DeviceStateEthAppClosed,
+        }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.EthereumAppNotOpened);
+    });
+
+    it('maps unrecognized codes to GenericError', () => {
+      expect(
+        mapHardwareWalletRecoveryErrorType({ code: ErrorCode.Unknown }),
+      ).toBe(MetaMetricsHardwareWalletRecoveryErrorType.GenericError);
+    });
+
+    it('maps missing code to GenericError', () => {
+      expect(mapHardwareWalletRecoveryErrorType({})).toBe(
+        MetaMetricsHardwareWalletRecoveryErrorType.GenericError,
+      );
+      expect(mapHardwareWalletRecoveryErrorType('oops')).toBe(
+        MetaMetricsHardwareWalletRecoveryErrorType.GenericError,
+      );
+    });
+  });
+
+  describe('getHardwareWalletMetricDeviceModel', () => {
+    it('reads device model from metadata when present', () => {
+      const err = new HardwareWalletError('x', {
+        code: ErrorCode.Unknown,
+        severity: Severity.Info,
+        category: Category.Unknown,
+        userMessage: 'x',
+        metadata: { deviceModel: 'Nano X' },
+      });
+      expect(getHardwareWalletMetricDeviceModel(err)).toBe('Nano X');
+    });
+
+    it('prefers device_model then model in metadata', () => {
+      expect(
+        getHardwareWalletMetricDeviceModel(
+          new HardwareWalletError('x', {
+            code: ErrorCode.Unknown,
+            severity: Severity.Info,
+            category: Category.Unknown,
+            userMessage: 'x',
+            metadata: { device_model: 'Model A' },
+          }),
+        ),
+      ).toBe('Model A');
+      expect(
+        getHardwareWalletMetricDeviceModel(
+          new HardwareWalletError('x', {
+            code: ErrorCode.Unknown,
+            severity: Severity.Info,
+            category: Category.Unknown,
+            userMessage: 'x',
+            metadata: { model: 'Model B' },
+          }),
+        ),
+      ).toBe('Model B');
+    });
+
+    it('returns N/A when error is not HardwareWalletError or metadata missing', () => {
+      expect(getHardwareWalletMetricDeviceModel(new Error('x'))).toBe('N/A');
+      expect(
+        getHardwareWalletMetricDeviceModel(
+          new HardwareWalletError('x', {
+            code: ErrorCode.Unknown,
+            severity: Severity.Info,
+            category: Category.Unknown,
+            userMessage: 'x',
+          }),
+        ),
+      ).toBe('N/A');
+    });
+  });
+
+  describe('extractHardwareWalletRecoveryErrorCodeAndMessage', () => {
+    it('serializes HardwareWalletError code and user message', () => {
+      const err = new HardwareWalletError('msg', {
+        code: ErrorCode.DeviceDisconnected,
+        severity: Severity.Err,
+        category: Category.Connection,
+        userMessage: 'user facing',
+      });
+      const { error_code, error_message } =
+        extractHardwareWalletRecoveryErrorCodeAndMessage(err);
+      expect(error_code).toBe(ErrorCode[ErrorCode.DeviceDisconnected]);
+      expect(error_message).toContain('user facing');
+    });
+
+    it('uses message when userMessage is absent on HardwareWalletError', () => {
+      const err = new HardwareWalletError('internal', {
+        code: ErrorCode.Unknown,
+        severity: Severity.Info,
+        category: Category.Unknown,
+        userMessage: '',
+      });
+      const { error_message } =
+        extractHardwareWalletRecoveryErrorCodeAndMessage(err);
+      expect(error_message).toContain('internal');
+    });
+
+    it('extracts code and message from plain Error and object shapes', () => {
+      expect(
+        extractHardwareWalletRecoveryErrorCodeAndMessage(
+          new Error('plain failure'),
+        ),
+      ).toMatchObject({
+        error_code: '',
+        error_message: 'plain failure',
+      });
+
+      expect(
+        extractHardwareWalletRecoveryErrorCodeAndMessage({
+          code: ErrorCode.ConnectionClosed,
+          message: 'lost',
+        }),
+      ).toMatchObject({
+        error_code: ErrorCode[ErrorCode.ConnectionClosed],
+        error_message: 'lost',
+      });
+    });
+
+    it('truncates long messages and stringifies unknown primitives', () => {
+      const long = `${'x'.repeat(520)}`;
+      const { error_message } =
+        extractHardwareWalletRecoveryErrorCodeAndMessage(long);
+      expect(error_message.endsWith('…')).toBe(true);
+      expect(error_message.length).toBeLessThanOrEqual(502);
+
+      expect(
+        extractHardwareWalletRecoveryErrorCodeAndMessage(404),
+      ).toMatchObject({
+        error_code: '',
+        error_message: '404',
+      });
+    });
+  });
+
+  describe('buildHardwareWalletRecoverySegmentProperties', () => {
+    it('returns Segment-shaped property keys', () => {
+      const err = new HardwareWalletError('msg', {
+        code: ErrorCode.AuthenticationDeviceLocked,
+        severity: Severity.Err,
+        category: Category.Authentication,
+        userMessage: 'unlock',
+      });
+      const props = buildHardwareWalletRecoverySegmentProperties({
+        location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+        deviceType: MetaMetricsHardwareWalletDeviceType.Ledger,
+        deviceModel: 'Nano S',
+        errorType: MetaMetricsHardwareWalletRecoveryErrorType.DeviceLocked,
+        errorTypeViewCount: 2,
+        error: err,
+      });
+      expect(props).toMatchObject({
+        location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+        device_type: MetaMetricsHardwareWalletDeviceType.Ledger,
+        device_model: 'Nano S',
+        error_type: MetaMetricsHardwareWalletRecoveryErrorType.DeviceLocked,
+        error_type_view_count: 2,
+      });
+      expect(props.error_code).toBeTruthy();
+      expect(props.error_message).toBeTruthy();
+    });
+
+    it('exposes only snake_case keys that match segment-schema hardware wallet + recovery globals', () => {
+      const err = new HardwareWalletError('x', {
+        code: ErrorCode.Unknown,
+        severity: Severity.Info,
+        category: Category.Unknown,
+        userMessage: 'x',
+      });
+      const props = buildHardwareWalletRecoverySegmentProperties({
+        location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+        deviceType: MetaMetricsHardwareWalletDeviceType.Trezor,
+        deviceModel: 'N/A',
+        errorType: MetaMetricsHardwareWalletRecoveryErrorType.GenericError,
+        errorTypeViewCount: 1,
+        error: err,
+      });
+      expect(Object.keys(props).sort()).toStrictEqual(
+        [...HARDWARE_WALLET_RECOVERY_SEGMENT_PAYLOAD_KEYS].sort(),
+      );
+    });
+  });
+
+  describe('inline CTA error_type_view_count', () => {
+    beforeEach(() => {
+      resetHardwareWalletRecoveryInlineCtaViewCount();
+    });
+
+    describe('nextHardwareWalletRecoveryInlineCtaViewCount', () => {
+      it('returns 1 on first use of an identity key', () => {
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('a')).toBe(1);
+      });
+
+      it('increments when the same identity key is used again', () => {
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('k')).toBe(1);
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('k')).toBe(2);
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('k')).toBe(3);
+      });
+
+      it('resets to 1 when the identity key changes', () => {
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('x')).toBe(1);
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('x')).toBe(2);
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('y')).toBe(1);
+      });
+    });
+
+    describe('resetHardwareWalletRecoveryInlineCtaViewCount', () => {
+      it('clears state so the next call starts at 1 for the prior key', () => {
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('z')).toBe(1);
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('z')).toBe(2);
+        resetHardwareWalletRecoveryInlineCtaViewCount();
+        expect(nextHardwareWalletRecoveryInlineCtaViewCount('z')).toBe(1);
+      });
+    });
+  });
+});
diff --git a/shared/lib/hardware-wallet-recovery-metrics.ts b/shared/lib/hardware-wallet-recovery-metrics.ts
new file mode 100644
index 000000000000..c1c52296f765
--- /dev/null
+++ b/shared/lib/hardware-wallet-recovery-metrics.ts
@@ -0,0 +1,306 @@
+/* eslint-disable @typescript-eslint/naming-convention, camelcase -- Segment event properties use snake_case */
+import { ErrorCode, HardwareWalletError } from '@metamask/hw-wallet-sdk';
+import { Json } from '@metamask/utils';
+import {
+  MetaMetricsHardwareWalletDeviceType,
+  MetaMetricsHardwareWalletRecoveryErrorType,
+  MetaMetricsHardwareWalletRecoveryLocation,
+} from '../constants/metametrics';
+
+const UNKNOWN_DEVICE_MODEL = 'N/A';
+const MAX_ERROR_MESSAGE_LENGTH = 500;
+
+/**
+ * Canonical Segment `properties` keys produced by {@link buildHardwareWalletRecoverySegmentProperties}.
+ * Must stay aligned with `segment-schema`:
+ * `libraries/properties/metamask-hardware-wallet-globals.yaml` and
+ * `libraries/properties/metamask-hardware-wallet-recovery-globals.yaml`.
+ */
+export const HARDWARE_WALLET_RECOVERY_SEGMENT_PAYLOAD_KEYS = [
+  'device_model',
+  'device_type',
+  'error_code',
+  'error_message',
+  'error_type',
+  'error_type_view_count',
+  'location',
+] as const;
+
+/**
+ * UI / keyring wallet keys (see {@link HardwareWalletType}) that have a defined Segment `device_type`.
+ * Values are {@link MetaMetricsHardwareWalletDeviceType} — Segment uses different strings than our keys
+ * (e.g. `qr` → `QR Hardware`), so a lookup table is required; we cannot use the UI enum value alone as the payload.
+ */
+const HARDWARE_WALLET_TYPE_KEY_TO_SEGMENT_DEVICE_TYPE = {
+  ledger: MetaMetricsHardwareWalletDeviceType.Ledger,
+  trezor: MetaMetricsHardwareWalletDeviceType.Trezor,
+  qr: MetaMetricsHardwareWalletDeviceType.QrHardware,
+  lattice: MetaMetricsHardwareWalletDeviceType.Lattice,
+} as const satisfies Record<string, MetaMetricsHardwareWalletDeviceType>;
+
+type MappableHardwareWalletTypeKey =
+  keyof typeof HARDWARE_WALLET_TYPE_KEY_TO_SEGMENT_DEVICE_TYPE;
+
+/**
+ * Arguments for {@link buildHardwareWalletRecoverySegmentProperties} (camelCase for TS/ESLint).
+ * These map to Segment snake_case keys — they are **not** the wire property names.
+ */
+type RecoverySegmentPropertyArgs = {
+  /** Segment key: `location` */
+  location: MetaMetricsHardwareWalletRecoveryLocation;
+  /** Segment key: `device_type` */
+  deviceType: MetaMetricsHardwareWalletDeviceType;
+  /** Segment key: `device_model` */
+  deviceModel: string;
+  /** Segment key: `error_type` */
+  errorType: MetaMetricsHardwareWalletRecoveryErrorType;
+  /** Segment key: `error_type_view_count` */
+  errorTypeViewCount: number;
+  /** Used to derive Segment keys `error_code` and `error_message` */
+  error: unknown;
+};
+
+/**
+ * Builds `trackEvent` `properties` for hardware wallet recovery events.
+ *
+ * Composes `metamask-hardware-wallet-globals` + `metamask-hardware-wallet-recovery-globals`
+ * (and satisfies `metamask-hardware-wallet-recovery-error-globals` when that library is on the event).
+ *
+ * @param args - Recovery context; camelCase fields are mapped to Segment snake_case keys.
+ * @returns Object whose keys match Segment (`device_type`, not `deviceType`).
+ */
+export function buildHardwareWalletRecoverySegmentProperties(
+  args: RecoverySegmentPropertyArgs,
+): Record<string, Json> {
+  const { error_code, error_message } =
+    extractHardwareWalletRecoveryErrorCodeAndMessage(args.error);
+  return {
+    location: args.location,
+    device_type: args.deviceType,
+    device_model: args.deviceModel,
+    error_type: args.errorType,
+    error_type_view_count: args.errorTypeViewCount,
+    error_code,
+    error_message,
+  };
+}
+
+/**
+ * Resolves a numeric hardware wallet error code when available.
+ *
+ * @param error - Unknown error shape from RPC or UI.
+ * @returns The {@link ErrorCode} when recognized, otherwise null.
+ */
+function resolveHardwareWalletErrorCode(error: unknown): ErrorCode | null {
+  if (error instanceof HardwareWalletError) {
+    return error.code;
+  }
+
+  if (
+    error &&
+    typeof error === 'object' &&
+    'code' in error &&
+    typeof (error as { code: unknown }).code === 'number'
+  ) {
+    return (error as { code: ErrorCode }).code;
+  }
+
+  return null;
+}
+
+/**
+ * Reads a human-readable message from an unknown error value.
+ *
+ * @param error - Any thrown value or RPC error object.
+ * @returns Message string, or empty string if none.
+ */
+function getErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  if (
+    error &&
+    typeof error === 'object' &&
+    'message' in error &&
+    typeof (error as { message: unknown }).message === 'string'
+  ) {
+    return (error as { message: string }).message;
+  }
+  return '';
+}
+
+/**
+ * Normalizes whitespace and caps length for Segment `error_message`.
+ *
+ * @param message - Raw error text.
+ * @returns Sanitized message safe to send in analytics.
+ */
+function sanitizeErrorMessage(message: string): string {
+  const trimmed = message.replace(/\s+/gu, ' ').trim();
+  if (trimmed.length <= MAX_ERROR_MESSAGE_LENGTH) {
+    return trimmed;
+  }
+  return `${trimmed.slice(0, MAX_ERROR_MESSAGE_LENGTH)}…`;
+}
+
+/**
+ * Maps an {@link ErrorCode} numeric value to its enum name string for Segment `error_code`.
+ *
+ * @param code - Hardware wallet SDK error code.
+ * @returns String label (e.g. `DeviceDisconnected`).
+ */
+function errorCodeToLabel(code: ErrorCode): string {
+  return ErrorCode[code];
+}
+
+/**
+ * Builds Segment `error_code` and `error_message` from an error (or empty strings when absent).
+ *
+ * @param error - Underlying error.
+ * @returns Object with snake_case keys matching the Segment recovery-error library.
+ */
+export function extractHardwareWalletRecoveryErrorCodeAndMessage(
+  error: unknown,
+): { error_code: string; error_message: string } {
+  if (error instanceof HardwareWalletError) {
+    return {
+      error_code: errorCodeToLabel(error.code),
+      error_message: sanitizeErrorMessage(
+        error.userMessage || error.message || '',
+      ),
+    };
+  }
+
+  const code = resolveHardwareWalletErrorCode(error);
+  const message = getErrorMessage(error);
+  if (code !== null) {
+    return {
+      error_code: errorCodeToLabel(code),
+      error_message: sanitizeErrorMessage(message),
+    };
+  }
+
+  return {
+    error_code: '',
+    error_message: sanitizeErrorMessage(message || String(error)),
+  };
+}
+
+/**
+ * Maps internal wallet type keys to Segment `device_type` enum values.
+ *
+ * Segment schema only defines Ledger, Trezor, QR Hardware, and Lattice.
+ * Unknown/unmapped wallet types are intentionally not tracked.
+ *
+ * @param walletType - Hardware wallet type key from UI/hardware contexts.
+ * @returns Corresponding {@link MetaMetricsHardwareWalletDeviceType}, or null when unmapped.
+ */
+export function mapHardwareWalletTypeToMetricDeviceType(
+  walletType?: string | null,
+): MetaMetricsHardwareWalletDeviceType | null {
+  if (
+    walletType === null ||
+    walletType === undefined ||
+    walletType === 'unknown'
+  ) {
+    return null;
+  }
+
+  return Object.hasOwn(
+    HARDWARE_WALLET_TYPE_KEY_TO_SEGMENT_DEVICE_TYPE,
+    walletType,
+  )
+    ? HARDWARE_WALLET_TYPE_KEY_TO_SEGMENT_DEVICE_TYPE[
+        walletType as MappableHardwareWalletTypeKey
+      ]
+    : null;
+}
+
+/**
+ * Best-effort device model for analytics (matches Hardware Wallet Account Connected usage).
+ *
+ * @param error - Hardware wallet error that may carry metadata.
+ * @returns Model name or {@link UNKNOWN_DEVICE_MODEL}.
+ */
+export function getHardwareWalletMetricDeviceModel(error: unknown): string {
+  if (!(error instanceof HardwareWalletError)) {
+    return UNKNOWN_DEVICE_MODEL;
+  }
+
+  const meta = error.metadata as
+    | { deviceModel?: string; device_model?: string; model?: string }
+    | undefined;
+  if (!meta) {
+    return UNKNOWN_DEVICE_MODEL;
+  }
+
+  return (
+    meta.deviceModel ?? meta.device_model ?? meta.model ?? UNKNOWN_DEVICE_MODEL
+  );
+}
+
+/**
+ * Normalizes a hardware wallet error into the Segment `error_type` enum.
+ *
+ * @param error - Error shown in the recovery modal or connection failure.
+ * @returns value for analytics.
+ */
+export function mapHardwareWalletRecoveryErrorType(
+  error: unknown,
+): MetaMetricsHardwareWalletRecoveryErrorType {
+  const code = resolveHardwareWalletErrorCode(error);
+
+  if (code === null) {
+    return MetaMetricsHardwareWalletRecoveryErrorType.GenericError;
+  }
+
+  switch (code) {
+    case ErrorCode.AuthenticationDeviceLocked:
+    case ErrorCode.AuthenticationDeviceBlocked:
+      return MetaMetricsHardwareWalletRecoveryErrorType.DeviceLocked;
+    case ErrorCode.DeviceDisconnected:
+    case ErrorCode.ConnectionClosed:
+    case ErrorCode.ConnectionTimeout:
+    case ErrorCode.ConnectionTransportMissing:
+      return MetaMetricsHardwareWalletRecoveryErrorType.DeviceDisconnected;
+    case ErrorCode.DeviceStateEthAppClosed:
+      return MetaMetricsHardwareWalletRecoveryErrorType.EthereumAppNotOpened;
+    case ErrorCode.DeviceStateBlindSignNotSupported:
+      return MetaMetricsHardwareWalletRecoveryErrorType.BlindSigningNotEnabled;
+    default:
+      return MetaMetricsHardwareWalletRecoveryErrorType.GenericError;
+  }
+}
+
+let inlineCtaLastErrorIdentityKey: string | null = null;
+let inlineCtaConsecutiveClickCount = 0;
+
+/**
+ * Returns the next `error_type_view_count` for inline “Connect device” recovery CTAs
+ * (bridge / confirmation footer). Increments when the same error identity is tracked
+ * again; resets to 1 when the identity changes.
+ *
+ * @param errorIdentityKey - Stable key for the current error context (aligned with
+ * `errorIdentityKey` in `hardware-wallet-error-modal.tsx`, plus `walletType` for inline CTAs).
+ * @returns Monotonic count for this identity within the current streak.
+ */
+export function nextHardwareWalletRecoveryInlineCtaViewCount(
+  errorIdentityKey: string,
+): number {
+  if (inlineCtaLastErrorIdentityKey === errorIdentityKey) {
+    inlineCtaConsecutiveClickCount += 1;
+  } else {
+    inlineCtaLastErrorIdentityKey = errorIdentityKey;
+    inlineCtaConsecutiveClickCount = 1;
+  }
+  return inlineCtaConsecutiveClickCount;
+}
+
+/**
+ * Clears inline CTA view-count state. Call when the device is successfully ready or the
+ * connection is fully reset so the next recovery attempt starts at 1.
+ */
+export function resetHardwareWalletRecoveryInlineCtaViewCount(): void {
+  inlineCtaLastErrorIdentityKey = null;
+  inlineCtaConsecutiveClickCount = 0;
+}
diff --git a/shared/lib/metamask-controller-utils.test.ts b/shared/lib/metamask-controller-utils.test.ts
index fa71e586af46..64f957d5868a 100644
--- a/shared/lib/metamask-controller-utils.test.ts
+++ b/shared/lib/metamask-controller-utils.test.ts
@@ -3,9 +3,13 @@ import {
   Messenger,
   MockAnyNamespace,
 } from '@metamask/messenger';
+import { TransactionType } from '@metamask/transaction-controller';
 
 import { type OnboardingControllerState } from '../types/onboarding';
-import { createEnsureOnboardingCompleteCallback } from './metamask-controller-utils';
+import {
+  createEnsureOnboardingCompleteCallback,
+  getTokenValueParam,
+} from './metamask-controller-utils';
 
 /** Action/event types so the test messenger accepts OnboardingController actions and events. */
 type TestOnboardingAction = {
@@ -132,3 +136,39 @@ describe('createEnsureOnboardingCompleteCallback', () => {
     await Promise.all([promise1, promise2, promise3]);
   });
 });
+
+describe('getTokenValueParam', () => {
+  it('returns the increment value as string when token data name is tokenMethodIncreaseAllowance', () => {
+    const tokenData = {
+      name: TransactionType.tokenMethodIncreaseAllowance,
+      args: { increment: 100 },
+    };
+    // Validates that the numeric value is converted to a string via toString()
+    expect(getTokenValueParam(tokenData)).toBe('100');
+  });
+
+  it('returns the _value as string when token data name is not tokenMethodIncreaseAllowance', () => {
+    const tokenData = {
+      name: TransactionType.tokenMethodTransfer,
+      args: {
+        // eslint-disable-next-line @typescript-eslint/naming-convention -- ERC-20 `_value` arg name used by getTokenValueParam
+        _value: 200,
+      },
+    };
+    expect(getTokenValueParam(tokenData)).toBe('200');
+  });
+
+  it('returns undefined when args are not provided', () => {
+    expect(
+      getTokenValueParam({ name: TransactionType.tokenMethodTransfer }),
+    ).toBeUndefined();
+  });
+
+  it('returns undefined when tokenData is empty', () => {
+    expect(getTokenValueParam({})).toBeUndefined();
+  });
+
+  it('returns undefined when called with no arguments', () => {
+    expect(getTokenValueParam()).toBeUndefined();
+  });
+});
diff --git a/shared/lib/multichain/scope-utils.test.ts b/shared/lib/multichain/scope-utils.test.ts
index 639b2732a62f..949215d4be42 100644
--- a/shared/lib/multichain/scope-utils.test.ts
+++ b/shared/lib/multichain/scope-utils.test.ts
@@ -26,6 +26,7 @@ const createMockFactory = () => {
     pinned: false,
     hidden: false,
     entropy: { groupIndex },
+    lastSelected: 0,
   });
 
   // Account factory with common defaults
diff --git a/shared/lib/multichain/transformations.test.ts b/shared/lib/multichain/transformations.test.ts
index 96298781ddd5..ea38ab18392e 100644
--- a/shared/lib/multichain/transformations.test.ts
+++ b/shared/lib/multichain/transformations.test.ts
@@ -1,14 +1,17 @@
+import type { InfiniteData } from '@tanstack/react-query';
+import type { V4MultiAccountTransactionsResponse } from '@metamask/core-backend';
 import { NATIVE_TOKEN_ADDRESS } from '../../constants/transaction';
-import { parseValueTransfers } from './transformations';
+import { parseValueTransfers, selectTransactions } from './transformations';
 
-const account = '0xABCDef0123456789abcdef0123456789ABCDEF00';
+const account = '0xAABBCCDDEE11223344556677889900AABBCCDD00';
+const other = '0x00AABBCCDDEE112233445566778899AABBCCDDEE';
 
 const makeTransfer = (overrides: Record<string, unknown> = {}) => ({
   amount: '1000000000000000000',
   decimal: 18,
   symbol: 'ETH',
   from: account,
-  to: '0x1111111111111111111111111111111111111111',
+  to: other,
   ...overrides,
 });
 
@@ -131,3 +134,130 @@ describe('parseValueTransfers', () => {
     expect(result).toStrictEqual({});
   });
 });
+
+const baseRawTx = {
+  hash: '0xabc',
+  timestamp: '2025-01-01T00:00:00Z',
+  chainId: 1,
+  blockNumber: 100,
+  blockHash: '0x0',
+  gas: 21000,
+  gasUsed: 21000,
+  gasPrice: '1000000000',
+  effectiveGasPrice: '1000000000',
+  nonce: 0,
+  cumulativeGasUsed: 21000,
+  value: '1000000000000000000',
+  methodId: '0x',
+};
+
+const createData = (rawTxs: Record<string, unknown>[]) => ({
+  pageParams: [],
+  pages: [
+    {
+      unprocessedNetworks: [],
+      pageInfo: { count: rawTxs.length, hasNextPage: false },
+      data: rawTxs as V4MultiAccountTransactionsResponse['data'],
+    },
+  ],
+});
+
+const nativeTransfer = (from: string, to: string) => ({
+  from,
+  to,
+  amount: '1000000000000000000',
+  decimal: 18,
+  symbol: 'ETH',
+  name: 'Ether',
+  contractAddress: '',
+  transferType: 'normal',
+});
+
+describe('selectTransactions', () => {
+  it('shows outgoing native transfers initiated by the account', () => {
+    const transform = selectTransactions({ address: account });
+    const result = transform(
+      createData([
+        {
+          ...baseRawTx,
+          from: account,
+          to: other,
+          valueTransfers: [nativeTransfer(account, other)],
+        },
+      ]),
+    );
+
+    expect(result.pages[0].data).toHaveLength(1);
+  });
+
+  it('shows native self-sends', () => {
+    const result = selectTransactions({ address: account })(
+      createData([
+        {
+          ...baseRawTx,
+          from: account,
+          to: account,
+          valueTransfers: [nativeTransfer(account, account)],
+        },
+      ]),
+    );
+    expect(result.pages[0].data).toHaveLength(1);
+  });
+
+  it('shows swaps where the account sends native and receives a token', () => {
+    const router = '0x2222222222222222222222222222222222222222';
+    const result = selectTransactions({ address: account })(
+      createData([
+        {
+          ...baseRawTx,
+          from: account,
+          to: router,
+          valueTransfers: [
+            nativeTransfer(account, router),
+            {
+              from: router,
+              to: account,
+              amount: '500000',
+              decimal: 6,
+              symbol: 'USDC',
+              name: 'USD Coin',
+              contractAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+              transferType: 'erc20',
+            },
+          ],
+        },
+      ]),
+    );
+    expect(result.pages[0].data).toHaveLength(1);
+  });
+
+  it('blocks incoming native transfers where the account is the recipient', () => {
+    const result = selectTransactions({ address: account })(
+      createData([
+        {
+          ...baseRawTx,
+          from: other,
+          to: account,
+          valueTransfers: [nativeTransfer(other, account)],
+        },
+      ]),
+    );
+    expect(result.pages[0].data).toHaveLength(0);
+  });
+
+  it('blocks contract-initiated native receipt where account did not initiate', () => {
+    const contract = '0x3333333333333333333333333333333333333333';
+    const result = selectTransactions({ address: account })(
+      createData([
+        {
+          ...baseRawTx,
+          from: contract,
+          to: account,
+          value: '0',
+          valueTransfers: [nativeTransfer(contract, account)],
+        },
+      ]),
+    );
+    expect(result.pages[0].data).toHaveLength(0);
+  });
+});
diff --git a/shared/lib/multichain/transformations.ts b/shared/lib/multichain/transformations.ts
index 96d2d158259d..68fb25259ad9 100644
--- a/shared/lib/multichain/transformations.ts
+++ b/shared/lib/multichain/transformations.ts
@@ -47,7 +47,7 @@ export function parseValueTransfers(
     }
 
     const { amount, decimal, symbol, from, to, contractAddress } = transfer;
-    const tokenAddress = contractAddress?.toLowerCase() ?? NATIVE_TOKEN_ADDRESS;
+    const tokenAddress = contractAddress?.toLowerCase() || NATIVE_TOKEN_ADDRESS;
 
     const token = {
       chainId: hexChainId,
@@ -175,6 +175,7 @@ export function normalizeTransaction(
 }
 
 const INCLUDE_TOKEN_TRANSFERS = false;
+const INCLUDE_NATIVE_TRANSFERS = false;
 const EXCLUDED_TRANSACTION_TYPES = ['SPAM_TOKEN_TRANSFER'];
 
 // Transform and filter raw API response
@@ -232,6 +233,18 @@ export function selectTransactions({
         // Enrich with amounts and raw API classification
         const amounts = parseValueTransfers(addr, raw);
 
+        // Filter out incoming native coin transfers (address poisoning defence).
+        // Same logic as the ERC-20 token-transfer block above: hide transfers
+        // where the account is the recipient but not the initiator.
+        if (
+          !INCLUDE_NATIVE_TRANSFERS &&
+          rawFrom !== addr &&
+          amounts.to?.token.address === NATIVE_TOKEN_ADDRESS &&
+          !amounts.from
+        ) {
+          return result;
+        }
+
         const transactionProtocol =
           raw.transactionProtocol ||
           raw.valueTransfers?.find(
diff --git a/shared/lib/object.utils.js b/shared/lib/object.utils.ts
similarity index 51%
rename from shared/lib/object.utils.js
rename to shared/lib/object.utils.ts
index c5948ac04644..faeca11596d4 100644
--- a/shared/lib/object.utils.js
+++ b/shared/lib/object.utils.ts
@@ -1,14 +1,22 @@
 /**
  * This symbol matches all object properties when used in a mask
  */
-export const AllProperties = Symbol('*');
+export const AllProperties: unique symbol = Symbol('*');
+
+type MaskValue = boolean | ObjectMask | readonly unknown[];
+
+export type ObjectMask = {
+  [key: string]: MaskValue;
+} & {
+  [AllProperties]?: MaskValue;
+};
 
 /**
  * Return a "masked" copy of the given object. The returned object includes
  * only the properties present in the mask.
  *
  * The mask is an object that mirrors the structure of the given object, except
- * the only values are `true`, `false, a sub-mask, or the 'AllProperties"
+ * the only values are `true`, `false`, a sub-mask, or the `AllProperties`
  * symbol. `true` implies the property should be included, and `false` will
  * exclude it. A sub-mask implies the property should be further masked
  * according to that sub-mask. The "AllProperties" symbol is used for objects
@@ -17,15 +25,20 @@ export const AllProperties = Symbol('*');
  *
  * If a property is excluded, its type is included instead.
  *
- * @param {object} object - The object to mask
- * @param {{[key: string]: object | boolean} & { [AllProperties]?: boolean }} mask - The mask to apply to the object
+ * @param object - The object to mask
+ * @param mask - The mask to apply to the object
+ * @returns A masked copy of the given object
  */
-export function maskObject(object, mask) {
+export function maskObject(
+  object: unknown,
+  mask: ObjectMask,
+): Record<string, unknown> | string | null {
   // make sure the object is actually an object, if not, just return its type
   if (typeof object !== 'object' || object === null) {
-    // As typeof null (misleadingly) returns “object,” it would be more readable to display “null” instead of “object.”
+    // As typeof null (misleadingly) returns "object," it would be more readable to display "null" instead of "object."
     return object === null ? null : typeof object;
   }
+  const obj = object as Record<string, unknown>;
   const maskKeys = Reflect.ownKeys(mask);
   const maskAllProperties = maskKeys.includes(AllProperties);
 
@@ -34,17 +47,20 @@ export function maskObject(object, mask) {
       throw new Error('AllProperties mask key does not support sibling keys');
     }
   }
-  return Object.keys(object).reduce((state, key) => {
+  return Object.keys(obj).reduce<Record<string, unknown>>((state, key) => {
     const maskKey = maskAllProperties ? mask[AllProperties] : mask[key];
     if (maskKey === true) {
-      state[key] = object[key];
+      state[key] = obj[key];
+    } else if (Array.isArray(maskKey)) {
+      // Array masks (e.g. empty `[]` in Sentry state) — surface typeof only, like `false`.
+      state[key] = obj[key] === null ? null : typeof obj[key];
     } else if (maskKey && typeof maskKey === 'object') {
-      state[key] = maskObject(object[key], maskKey);
+      state[key] = maskObject(obj[key], maskKey as ObjectMask);
     } else if (maskKey === undefined || maskKey === false) {
-      // As typeof null (misleadingly) returns “object,” it would be more readable to display “null” instead of “object.”
-      state[key] = object[key] === null ? null : typeof object[key];
+      // As typeof null (misleadingly) returns "object," it would be more readable to display "null" instead of "object."
+      state[key] = obj[key] === null ? null : typeof obj[key];
     } else {
-      throw new Error(`Unsupported mask entry: ${maskKey}`);
+      throw new Error(`Unsupported mask entry: ${String(maskKey)}`);
     }
     return state;
   }, {});
diff --git a/shared/lib/random-id.js b/shared/lib/random-id.js
deleted file mode 100644
index 7bc70b0e9d8b..000000000000
--- a/shared/lib/random-id.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const MAX = Number.MAX_SAFE_INTEGER;
-
-let idCounter = Math.round(Math.random() * MAX);
-export default function createRandomId() {
-  idCounter %= MAX;
-  // eslint-disable-next-line no-plusplus
-  return idCounter++;
-}
diff --git a/shared/lib/random-id.test.ts b/shared/lib/random-id.test.ts
new file mode 100644
index 000000000000..23d86b92b850
--- /dev/null
+++ b/shared/lib/random-id.test.ts
@@ -0,0 +1,51 @@
+import createRandomId from './random-id';
+
+describe('createRandomId', () => {
+  it('returns a number', () => {
+    expect(typeof createRandomId()).toBe('number');
+  });
+
+  it('returns unique values on successive calls', () => {
+    const ids = Array.from({ length: 10 }, () => createRandomId());
+    const unique = new Set(ids);
+    expect(unique.size).toBe(ids.length);
+  });
+
+  it('returns values that increment by 1 on successive calls', () => {
+    const first = createRandomId();
+    const second = createRandomId();
+    expect(second).toBe(first + 1);
+  });
+
+  it('returns values within safe integer range', () => {
+    const id = createRandomId();
+    expect(id).toBeGreaterThanOrEqual(0);
+    expect(id).toBeLessThan(Number.MAX_SAFE_INTEGER);
+  });
+
+  it('wraps so the id after MAX_SAFE_INTEGER - 1 is 0', () => {
+    const MAX = Number.MAX_SAFE_INTEGER;
+    jest.resetModules();
+    const getRandomValuesSpy = jest
+      .spyOn(globalThis.crypto, 'getRandomValues')
+      .mockImplementation((array: ArrayBufferView | null) => {
+        if (!array) {
+          return array;
+        }
+        (array as BigUint64Array)[0] = BigInt(MAX - 2);
+        return array;
+      });
+
+    // eslint-disable-next-line @typescript-eslint/no-require-imports -- intentional post-resetModules reload
+    const { default: createRandomIdFromSeed } = require('./random-id') as {
+      default: () => number;
+    };
+
+    expect(createRandomIdFromSeed()).toBe(MAX - 2);
+    expect(createRandomIdFromSeed()).toBe(MAX - 1);
+    expect(createRandomIdFromSeed()).toBe(0);
+    expect(createRandomIdFromSeed()).toBe(1);
+
+    getRandomValuesSpy.mockRestore();
+  });
+});
diff --git a/shared/lib/random-id.ts b/shared/lib/random-id.ts
new file mode 100644
index 000000000000..a05de390414e
--- /dev/null
+++ b/shared/lib/random-id.ts
@@ -0,0 +1,12 @@
+const MAX = Number.MAX_SAFE_INTEGER;
+
+const seed = new BigUint64Array(1);
+crypto.getRandomValues(seed);
+let idCounter = Number(seed[0] % (BigInt(MAX) + 1n));
+
+export default function createRandomId(): number {
+  idCounter %= MAX;
+  const id = idCounter;
+  idCounter += 1;
+  return id;
+}
diff --git a/shared/lib/rpc.utils.test.ts b/shared/lib/rpc.utils.test.ts
new file mode 100644
index 000000000000..805f58174b24
--- /dev/null
+++ b/shared/lib/rpc.utils.test.ts
@@ -0,0 +1,149 @@
+import { jsonRpcRequest } from './rpc.utils';
+
+jest.mock('./fetch-with-timeout', () => {
+  const mockFetch = jest.fn();
+  return jest.fn(() => mockFetch);
+});
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const getFetchWithTimeout = require('./fetch-with-timeout') as jest.Mock;
+
+function getMockFetch(): jest.Mock {
+  return getFetchWithTimeout();
+}
+
+function makeHttpResponse(body: unknown) {
+  return Promise.resolve({ json: () => Promise.resolve(body) });
+}
+
+const RPC_URL = 'https://mainnet.example.com/rpc';
+
+describe('jsonRpcRequest', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('successful responses', () => {
+    it('returns the result field from the JSON-RPC response', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse({ result: 'success' }));
+
+      const result = await jsonRpcRequest(RPC_URL, 'eth_blockNumber');
+
+      expect(result).toBe('success');
+    });
+
+    it('returns undefined when result is not present', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse({ result: undefined }));
+
+      const result = await jsonRpcRequest(RPC_URL, 'eth_blockNumber');
+
+      expect(result).toBeUndefined();
+    });
+  });
+
+  describe('invalid response shape', () => {
+    it('throws when the response is not an object', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse('not-an-object'));
+
+      await expect(jsonRpcRequest(RPC_URL, 'eth_blockNumber')).rejects.toThrow(
+        `RPC endpoint ${RPC_URL} returned non-object response.`,
+      );
+    });
+
+    it('throws when the response is an array', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse([{ result: 1 }]));
+
+      await expect(jsonRpcRequest(RPC_URL, 'eth_blockNumber')).rejects.toThrow(
+        `RPC endpoint ${RPC_URL} returned non-object response.`,
+      );
+    });
+
+    it('throws when the response is null', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse(null));
+
+      await expect(jsonRpcRequest(RPC_URL, 'eth_blockNumber')).rejects.toThrow(
+        `RPC endpoint ${RPC_URL} returned non-object response.`,
+      );
+    });
+  });
+
+  describe('RPC error field handling', () => {
+    it('throws with the message when error is an object with a message property', async () => {
+      getMockFetch().mockReturnValue(
+        makeHttpResponse({ error: { message: 'execution reverted' } }),
+      );
+
+      await expect(jsonRpcRequest(RPC_URL, 'eth_call')).rejects.toThrow(
+        'execution reverted',
+      );
+    });
+
+    it('throws with JSON.stringify when error is an object without a message property', async () => {
+      const errorObj = { code: -32000, data: 'insufficient funds' };
+      getMockFetch().mockReturnValue(makeHttpResponse({ error: errorObj }));
+
+      await expect(
+        jsonRpcRequest(RPC_URL, 'eth_sendTransaction'),
+      ).rejects.toThrow(JSON.stringify(errorObj));
+    });
+
+    it('throws with JSON.stringify when error object message property is undefined', async () => {
+      const errorObj = { code: -32603 };
+      getMockFetch().mockReturnValue(makeHttpResponse({ error: errorObj }));
+
+      await expect(jsonRpcRequest(RPC_URL, 'eth_call')).rejects.toThrow(
+        JSON.stringify(errorObj),
+      );
+    });
+
+    it('throws with the string directly when error is a string', async () => {
+      getMockFetch().mockReturnValue(
+        makeHttpResponse({ error: 'method not found' }),
+      );
+
+      await expect(
+        jsonRpcRequest(RPC_URL, 'eth_unknownMethod'),
+      ).rejects.toThrow('method not found');
+    });
+  });
+
+  describe('Authorization header from URL credentials', () => {
+    it('converts basic-auth URL credentials to an Authorization header', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse({ result: 'ok' }));
+
+      const urlWithAuth = 'https://user:pass@mainnet.example.com/rpc';
+      await jsonRpcRequest(urlWithAuth, 'eth_blockNumber');
+
+      const [calledUrl, calledOptions] = getMockFetch().mock.calls[0];
+      const expectedToken = Buffer.from('user:pass').toString('base64');
+
+      expect(calledUrl).toBe('https://mainnet.example.com/rpc');
+      expect(calledOptions.headers.Authorization).toBe(
+        `Basic ${expectedToken}`,
+      );
+    });
+
+    it('does not add an Authorization header for URLs without credentials', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse({ result: 'ok' }));
+
+      await jsonRpcRequest(RPC_URL, 'eth_blockNumber');
+
+      const [, calledOptions] = getMockFetch().mock.calls[0];
+      expect(calledOptions.headers.Authorization).toBeUndefined();
+    });
+  });
+
+  describe('custom headers', () => {
+    it('merges extra headers into the request', async () => {
+      getMockFetch().mockReturnValue(makeHttpResponse({ result: 'ok' }));
+
+      await jsonRpcRequest(RPC_URL, 'eth_blockNumber', [], {
+        headers: { 'X-Api-Key': 'secret' },
+      });
+
+      const [, calledOptions] = getMockFetch().mock.calls[0];
+      expect(calledOptions.headers['X-Api-Key']).toBe('secret');
+      expect(calledOptions.headers['Content-Type']).toBe('application/json');
+    });
+  });
+});
diff --git a/shared/lib/rpc.utils.js b/shared/lib/rpc.utils.ts
similarity index 63%
rename from shared/lib/rpc.utils.js
rename to shared/lib/rpc.utils.ts
index 12b425a60ae9..8306c7abc34d 100644
--- a/shared/lib/rpc.utils.js
+++ b/shared/lib/rpc.utils.ts
@@ -5,21 +5,22 @@ const fetchWithTimeout = getFetchWithTimeout();
 /**
  * Makes a JSON RPC request to the given URL, with the given RPC method and params.
  *
- * @param {string} rpcUrl - The RPC endpoint URL to target.
- * @param {string} rpcMethod - The RPC method to request.
- * @param {Array<unknown>} [rpcParams] - The RPC method params.
- * @param {{ headers?: Record<string, string> }} [options] - Optional extra headers (e.g. Authorization).
- * @returns {Promise<unknown|undefined>} Returns the result of the RPC method call,
+ * @param rpcUrl - The RPC endpoint URL to target.
+ * @param rpcMethod - The RPC method to request.
+ * @param rpcParams - The RPC method params.
+ * @param options - Optional extra headers (e.g. Authorization).
+ * @param options.headers - Optional HTTP headers to include in the request.
+ * @returns Returns the result of the RPC method call,
  * or throws an error in case of failure.
  */
 export async function jsonRpcRequest(
-  rpcUrl,
-  rpcMethod,
-  rpcParams = [],
-  options = {},
-) {
+  rpcUrl: string,
+  rpcMethod: string,
+  rpcParams: unknown[] = [],
+  options: { headers?: Record<string, string> } = {},
+): Promise<unknown> {
   let fetchUrl = rpcUrl;
-  const headers = {
+  const headers: Record<string, string> = {
     'Content-Type': 'application/json',
     ...options.headers,
   };
@@ -52,10 +53,17 @@ export async function jsonRpcRequest(
   ) {
     throw new Error(`RPC endpoint ${rpcUrl} returned non-object response.`);
   }
-  const { error, result } = jsonRpcResponse;
+  const { error, result } = jsonRpcResponse as {
+    error?: { message?: string } | string;
+    result?: unknown;
+  };
 
   if (error) {
-    throw new Error(error?.message || error);
+    throw new Error(
+      typeof error === 'object'
+        ? (error.message ?? JSON.stringify(error))
+        : error,
+    );
   }
   return result;
 }
diff --git a/shared/lib/selectors/assets-migration.test.ts b/shared/lib/selectors/assets-migration.test.ts
index a6c881ccb885..ba24e842ee7a 100644
--- a/shared/lib/selectors/assets-migration.test.ts
+++ b/shared/lib/selectors/assets-migration.test.ts
@@ -18,6 +18,8 @@ import {
   getCurrencyRateControllerCurrencyRates,
   getTokenRatesControllerMarketData,
   getMultichainAssetsRatesControllerConversionRates,
+  getRatesControllerRates,
+  getRatesControllerFiatCurrency,
 } from './assets-migration';
 
 const mockAccountId = 'mock-account-id-1';
@@ -40,9 +42,7 @@ const solanaTokenAssetId =
   'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
 
 const nativePolygonAssetId = 'eip155:137/slip44:966';
-/* eslint-disable @typescript-eslint/no-unused-vars -- shared helpers for future tests */
 const bitcoinNativeAssetId = 'bip122:000000000019d6689c085ae165831e93/slip44:0';
-/* eslint-enable @typescript-eslint/no-unused-vars */
 const mockAccountId3 = 'mock-account-id-3';
 const mockAccountAddressLowercase2: Hex =
   '0x1234567890abcdef1234567890abcdef12345678';
@@ -55,8 +55,6 @@ const enabledFlags = {
   },
 };
 
-/** Shared helper for future token-rates / market-data tests */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 function makeMockPrice(overrides: Partial<Record<string, unknown>> = {}) {
   return {
     assetPriceType: 'fungible',
@@ -83,7 +81,6 @@ function makeMockPrice(overrides: Partial<Record<string, unknown>> = {}) {
     ...overrides,
   };
 }
-/* eslint-enable @typescript-eslint/no-unused-vars */
 
 describe('getAccountTrackerControllerAccountsByChainId', () => {
   describe('when assets unify state feature is disabled', () => {
@@ -2124,3 +2121,128 @@ describe('getMultichainAssetsRatesControllerConversionRates', () => {
     });
   });
 });
+
+describe('getRatesControllerRates', () => {
+  const solanaNativeAssetId =
+    'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
+
+  describe('when assets unify state feature is disabled', () => {
+    it('returns rates from state unchanged', () => {
+      const legacyRates = {
+        btc: {
+          conversionDate: 1700000000000,
+          conversionRate: 71052.43,
+          usdConversionRate: 71052.43,
+        },
+        sol: {
+          conversionDate: 1700000000000,
+          conversionRate: 91.69,
+          usdConversionRate: 91.69,
+        },
+      };
+      const state = {
+        metamask: {
+          rates: legacyRates,
+        },
+      };
+      const result = getRatesControllerRates(state);
+
+      expect(result).toBe(legacyRates);
+      expect(result).toStrictEqual(legacyRates);
+    });
+  });
+
+  describe('when assets unify state feature is enabled (happy path)', () => {
+    it('derives rates from assetsInfo and assetsPrice for non-EVM native assets', () => {
+      const lastUpdated = 1700000000000;
+      const state = {
+        metamask: {
+          ...enabledFlags,
+          rates: {},
+          assetsInfo: {
+            [nativeEthAssetId]: {
+              type: 'native',
+              symbol: 'ETH',
+              decimals: 18,
+            },
+            [bitcoinNativeAssetId]: {
+              type: 'native',
+              symbol: 'BTC',
+              decimals: 8,
+            },
+            [solanaNativeAssetId]: {
+              type: 'native',
+              symbol: 'SOL',
+              decimals: 9,
+            },
+          },
+          assetsPrice: {
+            [nativeEthAssetId]: makeMockPrice({
+              id: 'eth',
+              price: 2000,
+              usdPrice: 2000,
+              lastUpdated,
+            }),
+            [bitcoinNativeAssetId]: makeMockPrice({
+              id: 'btc',
+              price: 71052.43,
+              usdPrice: 71052.43,
+              lastUpdated,
+            }),
+            [solanaNativeAssetId]: makeMockPrice({
+              id: 'sol',
+              price: 91.69,
+              usdPrice: 91.69,
+              lastUpdated,
+            }),
+          },
+        },
+      };
+      const result = getRatesControllerRates(state);
+
+      expect(result.eth).toBeUndefined();
+      expect(result).toStrictEqual({
+        btc: {
+          conversionDate: lastUpdated,
+          conversionRate: 71052.43,
+          usdConversionRate: 71052.43,
+        },
+        sol: {
+          conversionDate: lastUpdated,
+          conversionRate: 91.69,
+          usdConversionRate: 91.69,
+        },
+      });
+    });
+  });
+});
+
+describe('getRatesControllerFiatCurrency', () => {
+  describe('when assets unify state feature is disabled', () => {
+    it('returns fiatCurrency from state unchanged', () => {
+      const state = {
+        metamask: {
+          fiatCurrency: 'eur',
+        },
+      };
+      const result = getRatesControllerFiatCurrency(state);
+
+      expect(result).toBe('eur');
+    });
+  });
+
+  describe('when assets unify state feature is enabled', () => {
+    it('returns selectedCurrency from new state', () => {
+      const state = {
+        metamask: {
+          ...enabledFlags,
+          fiatCurrency: 'eur',
+          selectedCurrency: 'usd',
+        },
+      };
+      const result = getRatesControllerFiatCurrency(state);
+
+      expect(result).toBe('usd');
+    });
+  });
+});
diff --git a/shared/lib/selectors/assets-migration.ts b/shared/lib/selectors/assets-migration.ts
index 83aaea4c92c8..888b46c88bb3 100644
--- a/shared/lib/selectors/assets-migration.ts
+++ b/shared/lib/selectors/assets-migration.ts
@@ -22,6 +22,7 @@ import {
   CurrencyRateState,
   MarketDataDetails,
   TokenRatesControllerState,
+  RatesControllerState,
 } from '@metamask/assets-controllers';
 import { AccountsControllerState } from '@metamask/accounts-controller';
 import { isEvmAccountType } from '@metamask/keyring-api';
@@ -70,11 +71,11 @@ import { createDeepEqualSelector } from './selector-creators';
 // conversionRates: DONE
 // historicalPrices: TODO (This state should be removed)
 //
+// RatesController
+// rates: DONE
+//
 // TokenListController
 // tokensChainsCache: TODO (There are no plans to port this state)
-//
-// RatesController
-// rates: TODO (This state should be removed)
 
 // This utility type makes the selector forceably require just the state that was originally required
 // For selectors with custom state input, this prevents their input type from requiring additional state that will not be needed after the migration
@@ -881,6 +882,69 @@ export const getMultichainAssetsRatesControllerConversionRates =
     'conversionRates'
   >;
 
+export const getRatesControllerRates = createDeepEqualSelector(
+  [
+    getIsAssetsUnifyStateEnabled,
+    (state: { metamask: RatesControllerState }) => state.metamask.rates ?? {},
+    (state: { metamask: AssetsControllerState }) =>
+      state.metamask?.assetsInfo ?? {},
+    (state: { metamask: AssetsControllerState }) =>
+      state.metamask?.assetsPrice ?? {},
+  ],
+  (isAssetsUnifyStateEnabled, rates, assetsInfo, assetsPrice) => {
+    if (!isAssetsUnifyStateEnabled) {
+      return rates;
+    }
+
+    const result: RatesControllerState['rates'] = {};
+
+    for (const [assetId, metadata] of Object.entries(assetsInfo)) {
+      const symbol = metadata.symbol.toLowerCase();
+
+      // Skip if we already have an entry for this symbol
+      if (result[symbol]) {
+        continue;
+      }
+
+      const assetType = parseCaipAssetType(assetId as CaipAssetType);
+      const price = assetsPrice[assetId];
+
+      // Skip if not a native asset, if evm or if not fungible
+      if (
+        metadata.type !== 'native' ||
+        assetType.chain.namespace === KnownCaipNamespace.Eip155 ||
+        price?.assetPriceType !== 'fungible'
+      ) {
+        continue;
+      }
+
+      result[symbol] = {
+        conversionDate: price.lastUpdated,
+        conversionRate: price.price,
+        usdConversionRate: price.usdPrice,
+      };
+    }
+
+    return result;
+  },
+) as unknown as ControllerStateSelector<RatesControllerState, 'rates'>;
+
+export const getRatesControllerFiatCurrency = createDeepEqualSelector(
+  [
+    getIsAssetsUnifyStateEnabled,
+    (state: { metamask: RatesControllerState }) => state.metamask.fiatCurrency,
+    (state: { metamask: AssetsControllerState }) =>
+      state.metamask.selectedCurrency,
+  ],
+  (isAssetsUnifyStateEnabled, fiatCurrency, selectedCurrency) => {
+    if (!isAssetsUnifyStateEnabled) {
+      return fiatCurrency;
+    }
+
+    return selectedCurrency;
+  },
+) as unknown as ControllerStateSelector<RatesControllerState, 'fiatCurrency'>;
+
 function parseBalanceWithDecimals(
   balanceString: string,
   decimals: number,
diff --git a/shared/lib/selectors/networks.ts b/shared/lib/selectors/networks.ts
index 045d4402848e..f687d2ad6950 100644
--- a/shared/lib/selectors/networks.ts
+++ b/shared/lib/selectors/networks.ts
@@ -127,7 +127,7 @@ export const getNetworkConfigurationsByCaipChainId = ({
 
   // For now we need to filter out networkConfigurations/scopes without accounts because
   // the `endowment:caip25` caveat validator will throw if there are no supported accounts for the given scope
-  // due to how the `MultichainRouter.isSupportedScope()` method is implemented
+  // due to how the `MultichainRoutingService.isSupportedScope()` method is implemented
   Object.entries(multichainNetworkConfigurationsByChainId).forEach(
     ([caipChainId, networkConfig]) => {
       const matchesAccount = Object.values(internalAccounts.accounts).some(
diff --git a/shared/lib/swaps.utils.js b/shared/lib/swaps.utils.js
deleted file mode 100644
index 799f17d1df85..000000000000
--- a/shared/lib/swaps.utils.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../constants/swaps';
-
-/**
- * Checks whether the provided address is strictly equal to the address for
- * the default swaps token of the provided chain.
- *
- * @param {string} address - The string to compare to the default token address
- * @param {string} chainId - The hex encoded chain ID of the default swaps token to check
- * @returns {boolean} Whether the address is the provided chain's default token address
- */
-export function isSwapsDefaultTokenAddress(address, chainId) {
-  if (!address || !chainId) {
-    return false;
-  }
-
-  return address === SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId]?.address;
-}
-
-/**
- * Checks whether the provided symbol is strictly equal to the symbol for
- * the default swaps token of the provided chain.
- *
- * @param {string} symbol - The string to compare to the default token symbol
- * @param {string} chainId - The hex encoded chain ID of the default swaps token to check
- * @returns {boolean} Whether the symbl is the provided chain's default token symbol
- */
-export function isSwapsDefaultTokenSymbol(symbol, chainId) {
-  if (!symbol || !chainId) {
-    return false;
-  }
-
-  return symbol === SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId]?.symbol;
-}
diff --git a/shared/lib/swaps.utils.test.ts b/shared/lib/swaps.utils.test.ts
new file mode 100644
index 000000000000..9235d01769a8
--- /dev/null
+++ b/shared/lib/swaps.utils.test.ts
@@ -0,0 +1,65 @@
+import { CHAIN_IDS } from '../constants/network';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../constants/swaps';
+import {
+  isSwapsDefaultTokenAddress,
+  isSwapsDefaultTokenSymbol,
+} from './swaps.utils';
+
+describe('swaps.utils', () => {
+  describe('isSwapsDefaultTokenAddress', () => {
+    it('returns true when the address matches the default token address for the given chain', () => {
+      const { address } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenAddress(address, CHAIN_IDS.MAINNET)).toBe(true);
+    });
+
+    it('returns false when the address does not match the default token address', () => {
+      expect(
+        isSwapsDefaultTokenAddress(
+          '0x1234567890abcdef1234567890abcdef12345678',
+          CHAIN_IDS.MAINNET,
+        ),
+      ).toBe(false);
+    });
+
+    it('returns false when the address is an empty string', () => {
+      expect(isSwapsDefaultTokenAddress('', CHAIN_IDS.MAINNET)).toBe(false);
+    });
+
+    it('returns false when the chainId is an empty string', () => {
+      const { address } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenAddress(address, '')).toBe(false);
+    });
+
+    it('returns false when the chainId is not in the map', () => {
+      const { address } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenAddress(address, '0x999')).toBe(false);
+    });
+  });
+
+  describe('isSwapsDefaultTokenSymbol', () => {
+    it('returns true when the symbol matches the default token symbol for the given chain', () => {
+      const { symbol } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenSymbol(symbol, CHAIN_IDS.MAINNET)).toBe(true);
+    });
+
+    it('returns false when the symbol does not match the default token symbol', () => {
+      expect(isSwapsDefaultTokenSymbol('NOT_ETH', CHAIN_IDS.MAINNET)).toBe(
+        false,
+      );
+    });
+
+    it('returns false when the symbol is an empty string', () => {
+      expect(isSwapsDefaultTokenSymbol('', CHAIN_IDS.MAINNET)).toBe(false);
+    });
+
+    it('returns false when the chainId is an empty string', () => {
+      const { symbol } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenSymbol(symbol, '')).toBe(false);
+    });
+
+    it('returns false when the chainId is not in the map', () => {
+      const { symbol } = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+      expect(isSwapsDefaultTokenSymbol(symbol, '0x999')).toBe(false);
+    });
+  });
+});
diff --git a/shared/lib/swaps.utils.ts b/shared/lib/swaps.utils.ts
new file mode 100644
index 000000000000..0f38bebf42ac
--- /dev/null
+++ b/shared/lib/swaps.utils.ts
@@ -0,0 +1,46 @@
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../constants/swaps';
+
+type SwapsChainId = keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP;
+
+/**
+ * Checks whether the provided address is strictly equal to the address for
+ * the default swaps token of the provided chain.
+ *
+ * @param address - The string to compare to the default token address
+ * @param chainId - The hex encoded chain ID of the default swaps token to check
+ * @returns Whether the address is the provided chain's default token address
+ */
+export function isSwapsDefaultTokenAddress(
+  address: string,
+  chainId: string,
+): boolean {
+  if (!address || !chainId) {
+    return false;
+  }
+
+  return (
+    address ===
+    SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId as SwapsChainId]?.address
+  );
+}
+
+/**
+ * Checks whether the provided symbol is strictly equal to the symbol for
+ * the default swaps token of the provided chain.
+ *
+ * @param symbol - The string to compare to the default token symbol
+ * @param chainId - The hex encoded chain ID of the default swaps token to check
+ * @returns Whether the symbol is the provided chain's default token symbol
+ */
+export function isSwapsDefaultTokenSymbol(
+  symbol: string,
+  chainId: string,
+): boolean {
+  if (!symbol || !chainId) {
+    return false;
+  }
+
+  return (
+    symbol === SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId as SwapsChainId]?.symbol
+  );
+}
diff --git a/shared/lib/switch-direction.js b/shared/lib/switch-direction.js
deleted file mode 100644
index 6bc5dd8f94e2..000000000000
--- a/shared/lib/switch-direction.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Switch the CSS rules used between 'rtl' and 'ltr'
- *
- * @param {('ltr' | 'rtl' | 'auto')} direction - Text direction, either left-to-right (ltr) or right-to-left (rtl)
- */
-export const switchDirection = (direction) => {
-  document.documentElement.dir = direction === 'auto' ? 'ltr' : direction;
-};
-
-export const switchDirectionForPreferredLocale = (preferredLocale) => {
-  const textDirection = ['ar', 'dv', 'fa', 'he', 'ku'].includes(preferredLocale)
-    ? 'rtl'
-    : 'auto';
-
-  switchDirection(textDirection);
-};
diff --git a/shared/lib/switch-direction.ts b/shared/lib/switch-direction.ts
new file mode 100644
index 000000000000..ec8017a8d10f
--- /dev/null
+++ b/shared/lib/switch-direction.ts
@@ -0,0 +1,22 @@
+const RTL_LOCALES = ['ar', 'dv', 'fa', 'he', 'ku'] as const;
+
+/**
+ * Switch the CSS rules used between 'rtl' and 'ltr'
+ *
+ * @param direction - Text direction, either left-to-right (ltr) or right-to-left (rtl)
+ */
+export const switchDirection = (direction: 'ltr' | 'rtl' | 'auto'): void => {
+  document.documentElement.dir = direction === 'auto' ? 'ltr' : direction;
+};
+
+export const switchDirectionForPreferredLocale = (
+  preferredLocale: string,
+): void => {
+  const textDirection = (RTL_LOCALES as readonly string[]).includes(
+    preferredLocale,
+  )
+    ? 'rtl'
+    : 'auto';
+
+  switchDirection(textDirection);
+};
diff --git a/shared/lib/transaction-controller-utils.test.js b/shared/lib/transactions-controller-utils.test.ts
similarity index 86%
rename from shared/lib/transaction-controller-utils.test.js
rename to shared/lib/transactions-controller-utils.test.ts
index d6207b9b870d..7da9948f4b25 100644
--- a/shared/lib/transaction-controller-utils.test.js
+++ b/shared/lib/transactions-controller-utils.test.ts
@@ -1,4 +1,8 @@
-import { TransactionEnvelopeType } from '@metamask/transaction-controller';
+/* eslint-disable @typescript-eslint/naming-convention */
+import {
+  TransactionEnvelopeType,
+  TransactionMeta,
+} from '@metamask/transaction-controller';
 import BigNumber from 'bignumber.js';
 import { EtherDenomination } from '../constants/common';
 import { CHAIN_IDS } from '../constants/network';
@@ -10,6 +14,14 @@ import {
   TOKEN_TRANSFER_LOG_TOPIC_HASH,
 } from './transactions-controller-utils';
 
+/**
+ * Partial tx meta for tests; full `TransactionMeta` is not needed for these cases.
+ * @param fixture
+ */
+function txMetaFixture(fixture: object): TransactionMeta {
+  return fixture as unknown as TransactionMeta;
+}
+
 describe('transaction controller utils', () => {
   describe('calcGasTotal()', () => {
     it('should correctly compute gasTotal', () => {
@@ -59,7 +71,11 @@ describe('transaction controller utils', () => {
       ],
     ])(
       'returns the value %s divided by 10^%s = %s',
-      (value, decimals, expected) => {
+      (
+        value: string | number | BigNumber,
+        decimals: number | undefined,
+        expected: string,
+      ) => {
         expect(calcTokenAmount(value, decimals).toString()).toBe(expected);
       },
     );
@@ -67,17 +83,20 @@ describe('transaction controller utils', () => {
 
   describe('getSwapsTokensReceivedFromTxMeta', () => {
     it('returns null if txMeta is not well formed', () => {
-      expect(getSwapsTokensReceivedFromTxMeta('ETH', {}, '0x00')).toBe(null);
+      expect(
+        getSwapsTokensReceivedFromTxMeta('ETH', txMetaFixture({}), '0x00'),
+      ).toBe(null);
     });
 
     it('returns null if tokenSymbol is the default for network but txMeta does not contain a receipt', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          {},
+          txMetaFixture({}),
           '0x00',
           '8',
-          {},
+          undefined,
+          undefined,
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(null);
@@ -87,10 +106,11 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          { txReceipt: {}, postTxBalance: '0xe' },
+          txMetaFixture({ txReceipt: {}, postTxBalance: '0xe' }),
           '0x00',
           '8',
-          {},
+          undefined,
+          undefined,
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(null);
@@ -100,10 +120,11 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          { txReceipt: {}, preTxBalance: '0xe' },
+          txMetaFixture({ txReceipt: {}, preTxBalance: '0xe' }),
           '0x00',
           '8',
-          {},
+          undefined,
+          undefined,
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(null);
@@ -113,16 +134,16 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          {
+          txMetaFixture({
             txReceipt: {},
             preTxBalance: '0xe',
             postTxBalance: '0xe',
             swapMetaData: { token_to_amount: '0x1' },
-          },
+          }),
           '0x00',
           '0x00',
           '8',
-          {},
+          txMetaFixture({}),
           CHAIN_IDS.MAINNET,
         ),
       ).toBe('0x1');
@@ -141,7 +162,7 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          {
+          txMetaFixture({
             txReceipt: {
               gasUsed,
               effectiveGasPrice,
@@ -150,11 +171,11 @@ describe('transaction controller utils', () => {
             preTxBalance: preTxBalance.toPrefixedHexString(),
             postTxBalance: postTxBalance.toPrefixedHexString(),
             swapMetaData: { token_to_amount: '0x1' },
-          },
+          }),
           '0x00',
           '0x00',
           '8',
-          {},
+          txMetaFixture({}),
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(ethReceived.toString());
@@ -181,7 +202,7 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          {
+          txMetaFixture({
             txReceipt: {
               gasUsed,
               effectiveGasPrice,
@@ -190,17 +211,17 @@ describe('transaction controller utils', () => {
             preTxBalance: preTxBalance.toPrefixedHexString(),
             postTxBalance: postTxBalance.toPrefixedHexString(),
             swapMetaData: { token_to_amount: '0x1' },
-          },
+          }),
           '0x00',
           '0x00',
           '8',
-          {
+          txMetaFixture({
             txReceipt: {
               gasUsed: gasUsedApproval,
               effectiveGasPrice: effectiveGasPriceApproval,
               type: TransactionEnvelopeType.feeMarket,
             },
-          },
+          }),
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(ethReceived.toString());
@@ -224,7 +245,7 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'ETH',
-          {
+          txMetaFixture({
             txReceipt: {
               gasUsed,
               type: TransactionEnvelopeType.legacy,
@@ -235,11 +256,11 @@ describe('transaction controller utils', () => {
             preTxBalance: preTxBalance.toPrefixedHexString(),
             postTxBalance: postTxBalance.toPrefixedHexString(),
             swapMetaData: { token_to_amount: '0x1' },
-          },
+          }),
           '0x00',
           '0x00',
           '8',
-          {
+          txMetaFixture({
             txReceipt: {
               gasUsed: gasUsedApproval,
               type: TransactionEnvelopeType.feeMarket,
@@ -247,7 +268,7 @@ describe('transaction controller utils', () => {
             txParams: {
               gasPrice: gasPriceApproval,
             },
-          },
+          }),
           CHAIN_IDS.MAINNET,
         ),
       ).toBe(ethReceived.toString());
@@ -264,18 +285,18 @@ describe('transaction controller utils', () => {
       expect(
         getSwapsTokensReceivedFromTxMeta(
           'USDC',
-          {
+          txMetaFixture({
             txReceipt: { logs, status: '0x1' },
-          },
+          }),
           '0x00',
           '0x00',
           '8',
-          {
+          txMetaFixture({
             txReceipt: {},
-          },
+          }),
           CHAIN_IDS.MAINNET,
         ),
-      ).toBe(calcTokenAmount(logs[0].data, 8).toString(10), 6);
+      ).toBe(calcTokenAmount(logs[0].data, 8).toString(10));
     });
   });
 
@@ -293,10 +314,10 @@ describe('transaction controller utils', () => {
       .minus(preTxBalance.minus(gasCost, 16))
       .toDenomination(EtherDenomination.ETH);
 
-    const get = (precision) =>
+    const get = (precision: number | null) =>
       getSwapsTokensReceivedFromTxMeta(
         'ETH',
-        {
+        txMetaFixture({
           txReceipt: {
             gasUsed,
             effectiveGasPrice,
@@ -305,11 +326,11 @@ describe('transaction controller utils', () => {
           preTxBalance: preTxBalance.toPrefixedHexString(),
           postTxBalance: postTxBalance.toPrefixedHexString(),
           swapMetaData: { token_to_amount: '0x1' },
-        },
+        }),
         '0x00',
         '0x00',
         '8',
-        {},
+        txMetaFixture({}),
         CHAIN_IDS.MAINNET,
         precision,
       );
@@ -329,14 +350,14 @@ describe('transaction controller utils', () => {
       },
     ];
     const fullPrecision = calcTokenAmount(logs[0].data, 8);
-    const get = (precision) =>
+    const get = (precision: number | null) =>
       getSwapsTokensReceivedFromTxMeta(
         'USDC',
-        { txReceipt: { logs, status: '0x1' } },
+        txMetaFixture({ txReceipt: { logs, status: '0x1' } }),
         '0x00',
         '0x00',
         '8',
-        { txReceipt: {} },
+        txMetaFixture({ txReceipt: {} }),
         CHAIN_IDS.MAINNET,
         precision,
       );
diff --git a/shared/lib/transactions-controller-utils.js b/shared/lib/transactions-controller-utils.ts
similarity index 50%
rename from shared/lib/transactions-controller-utils.js
rename to shared/lib/transactions-controller-utils.ts
index 6fb78498b9f0..c699264e4ddc 100644
--- a/shared/lib/transactions-controller-utils.js
+++ b/shared/lib/transactions-controller-utils.ts
@@ -1,5 +1,8 @@
 import BigNumber from 'bignumber.js';
-import { TransactionEnvelopeType } from '@metamask/transaction-controller';
+import {
+  TransactionEnvelopeType,
+  TransactionMeta,
+} from '@metamask/transaction-controller';
 
 import { EtherDenomination } from '../constants/common';
 import { Numeric } from './Numeric';
@@ -15,7 +18,10 @@ export const TRANSFER_SINFLE_LOG_TOPIC_HASH =
 
 export const TEN_SECONDS_IN_MILLISECONDS = 10_000;
 
-export function calcGasTotal(gasLimit = '0', gasPrice = '0') {
+export function calcGasTotal(
+  gasLimit: string | number = '0',
+  gasPrice: string | number = '0',
+): string {
   return new Numeric(gasLimit, 16).times(new Numeric(gasPrice, 16)).toString();
 }
 
@@ -24,42 +30,61 @@ export function calcGasTotal(gasLimit = '0', gasPrice = '0') {
  * significant digits, but without any trailing zeros after the decimal point To be used when wishing
  * to display only as much digits to the user as necessary
  *
- * @param {string | number | BigNumber} n - The number to format
- * @param {number} precision - The maximum number of significant digits in the return value
- * @returns {string} The number in decimal form, with <= precision significant digits and no decimal trailing zeros
+ * @param n - The number to format
+ * @param precision - The maximum number of significant digits in the return value
+ * @returns The number in decimal form, with <= precision significant digits and no decimal trailing zeros
  */
-export function toPrecisionWithoutTrailingZeros(n, precision) {
-  return new BigNumber(n)
+export function toPrecisionWithoutTrailingZeros(
+  n: string | number | BigNumber,
+  precision: number,
+): string {
+  return new BigNumber(n as string | number)
     .toPrecision(precision)
     .replace(/(\.[0-9]*[1-9])0*|(\.0*)/u, '$1');
 }
 
 /**
- * @param {number|string|BigNumber} value
- * @param {number=} decimals
- * @returns {BigNumber}
+ * @param value - The token amount value
+ * @param decimals - The number of decimals for the token
+ * @returns The token amount as a BigNumber
  */
-export function calcTokenAmount(value, decimals) {
+export function calcTokenAmount(
+  value: string | number | BigNumber,
+  decimals: number | undefined,
+): BigNumber {
   const divisor = new BigNumber(10).pow(decimals ?? 0);
   return new BigNumber(String(value)).div(divisor);
 }
 
 export function getSwapsTokensReceivedFromTxMeta(
-  tokenSymbol,
-  txMeta,
-  tokenAddress,
-  senderAddress,
-  tokenDecimals,
-  approvalTxMeta,
-  chainId,
-  precision = 6,
-) {
+  tokenSymbol?: string,
+  txMeta?: TransactionMeta | null,
+  tokenAddress?: string | null,
+  senderAddress?: string,
+  tokenDecimals?: number | string,
+  approvalTxMeta?: TransactionMeta | null,
+  chainId?: string | number,
+  precision: number | null = 6,
+): string | null {
   const accountAddress = txMeta?.swapAndSendRecipient ?? senderAddress;
 
   const txReceipt = txMeta?.txReceipt;
+  // The `type` property is not in the official TransactionReceipt type but is
+  // set by MetaMask to reflect the EIP-2718 envelope type of the transaction.
+  const txReceiptType = (txReceipt as { type?: string } | undefined)?.type;
   const networkAndAccountSupports1559 =
-    txMeta?.txReceipt?.type === TransactionEnvelopeType.feeMarket;
-  if (isSwapsDefaultTokenSymbol(tokenSymbol, chainId)) {
+    txReceiptType === TransactionEnvelopeType.feeMarket;
+
+  const isDefaultSwapsToken =
+    tokenSymbol !== undefined &&
+    chainId !== undefined &&
+    (typeof chainId === 'number'
+      ? chainId !== 0 &&
+        !Number.isNaN(chainId) &&
+        isSwapsDefaultTokenSymbol(tokenSymbol, `0x${chainId.toString(16)}`)
+      : isSwapsDefaultTokenSymbol(tokenSymbol, chainId));
+
+  if (isDefaultSwapsToken) {
     if (
       !txReceipt ||
       !txMeta ||
@@ -72,7 +97,7 @@ export function getSwapsTokensReceivedFromTxMeta(
     if (txMeta.swapMetaData && txMeta.preTxBalance === txMeta.postTxBalance) {
       // If preTxBalance and postTxBalance are equal, postTxBalance hasn't been updated on time
       // because of the RPC provider delay, so we return an estimated receiving amount instead.
-      return txMeta.swapMetaData.token_to_amount;
+      return txMeta.swapMetaData.token_to_amount as string;
     }
 
     let approvalTxGasCost = new Numeric('0x0', 16);
@@ -82,7 +107,7 @@ export function getSwapsTokensReceivedFromTxMeta(
           approvalTxMeta.txReceipt.gasUsed,
           networkAndAccountSupports1559
             ? approvalTxMeta.txReceipt.effectiveGasPrice // Base fee + priority fee.
-            : approvalTxMeta.txParams.gasPrice,
+            : approvalTxMeta.txParams?.gasPrice,
         ),
         16,
       );
@@ -92,7 +117,7 @@ export function getSwapsTokensReceivedFromTxMeta(
       txReceipt.gasUsed,
       networkAndAccountSupports1559
         ? txReceipt.effectiveGasPrice
-        : txMeta.txParams.gasPrice,
+        : txMeta.txParams?.gasPrice,
     );
     const totalGasCost = new Numeric(gasCost, 16).add(approvalTxGasCost);
 
@@ -109,32 +134,44 @@ export function getSwapsTokensReceivedFromTxMeta(
       .toDenomination(EtherDenomination.ETH)
       .toBase(10);
 
-    return (
-      precision === null ? ethReceived : ethReceived.round(precision)
-    ).toFixed();
+    const formatted =
+      precision === null ? ethReceived : ethReceived.round(precision);
+    return formatted.value.toFixed();
   }
   const txReceiptLogs = txReceipt?.logs;
   if (txReceiptLogs && txReceipt?.status !== '0x0') {
-    const tokenTransferLog = txReceiptLogs.find((txReceiptLog) => {
-      const isTokenTransfer =
-        txReceiptLog.topics &&
-        txReceiptLog.topics[0] === TOKEN_TRANSFER_LOG_TOPIC_HASH;
-      const isTransferFromGivenToken =
-        txReceiptLog.address?.toLowerCase() === tokenAddress?.toLowerCase();
-      const isTransferFromGivenAddress =
-        txReceiptLog.topics &&
-        txReceiptLog.topics[2] &&
-        (txReceiptLog.topics[2] === accountAddress ||
-          txReceiptLog.topics[2].match(accountAddress?.slice(2)));
-      return (
-        isTokenTransfer &&
-        isTransferFromGivenToken &&
-        isTransferFromGivenAddress
-      );
-    });
+    // The `Log.topics` type in @metamask/transaction-controller is `string`
+    // but in practice it is an array of hex strings per the Ethereum spec.
+    type LogWithTopicsArray = {
+      topics?: string[];
+      address?: string;
+      data?: string;
+    };
+    const tokenTransferLog = (txReceiptLogs as LogWithTopicsArray[]).find(
+      (txReceiptLog) => {
+        const isTokenTransfer =
+          txReceiptLog.topics &&
+          txReceiptLog.topics[0] === TOKEN_TRANSFER_LOG_TOPIC_HASH;
+        const isTransferFromGivenToken =
+          txReceiptLog.address?.toLowerCase() === tokenAddress?.toLowerCase();
+        const isTransferFromGivenAddress =
+          txReceiptLog.topics &&
+          txReceiptLog.topics[2] &&
+          (txReceiptLog.topics[2] === accountAddress ||
+            txReceiptLog.topics[2].match(accountAddress?.slice(2) ?? ''));
+        return (
+          isTokenTransfer &&
+          isTransferFromGivenToken &&
+          isTransferFromGivenAddress
+        );
+      },
+    );
 
     if (tokenTransferLog) {
-      const tokenAmount = calcTokenAmount(tokenTransferLog.data, tokenDecimals);
+      const tokenAmount = calcTokenAmount(
+        tokenTransferLog.data ?? '0',
+        tokenDecimals as number,
+      );
       return precision === null
         ? tokenAmount.toFixed()
         : toPrecisionWithoutTrailingZeros(tokenAmount, precision);
diff --git a/shared/lib/ui-utils.js b/shared/lib/ui-utils.ts
similarity index 100%
rename from shared/lib/ui-utils.js
rename to shared/lib/ui-utils.ts
diff --git a/shared/types/background.ts b/shared/types/background.ts
index c846f671b36a..7237f1d60a3d 100644
--- a/shared/types/background.ts
+++ b/shared/types/background.ts
@@ -38,7 +38,7 @@ import type { PermissionLogControllerState } from '@metamask/permission-log-cont
 import type {
   SnapControllerState,
   CronjobControllerState,
-  SnapsRegistryState,
+  SnapRegistryControllerState,
   SnapInterfaceControllerState,
   SnapInsightsControllerState,
 } from '@metamask/snaps-controllers';
@@ -162,6 +162,7 @@ export type ControllerStatePropertiesEnumerated = {
   quotesRefreshCount: BridgeControllerState['quotesRefreshCount'];
   minimumBalanceForRentExemptionInLamports: BridgeControllerState['minimumBalanceForRentExemptionInLamports'];
   assetExchangeRates: BridgeControllerState['assetExchangeRates'];
+  tokenWarnings: BridgeControllerState['tokenWarnings'];
   txHistory: BridgeStatusControllerState['txHistory'];
   events: CronjobControllerState['events'];
   currentCurrency: CurrencyRateState['currentCurrency'];
@@ -252,7 +253,6 @@ export type ControllerStatePropertiesEnumerated = {
   useTokenDetection: PreferencesControllerState['useTokenDetection'];
   useTransactionSimulations: PreferencesControllerState['useTransactionSimulations'];
   useSafeChainsListValidation: PreferencesControllerState['useSafeChainsListValidation'];
-  useBlockie: PreferencesControllerState['useBlockie'];
   usePhishDetect: PreferencesControllerState['usePhishDetect'];
   dismissSeedBackUpReminder: PreferencesControllerState['dismissSeedBackUpReminder'];
   overrideContentSecurityPolicyHeader: PreferencesControllerState['overrideContentSecurityPolicyHeader'];
@@ -295,10 +295,10 @@ export type ControllerStatePropertiesEnumerated = {
   unencryptedSnapStates: SnapControllerState['unencryptedSnapStates'];
   interfaces: SnapInterfaceControllerState['interfaces'];
   insights: SnapInsightsControllerState['insights'];
-  database: SnapsRegistryState['database'];
-  lastUpdated: SnapsRegistryState['lastUpdated'];
-  databaseUnavailable: SnapsRegistryState['databaseUnavailable'];
-  signature: SnapsRegistryState['signature'];
+  database: SnapRegistryControllerState['database'];
+  lastUpdated: SnapRegistryControllerState['lastUpdated'];
+  databaseUnavailable: SnapRegistryControllerState['databaseUnavailable'];
+  signature: SnapRegistryControllerState['signature'];
   subjectMetadata: SubjectMetadataControllerState['subjectMetadata'];
   tokenBalances: TokenBalancesControllerState['tokenBalances'];
   allDetectedTokens: TokensControllerState['allDetectedTokens'];
@@ -380,7 +380,7 @@ type ControllerStateTypesMerged = AccountsControllerState &
   SnapControllerState &
   SnapInterfaceControllerState &
   SnapInsightsControllerState &
-  SnapsRegistryState &
+  SnapRegistryControllerState &
   SubjectMetadataControllerState &
   TokenBalancesControllerState &
   TokensControllerState &
diff --git a/test/data/bridge/mock-bridge-store.ts b/test/data/bridge/mock-bridge-store.ts
index 015638ab10ee..cd95f5ef6c98 100644
--- a/test/data/bridge/mock-bridge-store.ts
+++ b/test/data/bridge/mock-bridge-store.ts
@@ -405,6 +405,9 @@ export const createBridgeMockStore = ({
         ...marketDataOverrides,
       },
       slides: [],
+      selectedAccountGroup:
+        accountTreeOverrides?.selectedAccountGroup ??
+        'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       accountTree: {
         wallets: {
           'entropy:01K2FF18CTTXJYD34R78X4N1N1': {
@@ -427,6 +430,7 @@ export const createBridgeMockStore = ({
                   entropy: {
                     groupIndex: 0,
                   },
+                  lastSelected: 0,
                 },
                 accounts: [
                   MOCK_EVM_ACCOUNT.id,
@@ -444,6 +448,7 @@ export const createBridgeMockStore = ({
                   entropy: {
                     groupIndex: 1,
                   },
+                  lastSelected: 0,
                 },
                 accounts: [MOCK_EVM_ACCOUNT_2.id],
               },
@@ -468,15 +473,13 @@ export const createBridgeMockStore = ({
                     name: 'Ledger Account 1',
                     pinned: false,
                     hidden: false,
+                    lastSelected: 0,
                   },
                   accounts: [MOCK_LEDGER_ACCOUNT.id],
                 },
             },
           },
         },
-        selectedAccountGroup:
-          accountTreeOverrides?.selectedAccountGroup ??
-          'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       },
       ...tokenData,
       ...metamaskStateOverridesWithoutAccounts,
diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index 8e42c8555b52..e5a5c76fc6a7 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -182,7 +182,8 @@
                   "groupIndex": 0
                 },
                 "hidden": false,
-                "pinned": false
+                "pinned": false,
+                "lastSelected": 0
               }
             }
           },
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 0a95ec1ff53d..b30ddcc25824 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -531,8 +531,8 @@
         ]
       }
     },
+    "selectedAccountGroup": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0",
     "accountTree": {
-      "selectedAccountGroup": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0",
       "wallets": {
         "entropy:01JKAF3DSGM3AB87EM9N0K41AJ": {
           "id": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ",
@@ -551,7 +551,8 @@
                   "groupIndex": 0
                 },
                 "hidden": false,
-                "pinned": false
+                "pinned": false,
+                "lastSelected": 0
               }
             }
           },
@@ -574,6 +575,7 @@
                 "name": "Account 2",
                 "hidden": false,
                 "pinned": false,
+                "lastSelected": 0,
                 "entropy": {
                   "groupIndex": 0
                 }
@@ -598,7 +600,8 @@
               "metadata": {
                 "name": "Ledger Account 1",
                 "hidden": false,
-                "pinned": false
+                "pinned": false,
+                "lastSelected": 0
               }
             }
           },
@@ -620,7 +623,8 @@
               "metadata": {
                 "name": "Another Snap Account 1",
                 "hidden": false,
-                "pinned": false
+                "pinned": false,
+                "lastSelected": 0
               }
             }
           },
@@ -642,7 +646,8 @@
               "metadata": {
                 "name": "Snap Account 1",
                 "hidden": false,
-                "pinned": false
+                "pinned": false,
+                "lastSelected": 0
               }
             }
           },
diff --git a/test/e2e/benchmarks/flows/README.md b/test/e2e/benchmarks/flows/README.md
index 13fa420af8ab..8cea04449707 100644
--- a/test/e2e/benchmarks/flows/README.md
+++ b/test/e2e/benchmarks/flows/README.md
@@ -84,9 +84,7 @@ Every benchmark **must** have a threshold entry in `THRESHOLD_REGISTRY` inside `
 To add thresholds for a new benchmark:
 
 1. Define a threshold config constant in `test/e2e/benchmarks/utils/constants.ts`
-2. Add it to the appropriate collection:
-   - **Interaction/User Journey:** Add to `BENCHMARK_THRESHOLDS`
-   - **Startup:** Add to `STARTUP_BENCHMARK_CONFIGS` (auto-generates 8 platform-combo entries)
+2. Add it to `BENCHMARK_THRESHOLDS` with a camelCase key matching the filename
 
 ```typescript
 const MY_BENCHMARK: ThresholdConfig = {
@@ -97,19 +95,16 @@ const MY_BENCHMARK: ThresholdConfig = {
   },
 };
 
-// For interaction/user journey:
+// Add to BENCHMARK_THRESHOLDS:
 const BENCHMARK_THRESHOLDS = {
-  myBenchmark: MY_BENCHMARK, // camelCase key matching filename
-};
-
-// For startup:
-const STARTUP_BENCHMARK_CONFIGS = {
-  startupMyBenchmark: MY_BENCHMARK, // Will generate 8 platform-combo entries
+  myBenchmark: MY_BENCHMARK, // camelCase key matching filename (my-benchmark.ts → myBenchmark)
 };
 ```
 
 The key must be **camelCase matching the filename**: `my-benchmark.ts` → `myBenchmark`.
 
+For startup benchmarks, use the `startup` prefix: `standard-home.ts` → `startupStandardHome`.
+
 ### 3. Add to a preset (optional)
 
 If your benchmark should run in CI, add its file path to the appropriate preset in `run-benchmark.ts`.
diff --git a/test/e2e/benchmarks/flows/interaction/bridge-user-actions.ts b/test/e2e/benchmarks/flows/interaction/bridge-user-actions.ts
index 2f8a76dc3b16..6d3c8f23ae54 100644
--- a/test/e2e/benchmarks/flows/interaction/bridge-user-actions.ts
+++ b/test/e2e/benchmarks/flows/interaction/bridge-user-actions.ts
@@ -14,9 +14,13 @@ import {
   MOCK_TOKENS_ETHEREUM,
 } from '../../../tests/bridge/constants';
 import { Driver } from '../../../webdriver/driver';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
-import { runUserActionBenchmark } from '../../utils/runner';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  runUserActionBenchmark,
+  collectWebVitals,
+} from '../../utils';
+import type { BenchmarkRunResult } from '../../utils';
 
 export const testTitle = 'benchmark-user-actions-bridge-user-actions';
 export const persona = BENCHMARK_PERSONA.STANDARD;
@@ -45,6 +49,7 @@ export async function run(): Promise<BenchmarkRunResult> {
     let loadPage: number = 0;
     let loadAssetPicker: number = 0;
     let searchToken: number = 0;
+    let webVitals;
 
     const fixtureBuilder = new FixtureBuilder()
       .withNetworkControllerOnMainnet()
@@ -94,13 +99,22 @@ export async function run(): Promise<BenchmarkRunResult> {
         searchToken =
           timestampAfterTokenSearch.getTime() -
           timestampBeforeTokenSearch.getTime();
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
-    return [
-      { id: 'bridge_load_page', duration: loadPage },
-      { id: 'bridge_load_asset_picker', duration: loadAssetPicker },
-      { id: 'bridge_search_token', duration: searchToken },
-    ];
+    return {
+      timers: [
+        { id: 'bridge_load_page', duration: loadPage },
+        { id: 'bridge_load_asset_picker', duration: loadAssetPicker },
+        { id: 'bridge_search_token', duration: searchToken },
+      ],
+      webVitals,
+    };
   }, BENCHMARK_TYPE.USER_ACTION);
 }
diff --git a/test/e2e/benchmarks/flows/interaction/confirm-tx.ts b/test/e2e/benchmarks/flows/interaction/confirm-tx.ts
index a8e34bc6e872..7784a917c3ea 100644
--- a/test/e2e/benchmarks/flows/interaction/confirm-tx.ts
+++ b/test/e2e/benchmarks/flows/interaction/confirm-tx.ts
@@ -8,9 +8,13 @@ import { withFixtures } from '../../../helpers';
 import { login } from '../../../page-objects/flows/login.flow';
 import { createInternalTransaction } from '../../../page-objects/flows/transaction';
 import { Driver } from '../../../webdriver/driver';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
-import { runUserActionBenchmark } from '../../utils/runner';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  runUserActionBenchmark,
+  collectWebVitals,
+} from '../../utils';
+import type { BenchmarkRunResult } from '../../utils';
 
 export const testTitle = 'benchmark-user-actions-confirm-tx';
 export const persona = BENCHMARK_PERSONA.STANDARD;
@@ -18,6 +22,7 @@ export const persona = BENCHMARK_PERSONA.STANDARD;
 export async function run(): Promise<BenchmarkRunResult> {
   return runUserActionBenchmark(async () => {
     let loadingTimes: number = 0;
+    let webVitals;
 
     await withFixtures(
       {
@@ -52,9 +57,18 @@ export async function run(): Promise<BenchmarkRunResult> {
         const timestampAfterAction = new Date();
         loadingTimes =
           timestampAfterAction.getTime() - timestampBeforeAction.getTime();
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
-    return [{ id: 'confirm_tx', duration: loadingTimes }];
+    return {
+      timers: [{ id: 'confirm_tx', duration: loadingTimes }],
+      webVitals,
+    };
   }, BENCHMARK_TYPE.USER_ACTION);
 }
diff --git a/test/e2e/benchmarks/flows/interaction/load-new-account.ts b/test/e2e/benchmarks/flows/interaction/load-new-account.ts
index 9b27937da82e..226f3da59f57 100644
--- a/test/e2e/benchmarks/flows/interaction/load-new-account.ts
+++ b/test/e2e/benchmarks/flows/interaction/load-new-account.ts
@@ -9,9 +9,13 @@ import { login } from '../../../page-objects/flows/login.flow';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import { Driver } from '../../../webdriver/driver';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
-import { runUserActionBenchmark } from '../../utils/runner';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  runUserActionBenchmark,
+  collectWebVitals,
+} from '../../utils';
+import type { BenchmarkRunResult } from '../../utils';
 
 export const testTitle = 'benchmark-user-actions-load-new-account';
 export const persona = BENCHMARK_PERSONA.STANDARD;
@@ -19,6 +23,7 @@ export const persona = BENCHMARK_PERSONA.STANDARD;
 export async function run(): Promise<BenchmarkRunResult> {
   return runUserActionBenchmark(async () => {
     let loadingTimes: number = 0;
+    let webVitals;
 
     await withFixtures(
       {
@@ -42,9 +47,18 @@ export async function run(): Promise<BenchmarkRunResult> {
         const timestampAfterAction = new Date();
         loadingTimes =
           timestampAfterAction.getTime() - timestampBeforeAction.getTime();
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
-    return [{ id: 'load_new_account', duration: loadingTimes }];
+    return {
+      timers: [{ id: 'load_new_account', duration: loadingTimes }],
+      webVitals,
+    };
   }, BENCHMARK_TYPE.USER_ACTION);
 }
diff --git a/test/e2e/benchmarks/flows/startup/power-user-home.ts b/test/e2e/benchmarks/flows/startup/power-user-home.ts
index ebe5fc3d18c4..aa157f0d4d0f 100644
--- a/test/e2e/benchmarks/flows/startup/power-user-home.ts
+++ b/test/e2e/benchmarks/flows/startup/power-user-home.ts
@@ -10,19 +10,28 @@ import { login } from '../../../page-objects/flows/login.flow';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import { mockNotificationServices } from '../../../tests/notifications/mocks';
-import type { BenchmarkResults } from '../../../../../shared/constants/benchmarks';
-import type { Metrics, PageLoadBenchmarkOptions } from '../../utils/types';
 import {
   BENCHMARK_PERSONA,
   WITH_STATE_POWER_USER,
-} from '../../utils/constants';
-import { runPageLoadBenchmark, type MeasurePageResult } from '../../utils';
+  runPageLoadBenchmark,
+  collectWebVitals,
+} from '../../utils';
+import type {
+  BenchmarkResults,
+  WebVitalsMetrics,
+} from '../../../../../shared/constants/benchmarks';
+import type {
+  Metrics,
+  PageLoadBenchmarkOptions,
+  MeasurePageResult,
+} from '../../utils';
 
 async function measurePagePowerUser(
   pageName: string,
   pageLoads: number,
 ): Promise<MeasurePageResult> {
   const metrics: Metrics[] = [];
+  const webVitalsRuns: WebVitalsMetrics[] = [];
   const title = 'measurePagePowerUser';
   const persona = BENCHMARK_PERSONA.POWER_USER;
   await withFixtures(
@@ -63,17 +72,19 @@ async function measurePagePowerUser(
 
         await driver.delay(1000);
 
+        const metricsThisLoad = await driver.collectMetrics();
+        metricsThisLoad.numNetworkReqs = getNetworkReport().numNetworkReqs;
+        metrics.push(metricsThisLoad);
+
         try {
-          const metricsThisLoad = await driver.collectMetrics();
-          metricsThisLoad.numNetworkReqs = getNetworkReport().numNetworkReqs;
-          metrics.push(metricsThisLoad);
+          webVitalsRuns.push(await collectWebVitals(driver));
         } catch (error) {
-          console.error(`Error collecting metrics for ${pageName}:`, error);
+          console.error(`Error collecting web vitals for ${pageName}:`, error);
         }
       }
     },
   );
-  return { metrics, title, persona };
+  return { metrics, title, persona, webVitalsRuns };
 }
 
 export async function run(
diff --git a/test/e2e/benchmarks/flows/startup/standard-home.ts b/test/e2e/benchmarks/flows/startup/standard-home.ts
index ca4ca6af44a7..d806a2a48b74 100644
--- a/test/e2e/benchmarks/flows/startup/standard-home.ts
+++ b/test/e2e/benchmarks/flows/startup/standard-home.ts
@@ -6,16 +6,27 @@
 import FixtureBuilder from '../../../fixtures/fixture-builder';
 import { withFixtures } from '../../../helpers';
 import { login } from '../../../page-objects/flows/login.flow';
-import type { BenchmarkResults } from '../../../../../shared/constants/benchmarks';
-import type { Metrics, PageLoadBenchmarkOptions } from '../../utils/types';
-import { BENCHMARK_PERSONA } from '../../utils/constants';
-import { runPageLoadBenchmark, type MeasurePageResult } from '../../utils';
+import {
+  BENCHMARK_PERSONA,
+  runPageLoadBenchmark,
+  collectWebVitals,
+} from '../../utils';
+import type {
+  BenchmarkResults,
+  WebVitalsMetrics,
+} from '../../../../../shared/constants/benchmarks';
+import type {
+  Metrics,
+  PageLoadBenchmarkOptions,
+  MeasurePageResult,
+} from '../../utils';
 
 async function measurePageStandard(
   pageName: string,
   pageLoads: number,
 ): Promise<MeasurePageResult> {
   const metrics: Metrics[] = [];
+  const webVitalsRuns: WebVitalsMetrics[] = [];
   const title = 'measurePageStandard';
   const persona = BENCHMARK_PERSONA.STANDARD;
   await withFixtures(
@@ -35,10 +46,16 @@ async function measurePageStandard(
         const metricsThisLoad = await driver.collectMetrics();
         metricsThisLoad.numNetworkReqs = getNetworkReport().numNetworkReqs;
         metrics.push(metricsThisLoad);
+
+        try {
+          webVitalsRuns.push(await collectWebVitals(driver));
+        } catch (error) {
+          console.error(`Error collecting web vitals for ${pageName}:`, error);
+        }
       }
     },
   );
-  return { metrics, title, persona };
+  return { metrics, title, persona, webVitalsRuns };
 }
 
 export async function run(
diff --git a/test/e2e/benchmarks/flows/user-journey/asset-details.ts b/test/e2e/benchmarks/flows/user-journey/asset-details.ts
index 64f3af8ae1a1..d4fe0ac51ad9 100644
--- a/test/e2e/benchmarks/flows/user-journey/asset-details.ts
+++ b/test/e2e/benchmarks/flows/user-journey/asset-details.ts
@@ -17,15 +17,21 @@ import {
   getTestSpecificMock,
   shouldUseMockedRequests,
 } from '../../utils/mock-config';
-import { BENCHMARK_PERSONA, WITH_STATE_POWER_USER } from '../../utils';
-import { BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  WITH_STATE_POWER_USER,
+  collectWebVitals,
+} from '../../utils';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 const ETH_TOKEN_ADDRESS = '0x0000000000000000000000000000000000000000';
 export const testTitle = 'benchmark-asset-details-power-user';
 export const persona = BENCHMARK_PERSONA.POWER_USER;
 
 export async function runAssetDetailsBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     await withFixtures(
       {
@@ -80,17 +86,25 @@ export async function runAssetDetailsBenchmark(): Promise<BenchmarkRunResult> {
           await assetListPage.checkPriceChartLoaded(ETH_TOKEN_ADDRESS);
         });
         performanceTracker.addTimer(timer);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/import-srp-home.ts b/test/e2e/benchmarks/flows/user-journey/import-srp-home.ts
index 0fff30640ad7..04deb05e48aa 100644
--- a/test/e2e/benchmarks/flows/user-journey/import-srp-home.ts
+++ b/test/e2e/benchmarks/flows/user-journey/import-srp-home.ts
@@ -22,8 +22,10 @@ import {
   BENCHMARK_PERSONA,
   BENCHMARK_TYPE,
   WITH_STATE_POWER_USER,
+  collectWebVitals,
 } from '../../utils';
-import type { BenchmarkRunResult } from '../../utils/types';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 const SECOND_SRP = process.env.TEST_SRP_2;
 
@@ -31,6 +33,7 @@ export const testTitle = 'benchmark-import-srp-home-power-user';
 export const persona = BENCHMARK_PERSONA.POWER_USER;
 
 export async function runImportSrpHomeBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     // Validate required environment variable
     if (!SECOND_SRP) {
@@ -97,17 +100,25 @@ export async function runImportSrpHomeBenchmark(): Promise<BenchmarkRunResult> {
           await assetListPage.waitForTokenToBeDisplayed('Solana', 60000);
         });
         performanceTracker.addTimer(timerHomeAfterImport);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts b/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts
index 626587712f27..b2e3ab224095 100644
--- a/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts
+++ b/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts
@@ -33,13 +33,19 @@ import {
   mockBenchmarkEndpoints,
 } from '../../mocks/performance-mocks';
 import { shouldUseMockedRequests } from '../../utils/mock-config';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  collectWebVitals,
+} from '../../utils';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 export const testTitle = 'benchmark-onboarding-import-wallet';
 export const persona = BENCHMARK_PERSONA.POWER_USER;
 
 export async function runOnboardingImportWalletBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     await withFixtures(
       {
@@ -161,17 +167,25 @@ export async function runOnboardingImportWalletBenchmark(): Promise<BenchmarkRun
           await accountListPage.checkPageIsLoaded(120000);
         });
         performanceTracker.addTimer(timerAccountListLoad);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/onboarding-new-wallet.ts b/test/e2e/benchmarks/flows/user-journey/onboarding-new-wallet.ts
index 4e9aa413992e..c4abc3f6084a 100644
--- a/test/e2e/benchmarks/flows/user-journey/onboarding-new-wallet.ts
+++ b/test/e2e/benchmarks/flows/user-journey/onboarding-new-wallet.ts
@@ -26,13 +26,19 @@ import {
   getTestSpecificMock,
   shouldUseMockedRequests,
 } from '../../utils/mock-config';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  collectWebVitals,
+} from '../../utils';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 export const testTitle = 'benchmark-onboarding-new-wallet';
 export const persona = BENCHMARK_PERSONA.STANDARD;
 
 export async function runOnboardingNewWalletBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     await withFixtures(
       {
@@ -135,17 +141,25 @@ export async function runOnboardingNewWalletBenchmark(): Promise<BenchmarkRunRes
           await assetListPage.waitForTokenToBeDisplayed('Solana', 60000);
         });
         performanceTracker.addTimer(timerDoneToAssetList);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/send-transactions.ts b/test/e2e/benchmarks/flows/user-journey/send-transactions.ts
index e2a5b47f3c22..7b6dedb73045 100644
--- a/test/e2e/benchmarks/flows/user-journey/send-transactions.ts
+++ b/test/e2e/benchmarks/flows/user-journey/send-transactions.ts
@@ -24,8 +24,10 @@ import {
   BENCHMARK_PERSONA,
   BENCHMARK_TYPE,
   WITH_STATE_POWER_USER,
+  collectWebVitals,
 } from '../../utils';
-import type { BenchmarkRunResult } from '../../utils/types';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 const RECIPIENT_ADDRESS = 'GxSJqxAyTjCjyDmPxdBBfVE9QwuMhEoHrPLRTmMyqxnU';
 
@@ -33,6 +35,7 @@ export const testTitle = 'benchmark-send-transactions-power-user';
 export const persona = BENCHMARK_PERSONA.POWER_USER;
 
 export async function runSendTransactionsBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     await withFixtures(
       {
@@ -101,17 +104,25 @@ export async function runSendTransactionsBenchmark(): Promise<BenchmarkRunResult
           await confirmation.checkPageIsLoaded();
         });
         performanceTracker.addTimer(timerReviewTransaction);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/solana-asset-details.ts b/test/e2e/benchmarks/flows/user-journey/solana-asset-details.ts
index 15f54e9debd8..35a449c20c16 100644
--- a/test/e2e/benchmarks/flows/user-journey/solana-asset-details.ts
+++ b/test/e2e/benchmarks/flows/user-journey/solana-asset-details.ts
@@ -19,8 +19,10 @@ import {
   BENCHMARK_PERSONA,
   BENCHMARK_TYPE,
   WITH_STATE_POWER_USER,
+  collectWebVitals,
 } from '../../utils';
-import type { BenchmarkRunResult } from '../../utils/types';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 
 const SOL_TOKEN_ADDRESS = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
 
@@ -28,6 +30,7 @@ export const testTitle = 'benchmark-solana-asset-details-power-user';
 export const persona = BENCHMARK_PERSONA.POWER_USER;
 
 export async function runSolanaAssetDetailsBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     await withFixtures(
       {
@@ -61,17 +64,25 @@ export async function runSolanaAssetDetailsBenchmark(): Promise<BenchmarkRunResu
           await assetListPage.checkPriceChartLoaded(SOL_TOKEN_ADDRESS);
         });
         performanceTracker.addTimer(timer);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/flows/user-journey/swap.ts b/test/e2e/benchmarks/flows/user-journey/swap.ts
index 78f8d244eef2..fc31c47d9549 100644
--- a/test/e2e/benchmarks/flows/user-journey/swap.ts
+++ b/test/e2e/benchmarks/flows/user-journey/swap.ts
@@ -19,9 +19,14 @@ import {
   getTestSpecificMock,
   shouldUseMockedRequests,
 } from '../../utils/mock-config';
-import { BENCHMARK_PERSONA, WITH_STATE_POWER_USER } from '../../utils';
-import { BENCHMARK_TYPE } from '../../utils/constants';
-import type { BenchmarkRunResult } from '../../utils/types';
+import {
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+  WITH_STATE_POWER_USER,
+  collectWebVitals,
+} from '../../utils';
+import type { WebVitalsMetrics } from '../../../../../shared/constants/benchmarks';
+import type { BenchmarkRunResult } from '../../utils';
 import { registerSwapInterceptor } from '../../mocks/swap-mocks';
 
 export const testTitle = 'benchmark-swap-power-user';
@@ -30,6 +35,7 @@ const SOLANA_USDC_CONTRACT_ADDRESS =
   'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
 
 export async function runSwapBenchmark(): Promise<BenchmarkRunResult> {
+  let webVitals: WebVitalsMetrics | undefined;
   try {
     const branchMock = getTestSpecificMock();
 
@@ -104,17 +110,25 @@ export async function runSwapBenchmark(): Promise<BenchmarkRunResult> {
           await swapPage.checkQuoteIsDisplayed({ timeout: 60000 });
         });
         performanceTracker.addTimer(timerQuoteFetching);
+
+        try {
+          webVitals = await collectWebVitals(driver);
+        } catch (error) {
+          console.error('Error collecting web vitals:', error);
+        }
       },
     );
 
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: true,
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
     };
   } catch (error) {
     return {
       timers: collectTimerResults(),
+      webVitals,
       success: false,
       error: error instanceof Error ? error.message : String(error),
       benchmarkType: BENCHMARK_TYPE.PERFORMANCE,
diff --git a/test/e2e/benchmarks/mocks/performance-mocks.ts b/test/e2e/benchmarks/mocks/performance-mocks.ts
index f3a8da659c46..074ff4f16e29 100644
--- a/test/e2e/benchmarks/mocks/performance-mocks.ts
+++ b/test/e2e/benchmarks/mocks/performance-mocks.ts
@@ -686,7 +686,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/^https:\/\/mainnet\.infura\.io/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(650, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(800, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -694,7 +694,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/polygon-mainnet\.infura\.io/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(650, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(500, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -710,7 +710,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/optimism-mainnet\.infura\.io/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(650, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(475, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -742,7 +742,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/avalanche-mainnet\.infura\.io/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(900, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(550, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -766,7 +766,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/https:\/\/celo-mainnet\.infura\.io\/v3\/.*/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(300, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(750, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -782,7 +782,7 @@ export async function mockBenchmarkEndpoints(
       .forPost(/mainnet\.era\.zksync\.io/u)
       .asPriority(MOCK_PRIORITIES.TEST_OVERRIDE)
       .always()
-      .thenCallback(delayedResponse(900, jsonRpcResponse('0x0'))),
+      .thenCallback(delayedResponse(375, jsonRpcResponse('0x0'))),
   );
 
   endpoints.push(
@@ -1046,6 +1046,14 @@ export async function mockBenchmarkEndpoints(
       .thenCallback(delayedResponse(550, ACCOUNTS_BALANCES)),
   );
 
+  // Solana RPC mock delays calibrated to real-world infura solana-mainnet latency:
+  //   getSlot / getHealth / simple calls : ~50–150 ms  → 100 ms
+  //   getBalance / getAccountInfo        : p50 ~100–250 ms → 150 ms
+  //   getTokenAccountsByOwner            : scan, ~100–300 ms → 200 ms
+  //   simulateTransaction                : heavy, ~200–400 ms → 300 ms
+  //   getSignaturesForAddress            : tx history, ~200–500 ms → 350 ms
+  //   catch-all (any other method)       : real p95 ~300–600 ms → 450 ms
+  //                                        (previously 1500 ms — 2.5–5× too high)
   endpoints.push(
     await server
       .forPost(SOLANA_URL_REGEX)
@@ -1054,7 +1062,7 @@ export async function mockBenchmarkEndpoints(
       .always()
       .thenCallback(async (req) => {
         const body = (await req.body.getJson()) as { id?: string };
-        await new Promise((resolve) => setTimeout(resolve, 100));
+        await new Promise((resolve) => setTimeout(resolve, 150));
         return solanaGetBalanceResponse(body.id || '1337');
       }),
   );
@@ -1067,7 +1075,7 @@ export async function mockBenchmarkEndpoints(
       .always()
       .thenCallback(async (req) => {
         const body = (await req.body.getJson()) as { id?: string };
-        await new Promise((resolve) => setTimeout(resolve, 100));
+        await new Promise((resolve) => setTimeout(resolve, 150));
         return solanaGetAccountInfoResponse(body.id || '1337');
       }),
   );
@@ -1107,7 +1115,7 @@ export async function mockBenchmarkEndpoints(
       .withJsonBodyIncluding({ method: 'getTokenAccountsByOwner' })
       .asPriority(MOCK_PRIORITIES.HIGH_PRIORITY)
       .always()
-      .thenCallback(delayedResponse(100, SOLANA_GET_TOKEN_ACCOUNTS_BY_OWNER)),
+      .thenCallback(delayedResponse(200, SOLANA_GET_TOKEN_ACCOUNTS_BY_OWNER)),
   );
 
   endpoints.push(
@@ -1116,7 +1124,7 @@ export async function mockBenchmarkEndpoints(
       .withJsonBodyIncluding({ method: 'simulateTransaction' })
       .asPriority(MOCK_PRIORITIES.HIGH_PRIORITY)
       .always()
-      .thenCallback(delayedResponse(100, SOLANA_SIMULATE_TRANSACTION)),
+      .thenCallback(delayedResponse(300, SOLANA_SIMULATE_TRANSACTION)),
   );
 
   endpoints.push(
@@ -1125,7 +1133,7 @@ export async function mockBenchmarkEndpoints(
       .withJsonBodyIncluding({ method: 'getSignaturesForAddress' })
       .asPriority(MOCK_PRIORITIES.HIGH_PRIORITY)
       .always()
-      .thenCallback(delayedResponse(100, SOLANA_GET_SIGNATURES_FOR_ADDRESS)),
+      .thenCallback(delayedResponse(350, SOLANA_GET_SIGNATURES_FOR_ADDRESS)),
   );
 
   endpoints.push(
@@ -1135,7 +1143,7 @@ export async function mockBenchmarkEndpoints(
       .always()
       .thenCallback(async (req) => {
         const body = (await req.body.getJson()) as { id?: string };
-        await new Promise((resolve) => setTimeout(resolve, 1500));
+        await new Promise((resolve) => setTimeout(resolve, 450));
         return solanaCatchAllResponse(body.id || '1337');
       }),
   );
diff --git a/test/e2e/benchmarks/run-benchmark.ts b/test/e2e/benchmarks/run-benchmark.ts
index 4a766420b2a4..ee43963eddd0 100644
--- a/test/e2e/benchmarks/run-benchmark.ts
+++ b/test/e2e/benchmarks/run-benchmark.ts
@@ -34,36 +34,49 @@ import {
 /**
  * Startup benchmarks handle their own iteration internally (browserLoads x pageLoads).
  * All other benchmarks need external iteration + aggregation via runBenchmarkWithIterations.
+ *
  * @param filePath
  */
 function supportsIterations(filePath: string): boolean {
   return !filePath.includes('/startup/');
 }
 
+/**
+ * Extracts platform and buildType from output filename.
+ * Expected format: benchmark-{platform}-{buildType}-{preset}.json
+ * @param outputFilename - Output filename from --out arg
+ * @returns Object with platform and buildType, or empty object if not found
+ */
+function extractPlatformBuildType(outputFilename?: string): {
+  platform?: string;
+  buildType?: string;
+} {
+  if (!outputFilename) {
+    return {};
+  }
+
+  const outputBasename = path.basename(outputFilename, '.json');
+  const match = outputBasename.match(/^benchmark-([^-]+)-([^-]+)-/u);
+  if (match) {
+    const [, platform, buildType] = match;
+    return { platform, buildType };
+  }
+
+  return {};
+}
+
 /**
  * Builds the registry key for threshold lookup and JSON output.
  *
- * Startup benchmarks require platform-buildType prefix because:
- * - Each platform/buildType combo has its own baseline (platform-specific performance)
- * - JSON output keys are: 'chrome-webpack-startupStandardHome'
- * - Registry keys are: 'chrome-webpack-startupStandardHome'
- *
- * Other benchmarks use simple camelCase:
- * - All platforms share one baseline (platform-agnostic performance)
- * - JSON output keys are: 'loadNewAccount', 'onboardingImportWallet'
- * - Registry keys are: 'loadNewAccount', 'onboardingImportWallet'
- *
  * @param fileName - Benchmark flow filename (e.g., 'standard-home', 'load-new-account')
  * @param filePath - Full file path (to detect startup benchmarks)
  * @param preset - Preset name (e.g., 'startupStandardHome', 'interactionUserActions')
- * @param outputFilename - Output filename from --out arg (used to extract platform/buildType)
- * @returns Registry key (e.g., 'chrome-webpack-startupStandardHome', 'loadNewAccount')
+ * @returns Registry key (e.g., 'startupStandardHome', 'loadNewAccount', 'onboardingImportWallet')
  */
 function buildRegistryKey(
   fileName: string,
   filePath: string,
   preset?: string,
-  outputFilename?: string,
 ): string {
   const baseName = toCamelCase(fileName);
   const isStartup =
@@ -74,14 +87,6 @@ function buildRegistryKey(
     filePath.includes('/startup/');
 
   if (isStartup) {
-    if (outputFilename) {
-      const outputBasename = path.basename(outputFilename, '.json');
-      const match = outputBasename.match(/^benchmark-([^-]+)-([^-]+)-/u);
-      if (match) {
-        const [, platform, buildType] = match;
-        return `${platform}-${buildType}-startup${baseName.charAt(0).toUpperCase()}${baseName.slice(1)}`;
-      }
-    }
     return `startup${baseName.charAt(0).toUpperCase()}${baseName.slice(1)}`;
   }
 
@@ -163,12 +168,7 @@ async function runBenchmarkFile(
   }
 
   const { run: runFn } = benchmark;
-  const registryKey = buildRegistryKey(
-    fileName,
-    filePath,
-    preset,
-    outputFilename,
-  );
+  const registryKey = buildRegistryKey(fileName, filePath, preset);
   const thresholdConfig = THRESHOLD_REGISTRY[registryKey];
   if (!thresholdConfig) {
     throw new Error(
@@ -176,6 +176,8 @@ async function runBenchmarkFile(
     );
   }
 
+  const { platform, buildType } = extractPlatformBuildType(outputFilename);
+
   let result: BenchmarkResults;
   let violations: ThresholdViolation[];
 
@@ -205,9 +207,15 @@ async function runBenchmarkFile(
       testTitle,
       persona,
       summary.benchmarkType,
+      platform,
+      buildType,
     );
   } else {
-    result = (await runFn(options)) as BenchmarkResults;
+    result = (await runFn({
+      ...options,
+      platform,
+      buildType,
+    })) as BenchmarkResults;
     violations = validateResultThresholds(result, thresholdConfig).violations;
   }
 
@@ -325,12 +333,7 @@ async function main(): Promise<void> {
 
   for (const filePath of filesToRun) {
     const fileName = path.basename(filePath, path.extname(filePath));
-    const resultKey = buildRegistryKey(
-      fileName,
-      filePath,
-      argv.preset,
-      argv.out,
-    );
+    const resultKey = buildRegistryKey(fileName, filePath, argv.preset);
 
     try {
       const result = await runBenchmarkFile(
diff --git a/test/e2e/benchmarks/send-to-sentry.ts b/test/e2e/benchmarks/send-to-sentry.ts
index 10c6895c6770..f41de0f8f54c 100644
--- a/test/e2e/benchmarks/send-to-sentry.ts
+++ b/test/e2e/benchmarks/send-to-sentry.ts
@@ -5,6 +5,10 @@
  * Reads JSON from --results and sends metrics as Sentry structured logs with
  * attributes for filtering (ci.browser, ci.buildType, ci.persona, etc.).
  *
+ * Timer-based benchmark data goes through structured logs (existing path).
+ * Web vitals data goes through spans with measurements (separate path),
+ * following conventions from ui/helpers/utils/web-vitals.ts.
+ *
  * Requires SENTRY_DSN_PERFORMANCE env var. Throws if not set.
  */
 
@@ -12,19 +16,120 @@ import { promises as fs, readFileSync } from 'fs';
 import path from 'path';
 import mapKeys from 'lodash/mapKeys';
 import * as Sentry from '@sentry/node';
+import { isNullOrUndefined } from '@metamask/utils';
 import { hideBin } from 'yargs/helpers';
 import yargs from 'yargs/yargs';
-import { StatKey } from '../../../shared/constants/benchmarks';
-import type { BenchmarkResults } from '../../../shared/constants/benchmarks';
+import { STAT_KEY } from '../../../shared/constants/benchmarks';
+import type {
+  BenchmarkResults,
+  WebVitalsSummary,
+} from '../../../shared/constants/benchmarks';
 import { getGitBranch, getGitCommitHash } from './utils/git';
-import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from './utils/constants';
 import type { UserActionResult } from './utils/types';
+import { BENCHMARK_PERSONA, BENCHMARK_TYPE } from './utils/constants';
+import { aggregateWebVitals } from './utils/statistics';
 
 const packageJsonPath = path.resolve(__dirname, '../../../package.json');
 const { version } = JSON.parse(readFileSync(packageJsonPath, 'utf-8')) as {
   version: string;
 };
 
+const WEB_VITALS_METRICS = [
+  { key: 'inp', ratingKey: 'inpRating' },
+  { key: 'fcp', ratingKey: 'fcpRating' },
+  { key: 'lcp', ratingKey: 'lcpRating' },
+  { key: 'cls', ratingKey: 'clsRating' },
+] as const;
+
+/**
+ * Send web vitals to Sentry as spans — separate from timer-based structured logs.
+ *
+ * Per-run snapshots become individual spans with rating tags,
+ * following the conventions from ui/helpers/utils/web-vitals.ts:
+ * - setAttribute: benchmark.{metric} (numeric value)
+ * - setAttribute: {metric}.rating
+ *
+ * Aggregated summary goes as a structured log for dashboards.
+ *
+ * @param type - The benchmark type (e.g. 'performance', 'userAction')
+ * @param benchmarkName - The benchmark identifier (e.g. 'loadNewAccount')
+ * @param webVitals - Full web vitals summary with per-run data and aggregates
+ * @param persona - The persona used for the benchmark
+ * @param testTitle - The test title
+ * @param ciAttributes - CI metadata attributes
+ */
+function sendWebVitalsToSentry(
+  type: string,
+  benchmarkName: string,
+  webVitals: WebVitalsSummary,
+  persona: string,
+  testTitle: string | undefined,
+  ciAttributes: Record<string, string>,
+): void {
+  // Per-run spans: each iteration gets its own span with measurements
+  for (const run of webVitals.runs) {
+    Sentry.startSpan(
+      {
+        name: `${type}.${benchmarkName}.webVitals`,
+        op: 'benchmark.webvitals',
+        attributes: {
+          ...ciAttributes,
+          'ci.persona': persona,
+          'ci.testTitle': testTitle ?? benchmarkName,
+          'webVitals.iteration': run.iteration,
+        },
+      },
+      (span) => {
+        for (const { key, ratingKey } of WEB_VITALS_METRICS) {
+          const value = run[key];
+          const rating = run[ratingKey];
+
+          if (!isNullOrUndefined(value)) {
+            span.setAttribute(`benchmark.${key}`, value);
+          }
+
+          if (!isNullOrUndefined(rating)) {
+            span.setAttribute(`${key}.rating`, rating);
+          }
+        }
+      },
+    );
+  }
+
+  // Aggregated summary as a structured log for dashboards
+  const { aggregated } = webVitals;
+  const aggAttributes: Record<string, number | string> = {
+    'webVitals.runs': webVitals.runs.length,
+  };
+
+  for (const { key } of WEB_VITALS_METRICS) {
+    const stats = aggregated[key as keyof typeof aggregated];
+    if (stats && typeof stats === 'object' && 'mean' in stats) {
+      aggAttributes[`webVitals.${key}.mean`] = stats.mean;
+      aggAttributes[`webVitals.${key}.p75`] = stats.p75;
+      aggAttributes[`webVitals.${key}.p95`] = stats.p95;
+      aggAttributes[`webVitals.${key}.samples`] = stats.samples;
+      aggAttributes[`webVitals.${key}.dataQuality`] = stats.dataQuality;
+    }
+
+    const ratings =
+      aggregated.ratings?.[key as keyof typeof aggregated.ratings];
+    if (ratings) {
+      aggAttributes[`webVitals.${key}.ratings.good`] = ratings.good;
+      aggAttributes[`webVitals.${key}.ratings.needsImprovement`] =
+        ratings['needs-improvement'];
+      aggAttributes[`webVitals.${key}.ratings.poor`] = ratings.poor;
+    }
+  }
+
+  Sentry.logger.info(`${type}.${benchmarkName}.webVitals.summary`, {
+    ...ciAttributes,
+    'ci.persona': persona,
+    'ci.testTitle': testTitle ?? benchmarkName,
+    ...aggAttributes,
+  });
+}
+
 async function main() {
   const argv = await yargs(hideBin(process.argv))
     .option('results', {
@@ -91,6 +196,7 @@ async function main() {
   Sentry.init({
     dsn: SENTRY_DSN,
     enableLogs: true,
+    tracesSampleRate: 1.0, // CI benchmarks: capture all spans
     release: `metamask-extension@${version}`,
   });
 
@@ -121,7 +227,7 @@ async function main() {
       }
 
       const allMetrics: Record<string, number> = {};
-      const statTypes = Object.values(StatKey);
+      const statTypes = Object.values(STAT_KEY);
       for (const statType of statTypes) {
         const statData = benchmark[statType];
         if (statData && Object.keys(statData).length > 0) {
@@ -132,12 +238,25 @@ async function main() {
         }
       }
 
+      // Timer data: structured logs (existing path, unchanged)
       Sentry.logger.info(message, {
         ...baseCiAttributes,
         'ci.persona': benchmark.persona || BENCHMARK_PERSONA.STANDARD,
         'ci.testTitle': benchmark.testTitle,
         ...allMetrics,
       });
+
+      // Web vitals: separate reporting path via spans
+      if (benchmark.webVitals) {
+        sendWebVitalsToSentry(
+          type,
+          name,
+          benchmark.webVitals,
+          benchmark.persona || BENCHMARK_PERSONA.STANDARD,
+          benchmark.testTitle,
+          baseCiAttributes,
+        );
+      }
       sentCount += 1;
     } else {
       // User action result with numeric timing metrics
@@ -145,6 +264,22 @@ async function main() {
       const type = userAction.benchmarkType || BENCHMARK_TYPE.USER_ACTION;
       const message = `${type}.${name}`;
 
+      // Web vitals: send per-run span for user action benchmarks
+      if (userAction.webVitals) {
+        const webVitalsSummary: WebVitalsSummary = {
+          runs: [{ ...userAction.webVitals, iteration: 0 }],
+          aggregated: aggregateWebVitals([userAction.webVitals]),
+        };
+        sendWebVitalsToSentry(
+          type,
+          name,
+          webVitalsSummary,
+          userAction.persona || BENCHMARK_PERSONA.STANDARD,
+          userAction.testTitle,
+          baseCiAttributes,
+        );
+      }
+
       const metrics = Object.entries(userAction).reduce(
         (acc, [key, val]) =>
           typeof val === 'number' ? { ...acc, [key]: val } : acc,
diff --git a/test/e2e/benchmarks/utils/constants.ts b/test/e2e/benchmarks/utils/constants.ts
index df40b209f8e6..125e7ef2d71a 100644
--- a/test/e2e/benchmarks/utils/constants.ts
+++ b/test/e2e/benchmarks/utils/constants.ts
@@ -2,9 +2,17 @@ import type { ThresholdConfig } from '../../../../shared/constants/benchmarks';
 import {
   BENCHMARK_PLATFORMS,
   BENCHMARK_BUILD_TYPES,
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
 } from '../../../../shared/constants/benchmarks';
 
-export { BENCHMARK_PLATFORMS, BENCHMARK_BUILD_TYPES };
+export {
+  BENCHMARK_PLATFORMS,
+  BENCHMARK_BUILD_TYPES,
+  BENCHMARK_PERSONA,
+  BENCHMARK_TYPE,
+};
+
 export const STARTUP_PRESETS = {
   STANDARD_HOME: 'startupStandardHome',
   POWER_USER_HOME: 'startupPowerUserHome',
@@ -25,17 +33,6 @@ export const USER_JOURNEY_PRESETS = {
 export const DEFAULT_NUM_BROWSER_LOADS = 10;
 export const DEFAULT_NUM_PAGE_LOADS = 10;
 
-export const BENCHMARK_PERSONA = {
-  STANDARD: 'standard',
-  POWER_USER: 'powerUser',
-} as const;
-
-export const BENCHMARK_TYPE = {
-  BENCHMARK: 'benchmark',
-  PERFORMANCE: 'performance',
-  USER_ACTION: 'userAction',
-} as const;
-
 export const ALL_METRICS = {
   uiStartup: 'UI Startup',
   load: 'navigation[0].load',
@@ -163,8 +160,8 @@ const SWAP: ThresholdConfig = {
     ciMultiplier: DEFAULT_CI_MULTIPLIER,
   },
   fetchAndDisplaySwapQuotes: {
-    p75: { warn: 1200, fail: 2000 },
-    p95: { warn: 2000, fail: 3500 },
+    p75: { warn: 2800, fail: 5000 },
+    p95: { warn: 3500, fail: 6000 },
     ciMultiplier: DEFAULT_CI_MULTIPLIER,
   },
 };
@@ -277,7 +274,7 @@ const BRIDGE_USER_ACTIONS: ThresholdConfig = {
 /* eslint-enable @typescript-eslint/naming-convention */
 
 /**
- * Threshold configurations for interaction and user journey benchmarks.
+ * Threshold configurations for all benchmarks.
  */
 const BENCHMARK_THRESHOLDS = {
   // Interaction benchmarks (run on all 4 combos, shared baseline)
@@ -294,50 +291,18 @@ const BENCHMARK_THRESHOLDS = {
   sendTransactions: SEND_TRANSACTIONS,
   swap: SWAP,
 
-  // Startup benchmarks (fallback when platform/buildType not available)
+  // Startup benchmarks (platform/buildType now stored in data, not in key)
   startupStandardHome: STANDARD_HOME,
   startupPowerUserHome: POWER_USER_HOME,
 };
 
-/**
- * Startup benchmark configurations.
- * Generated for all platform/buildType combos with platform-prefixed keys.
- */
-const STARTUP_BENCHMARK_CONFIGS = {
-  startupStandardHome: STANDARD_HOME,
-  startupPowerUserHome: POWER_USER_HOME,
-};
-
-/**
- * Generates startup benchmark thresholds for all platform/buildType combinations.
- * Creates keys like 'chrome-browserify-startupStandardHome'.
- */
-function generateStartupThresholds(): Record<string, ThresholdConfig> {
-  const platforms = Object.values(BENCHMARK_PLATFORMS);
-  const buildTypes = Object.values(BENCHMARK_BUILD_TYPES);
-  const result: Record<string, ThresholdConfig> = {};
-
-  for (const [benchmarkName, config] of Object.entries(
-    STARTUP_BENCHMARK_CONFIGS,
-  )) {
-    for (const platform of platforms) {
-      for (const buildType of buildTypes) {
-        result[`${platform}-${buildType}-${benchmarkName}`] = config;
-      }
-    }
-  }
-
-  return result;
-}
-
 /**
  * Registry of threshold configurations keyed by benchmark name (camelCase).
  *
  * To add a new benchmark:
- * - Interaction/User Journey: Add to BENCHMARK_THRESHOLDS (works for all platforms)
- * - Startup: Add to STARTUP_BENCHMARK_CONFIGS (auto-generates 8 platform-combo entries)
+ * - Add to BENCHMARK_THRESHOLDS with a camelCase key matching the filename
+ * - All benchmarks now use simple keys; platform/buildType are stored as data fields
  */
 export const THRESHOLD_REGISTRY: Record<string, ThresholdConfig> = {
   ...BENCHMARK_THRESHOLDS,
-  ...generateStartupThresholds(),
 };
diff --git a/test/e2e/benchmarks/utils/cwv-read.js b/test/e2e/benchmarks/utils/cwv-read.js
new file mode 100644
index 000000000000..eb586960a18d
--- /dev/null
+++ b/test/e2e/benchmarks/utils/cwv-read.js
@@ -0,0 +1,143 @@
+// Browser-injected script — read as string by web-vitals-collector.ts
+const cwv = window.__cwv || {
+  event: [],
+  lcp: [],
+  cls: [],
+  observers: [],
+  clsSupported: false,
+  eventObserverSupported: false,
+  probeReceived: false,
+  fcp: null,
+};
+const result = {
+  inp: null,
+  fcp: null,
+  lcp: null,
+  cls: null,
+  inpRating: null,
+  fcpRating: null,
+  lcpRating: null,
+  clsRating: null,
+};
+
+function rate(v, good, poor) {
+  if (v <= good) {
+    return 'good';
+  }
+  return v <= poor ? 'needs-improvement' : 'poor';
+}
+
+// FCP: always read from paint entries (available on extension pages)
+if (cwv.fcp !== null) {
+  result.fcp = cwv.fcp;
+  result.fcpRating = rate(cwv.fcp, 1800, 3000);
+}
+
+// Check stateHooks for INP/FCP/LCP/CLS from web-vitals library.
+// The onINP observer has been running since page startup with
+// { reportAllChanges: true }, so it captures real benchmark interactions.
+const sh = window.stateHooks;
+let stateHooksInp = null;
+if (sh && sh.getWebVitalsMetrics) {
+  const m = sh.getWebVitalsMetrics();
+  if (m.inp !== null) {
+    stateHooksInp = m.inp;
+    result.inp = m.inp;
+    result.inpRating = m.inpRating;
+  }
+  if (m.fcp !== null) {
+    result.fcp = m.fcp;
+    result.fcpRating = m.fcpRating;
+  }
+  if (m.lcp !== null) {
+    result.lcp = m.lcp;
+    result.lcpRating = m.lcpRating;
+  }
+  if (m.cls !== null) {
+    result.cls = m.cls;
+    result.clsRating = m.clsRating;
+  }
+  if (sh.resetWebVitalsMetrics) {
+    sh.resetWebVitalsMetrics();
+  }
+}
+
+// INP fallback: direct PerformanceObserver event entries (probe + buffered)
+// Only set when maxDur > 0 — all-zero durations (passive listeners, pre-registration)
+// means no meaningful interaction data; keep null to avoid masking missing data.
+if (result.inp === null && cwv.event.length > 0) {
+  let maxDur = 0;
+  for (let i = 0; i < cwv.event.length; i++) {
+    if (cwv.event[i].duration > maxDur) {
+      maxDur = cwv.event[i].duration;
+    }
+  }
+  if (maxDur > 0) {
+    result.inp = maxDur;
+    result.inpRating = rate(maxDur, 200, 500);
+  }
+}
+
+// LCP: real largest-contentful-paint entries first
+if (result.lcp === null && cwv.lcp.length > 0) {
+  const last = cwv.lcp[cwv.lcp.length - 1];
+  if (last.startTime > 0) {
+    result.lcp = last.startTime;
+    result.lcpRating = rate(last.startTime, 2500, 4000);
+  }
+}
+
+// LCP fallback: performance.mark from app code (most reliable on extension pages)
+if (result.lcp === null) {
+  try {
+    const marks = performance.getEntriesByName('mm-hero-painted', 'mark');
+    if (marks.length > 0) {
+      const markTime = marks[marks.length - 1].startTime;
+      result.lcp = markTime;
+      result.lcpRating = rate(markTime, 2500, 4000);
+    }
+  } catch (_e) {
+    // mark lookup failed
+  }
+}
+
+// CLS: from layout-shift entries (sum non-recent-input shifts).
+// When clsSupported but no entries, clsVal stays 0 (perfect stability).
+// When !clsSupported, keep null — observer didn't fire.
+if (result.cls === null && cwv.clsSupported) {
+  let clsVal = 0;
+  for (let j = 0; j < cwv.cls.length; j++) {
+    if (!cwv.cls[j].hadRecentInput) {
+      clsVal += cwv.cls[j].value;
+    }
+  }
+  result.cls = clsVal;
+  result.clsRating = rate(clsVal, 0.1, 0.25);
+}
+
+for (let k = 0; k < cwv.observers.length; k++) {
+  cwv.observers[k].disconnect();
+}
+
+// Diagnostic fields — logged by the runner, not included in benchmark output.
+// Remove once INP collection is confirmed working.
+let supportedTypes = [];
+try {
+  supportedTypes = PerformanceObserver.supportedEntryTypes || [];
+} catch (_e) {
+  // PerformanceObserver unavailable
+}
+result.cwvDiagnostic = {
+  supportedEntryTypes: supportedTypes,
+  eventEntryCount: cwv.event.length,
+  eventObserverSupported: cwv.eventObserverSupported,
+  clsSupported: cwv.clsSupported,
+  clsEntryCount: cwv.cls.length,
+  probeReceived: cwv.probeReceived,
+  stateHooksInp,
+  stateHooksAvailable: Boolean(sh && sh.getWebVitalsMetrics),
+};
+
+delete window.__cwv;
+
+return result;
diff --git a/test/e2e/benchmarks/utils/cwv-setup.js b/test/e2e/benchmarks/utils/cwv-setup.js
new file mode 100644
index 000000000000..4fe45f6c6a7a
--- /dev/null
+++ b/test/e2e/benchmarks/utils/cwv-setup.js
@@ -0,0 +1,80 @@
+// Browser-injected script — read as string by web-vitals-collector.ts
+const w = window;
+w.__cwv = {
+  event: [],
+  lcp: [],
+  cls: [],
+  observers: [],
+  clsSupported: false,
+  eventObserverSupported: false,
+  probeReceived: false,
+  fcp: null,
+};
+
+try {
+  const pe = performance.getEntriesByType('paint');
+  for (let i = 0; i < pe.length; i++) {
+    if (pe[i].name === 'first-contentful-paint') {
+      w.__cwv.fcp = pe[i].startTime;
+    }
+  }
+} catch (_e) {
+  // paint entries unavailable
+}
+
+try {
+  const o1 = new PerformanceObserver((list) => {
+    const entries = list.getEntries();
+    for (let i = 0; i < entries.length; i++) {
+      w.__cwv.event.push(entries[i]);
+    }
+  });
+  o1.observe({ type: 'event', buffered: true, durationThreshold: 0 });
+  w.__cwv.eventObserverSupported = true;
+  w.__cwv.observers.push(o1);
+} catch (_e) {
+  // event observer unsupported
+}
+
+try {
+  document.addEventListener(
+    'pointerdown',
+    function busyWait() {
+      w.__cwv.probeReceived = true;
+      const end = performance.now() + 16;
+      while (performance.now() < end) {
+        // busy-wait to ensure non-zero PerformanceEventTiming duration
+      }
+    },
+    { once: true },
+  );
+} catch (_e) {
+  // pointerdown registration failed
+}
+
+try {
+  const o2 = new PerformanceObserver((list) => {
+    const entries = list.getEntries();
+    for (let i = 0; i < entries.length; i++) {
+      w.__cwv.lcp.push(entries[i]);
+    }
+  });
+  o2.observe({ type: 'largest-contentful-paint', buffered: true });
+  w.__cwv.observers.push(o2);
+} catch (_e) {
+  // LCP observer unsupported
+}
+
+try {
+  const o4 = new PerformanceObserver((list) => {
+    const entries = list.getEntries();
+    for (let i = 0; i < entries.length; i++) {
+      w.__cwv.cls.push(entries[i]);
+    }
+  });
+  o4.observe({ type: 'layout-shift', buffered: true });
+  w.__cwv.clsSupported = true;
+  w.__cwv.observers.push(o4);
+} catch (_e) {
+  // CLS observer unsupported
+}
diff --git a/test/e2e/benchmarks/utils/index.ts b/test/e2e/benchmarks/utils/index.ts
index 0623c7f02518..2e10f027bacb 100644
--- a/test/e2e/benchmarks/utils/index.ts
+++ b/test/e2e/benchmarks/utils/index.ts
@@ -3,3 +3,4 @@ export * from './constants';
 export * from './statistics';
 export * from './runner';
 export { performanceTracker, PerformanceTracker } from './performance-tracker';
+export { collectWebVitals } from './web-vitals-collector';
diff --git a/test/e2e/benchmarks/utils/runner.ts b/test/e2e/benchmarks/utils/runner.ts
index bb1e8f89e284..7cd47b41ec7a 100644
--- a/test/e2e/benchmarks/utils/runner.ts
+++ b/test/e2e/benchmarks/utils/runner.ts
@@ -6,13 +6,19 @@ import type {
   Persona,
   StatisticalResult,
   ThresholdConfig,
+  TimerStatistics,
+  WebVitalsMetrics,
+  WebVitalsRun,
+  WebVitalsSummary,
 } from '../../../../shared/constants/benchmarks';
+import { BENCHMARK_PERSONA } from '../../../../shared/constants/benchmarks';
 import {
   ALL_METRICS,
   DEFAULT_NUM_BROWSER_LOADS,
   DEFAULT_NUM_PAGE_LOADS,
 } from './constants';
 import {
+  aggregateWebVitals,
   calcMaxResult,
   calcMeanResult,
   calcMinResult,
@@ -29,8 +35,7 @@ import type {
   BenchmarkRunResult,
   BenchmarkSummary,
   Metrics,
-  TimerResult,
-  TimerStatistics,
+  UserActionMeasurement,
 } from './types';
 import { performanceTracker } from './performance-tracker';
 
@@ -96,9 +101,12 @@ export async function runBenchmarkWithIterations(
     }
   }
 
-  // Aggregate timer results
+  // Aggregate timer results and collect per-run web vitals
   const timerMap = new Map<string, number[]>();
-  for (const result of allResults) {
+  const webVitalsRuns: WebVitalsRun[] = [];
+
+  for (let idx = 0; idx < allResults.length; idx++) {
+    const result = allResults[idx];
     if (result.success) {
       for (const timer of result.timers) {
         if (!timerMap.has(timer.id)) {
@@ -109,6 +117,10 @@ export async function runBenchmarkWithIterations(
           timerDurations.push(timer.duration);
         }
       }
+
+      if (result.webVitals) {
+        webVitalsRuns.push({ ...result.webVitals, iteration: idx });
+      }
     }
   }
 
@@ -162,6 +174,14 @@ export async function runBenchmarkWithIterations(
 
   const thresholdResult = validateThresholds(timerStats, thresholdConfig);
 
+  // Aggregate web vitals if any runs reported them
+  let webVitalsSummary: WebVitalsSummary | undefined;
+  if (webVitalsRuns.length > 0) {
+    webVitalsSummary = {
+      runs: webVitalsRuns,
+      aggregated: aggregateWebVitals(webVitalsRuns),
+    };
+  }
   // Extract benchmarkType from the first result (same across all iterations)
   const benchmarkType = allResults.find((r) => r.benchmarkType)?.benchmarkType;
 
@@ -175,8 +195,9 @@ export async function runBenchmarkWithIterations(
     excludedDueToQuality,
     exclusionRatePassed: overallExclusionCheck.passed,
     exclusionRate: overallExclusionCheck.rate,
-    thresholdViolations: thresholdResult.violations,
-    thresholdsPassed: thresholdResult.passed,
+    thresholdViolations: thresholdResult?.violations ?? [],
+    thresholdsPassed: thresholdResult?.passed ?? true,
+    ...(webVitalsSummary && { webVitals: webVitalsSummary }),
     benchmarkType,
   };
 }
@@ -189,12 +210,16 @@ export async function runBenchmarkWithIterations(
  * @param testTitle
  * @param persona
  * @param benchmarkType
+ * @param platform
+ * @param buildType
  */
 export function convertSummaryToResults(
   summary: BenchmarkSummary,
   testTitle: string,
-  persona: Persona = 'standard',
+  persona: Persona = BENCHMARK_PERSONA.STANDARD,
   benchmarkType?: BenchmarkType,
+  platform?: string,
+  buildType?: string,
 ): BenchmarkResults {
   const mean: StatisticalResult = {};
   const min: StatisticalResult = {};
@@ -216,12 +241,15 @@ export function convertSummaryToResults(
     testTitle,
     persona,
     benchmarkType,
+    platform,
+    buildType,
     mean,
     min,
     max,
     stdDev,
     p75,
     p95,
+    ...(summary.webVitals && { webVitals: summary.webVitals }),
   };
 }
 
@@ -229,6 +257,7 @@ export type MeasurePageResult = {
   metrics: Metrics[];
   title: string;
   persona: Persona;
+  webVitalsRuns?: WebVitalsMetrics[];
 };
 
 export async function runPageLoadBenchmark(
@@ -240,25 +269,38 @@ export async function runPageLoadBenchmark(
     browserLoads?: number;
     pageLoads?: number;
     retries?: number;
+    platform?: string;
+    buildType?: string;
   },
 ): Promise<BenchmarkResults> {
   const {
     browserLoads = DEFAULT_NUM_BROWSER_LOADS,
     pageLoads = DEFAULT_NUM_PAGE_LOADS,
     retries = 0,
+    platform,
+    buildType,
   } = options;
 
   const pageName = 'home';
   let runResults: Metrics[] = [];
+  let allWebVitalsRuns: WebVitalsRun[] = [];
   let testTitle = '';
-  let resultPersona: Persona = 'standard';
+  let resultPersona: Persona = BENCHMARK_PERSONA.STANDARD;
 
   for (let i = 0; i < browserLoads; i += 1) {
     console.log('Starting browser load', i + 1, 'of', browserLoads);
-    const { metrics, title, persona } = await retry({ retries }, () =>
-      measurePageFn(pageName, pageLoads),
+    const { metrics, title, persona, webVitalsRuns } = await retry(
+      { retries },
+      () => measurePageFn(pageName, pageLoads),
     );
     runResults = runResults.concat(metrics);
+    if (webVitalsRuns) {
+      const indexed = webVitalsRuns.map((wv: WebVitalsMetrics, j: number) => ({
+        ...wv,
+        iteration: i * pageLoads + j,
+      }));
+      allWebVitalsRuns = allWebVitalsRuns.concat(indexed);
+    }
     testTitle = title;
     resultPersona = persona;
   }
@@ -283,25 +325,36 @@ export async function runPageLoadBenchmark(
       .sort((a, b) => a - b);
   }
 
+  let webVitals: WebVitalsSummary | undefined;
+  if (allWebVitalsRuns.length > 0) {
+    webVitals = {
+      runs: allWebVitalsRuns,
+      aggregated: aggregateWebVitals(allWebVitalsRuns),
+    };
+  }
+
   return {
     testTitle,
     persona: resultPersona,
+    platform,
+    buildType,
     mean: calcMeanResult(result),
     min: calcMinResult(result),
     max: calcMaxResult(result),
     stdDev: calcStdDevResult(result),
     p75: calcPResult(result, 75),
     p95: calcPResult(result, 95),
+    ...(webVitals && { webVitals }),
   };
 }
 
 export async function runUserActionBenchmark(
-  measureFn: () => Promise<TimerResult[]>,
+  measureFn: () => Promise<UserActionMeasurement>,
   benchmarkType?: BenchmarkType,
 ): Promise<BenchmarkRunResult> {
   try {
-    const timers = await measureFn();
-    return { timers, success: true, benchmarkType };
+    const { timers, webVitals } = await measureFn();
+    return { timers, webVitals, success: true, benchmarkType };
   } catch (error) {
     return {
       timers: [],
diff --git a/test/e2e/benchmarks/utils/statistics.test.ts b/test/e2e/benchmarks/utils/statistics.test.ts
index 45a40680834c..db8ecc52969f 100644
--- a/test/e2e/benchmarks/utils/statistics.test.ts
+++ b/test/e2e/benchmarks/utils/statistics.test.ts
@@ -1,4 +1,8 @@
-import type { ThresholdConfig } from '../../../../shared/constants/benchmarks';
+import type {
+  ThresholdConfig,
+  TimerStatistics,
+  WebVitalsMetrics,
+} from '../../../../shared/constants/benchmarks';
 import {
   calculateMean,
   calculateStdDev,
@@ -15,9 +19,10 @@ import {
   validateTimerThreshold,
   validateThresholds,
   getEffectiveThreshold,
+  calculateWebVitalsStatistics,
+  aggregateWebVitals,
   MAX_METRIC_DURATION_MS,
 } from './statistics';
-import type { TimerStatistics } from './types';
 
 function createMockStats(
   overrides: Partial<TimerStatistics> = {},
@@ -408,4 +413,249 @@ describe('Statistics Utils', () => {
       expect(result.passed).toBe(true); // Only warn, not fail
     });
   });
+
+  describe('calculateWebVitalsStatistics', () => {
+    it('calculates statistics for INP values', () => {
+      const values = [80, 120, 100, 90, 110];
+      const stats = calculateWebVitalsStatistics('inp', values);
+
+      expect(stats.id).toBe('inp');
+      expect(stats.mean).toBeCloseTo(100, 0);
+      expect(stats.min).toBeLessThanOrEqual(stats.mean);
+      expect(stats.max).toBeGreaterThanOrEqual(stats.mean);
+      expect(stats.samples).toBe(5);
+    });
+
+    it('calculates statistics for LCP values', () => {
+      const values = [2000, 2200, 2100, 2500, 2300];
+      const stats = calculateWebVitalsStatistics('lcp', values);
+
+      expect(stats.id).toBe('lcp');
+      expect(stats.samples).toBe(5);
+      expect(stats.p75).toBeGreaterThan(0);
+    });
+
+    it('calculates statistics for CLS values (unitless)', () => {
+      const values = [0.01, 0.05, 0.02, 0.08, 0.03];
+      const stats = calculateWebVitalsStatistics('cls', values);
+
+      expect(stats.id).toBe('cls');
+      expect(stats.samples).toBe(5);
+      expect(stats.mean).toBeLessThan(1);
+    });
+
+    it('allows CLS of 0 (perfect stability)', () => {
+      const values = [0, 0, 0, 0.01, 0];
+      const stats = calculateWebVitalsStatistics('cls', values);
+
+      expect(stats.samples).toBeGreaterThanOrEqual(4);
+    });
+
+    it('excludes values outside metric-specific bounds', () => {
+      const values = [100, 50000]; // 50000ms exceeds INP max of 30000ms
+      const stats = calculateWebVitalsStatistics('inp', values);
+
+      expect(stats.samples).toBe(1);
+    });
+
+    it('includes INP values of 0ms (sub-frame interactions)', () => {
+      const values = [0, 100, 120];
+      const stats = calculateWebVitalsStatistics('inp', values);
+
+      expect(stats.samples).toBe(3);
+    });
+
+    it('excludes negative INP values', () => {
+      const values = [-1, 100, 120];
+      const stats = calculateWebVitalsStatistics('inp', values);
+
+      expect(stats.samples).toBe(2);
+    });
+
+    it('returns zero statistics for empty input', () => {
+      const stats = calculateWebVitalsStatistics('inp', []);
+
+      expect(stats.mean).toBe(0);
+      expect(stats.samples).toBe(0);
+    });
+  });
+
+  describe('aggregateWebVitals', () => {
+    it('aggregates runs with data', () => {
+      const runs: WebVitalsMetrics[] = [
+        {
+          inp: 100,
+          fcp: 200,
+          lcp: 2000,
+          cls: 0.05,
+          inpRating: 'good',
+          fcpRating: 'good',
+          lcpRating: 'good',
+          clsRating: 'good',
+        },
+        {
+          inp: 120,
+          fcp: 250,
+          lcp: 2200,
+          cls: 0.08,
+          inpRating: 'good',
+          fcpRating: 'good',
+          lcpRating: 'good',
+          clsRating: 'good',
+        },
+        {
+          inp: 150,
+          fcp: 300,
+          lcp: 2500,
+          cls: 0.03,
+          inpRating: 'good',
+          fcpRating: 'good',
+          lcpRating: 'good',
+          clsRating: 'good',
+        },
+      ];
+
+      const result = aggregateWebVitals(runs);
+
+      expect(result.inp).not.toBeNull();
+      expect(result.inp?.samples).toBe(3);
+      expect(result.lcp).not.toBeNull();
+      expect(result.lcp?.samples).toBe(3);
+      expect(result.cls).not.toBeNull();
+      expect(result.cls?.samples).toBe(3);
+    });
+
+    it('tallies rating distribution correctly', () => {
+      const runs: WebVitalsMetrics[] = [
+        {
+          inp: 100,
+          fcp: 200,
+          lcp: 2000,
+          cls: 0.05,
+          inpRating: 'good',
+          fcpRating: 'good',
+          lcpRating: 'good',
+          clsRating: 'good',
+        },
+        {
+          inp: 300,
+          fcp: 2000,
+          lcp: 3000,
+          cls: 0.15,
+          inpRating: 'needs-improvement',
+          fcpRating: 'needs-improvement',
+          lcpRating: 'needs-improvement',
+          clsRating: 'needs-improvement',
+        },
+        {
+          inp: 600,
+          fcp: 4000,
+          lcp: 5000,
+          cls: 0.3,
+          inpRating: 'poor',
+          fcpRating: 'poor',
+          lcpRating: 'poor',
+          clsRating: 'poor',
+        },
+      ];
+
+      const result = aggregateWebVitals(runs);
+
+      expect(result.ratings.inp.good).toBe(1);
+      expect(result.ratings.inp['needs-improvement']).toBe(1);
+      expect(result.ratings.inp.poor).toBe(1);
+      expect(result.ratings.inp.null).toBe(0);
+    });
+
+    it('handles all-null runs', () => {
+      const runs: WebVitalsMetrics[] = [
+        {
+          inp: null,
+          fcp: null,
+          lcp: null,
+          cls: null,
+          inpRating: null,
+          fcpRating: null,
+          lcpRating: null,
+          clsRating: null,
+        },
+        {
+          inp: null,
+          fcp: null,
+          lcp: null,
+          cls: null,
+          inpRating: null,
+          fcpRating: null,
+          lcpRating: null,
+          clsRating: null,
+        },
+      ];
+
+      const result = aggregateWebVitals(runs);
+
+      expect(result.inp).toBeNull();
+      expect(result.lcp).toBeNull();
+      expect(result.cls).toBeNull();
+      expect(result.ratings.inp.null).toBe(2);
+      expect(result.ratings.lcp.null).toBe(2);
+      expect(result.ratings.cls.null).toBe(2);
+    });
+
+    it('handles mixed null and non-null values', () => {
+      const runs: WebVitalsMetrics[] = [
+        {
+          inp: 100,
+          fcp: 180,
+          lcp: null,
+          cls: null,
+          inpRating: 'good',
+          fcpRating: 'good',
+          lcpRating: null,
+          clsRating: null,
+        },
+        {
+          inp: 120,
+          fcp: null,
+          lcp: null,
+          cls: 0.01,
+          inpRating: 'good',
+          fcpRating: null,
+          lcpRating: null,
+          clsRating: 'good',
+        },
+        {
+          inp: null,
+          fcp: null,
+          lcp: null,
+          cls: null,
+          inpRating: null,
+          fcpRating: null,
+          lcpRating: null,
+          clsRating: null,
+        },
+      ];
+
+      const result = aggregateWebVitals(runs);
+
+      expect(result.inp).not.toBeNull();
+      expect(result.inp?.samples).toBe(2);
+      expect(result.lcp).toBeNull();
+      expect(result.cls).not.toBeNull();
+      expect(result.cls?.samples).toBe(1);
+      expect(result.ratings.inp.good).toBe(2);
+      expect(result.ratings.inp.null).toBe(1);
+    });
+
+    it('initializes rating distributions to zero', () => {
+      const runs: WebVitalsMetrics[] = [];
+      const result = aggregateWebVitals(runs);
+
+      for (const metric of ['inp', 'lcp', 'cls'] as const) {
+        expect(result.ratings[metric].good).toBe(0);
+        expect(result.ratings[metric]['needs-improvement']).toBe(0);
+        expect(result.ratings[metric].poor).toBe(0);
+        expect(result.ratings[metric].null).toBe(0);
+      }
+    });
+  });
 });
diff --git a/test/e2e/benchmarks/utils/statistics.ts b/test/e2e/benchmarks/utils/statistics.ts
index b7c8e9a21a41..ade2e2efbe90 100644
--- a/test/e2e/benchmarks/utils/statistics.ts
+++ b/test/e2e/benchmarks/utils/statistics.ts
@@ -8,16 +8,20 @@
  * - Sanity checks for metric validation
  */
 
-import { ThresholdSeverity } from '../../../../shared/constants/benchmarks';
+import { THRESHOLD_SEVERITY } from '../../../../shared/constants/benchmarks';
 import type {
   BenchmarkResults,
   PercentileKey,
   PercentileThreshold,
+  RatingDistribution,
   StatisticalResult,
   ThresholdConfig,
   ThresholdViolation,
+  TimerStatistics,
+  WebVitalsAggregated,
+  WebVitalsMetrics,
+  WebVitalsRating,
 } from '../../../../shared/constants/benchmarks';
-import type { TimerStatistics } from './types';
 
 /**
  * CV (Coefficient of Variation) thresholds for data quality assessment
@@ -431,7 +435,7 @@ const validatePercentile = (
       percentile,
       value,
       threshold: failThreshold,
-      severity: ThresholdSeverity.Fail,
+      severity: THRESHOLD_SEVERITY.Fail,
     };
   }
 
@@ -441,7 +445,7 @@ const validatePercentile = (
       percentile,
       value,
       threshold: warnThreshold,
-      severity: ThresholdSeverity.Warn,
+      severity: THRESHOLD_SEVERITY.Warn,
     };
   }
 
@@ -522,7 +526,9 @@ export const validateThresholds = (
     violations.push(...timerViolations);
   }
 
-  const passed = !violations.some((v) => v.severity === ThresholdSeverity.Fail);
+  const passed = !violations.some(
+    (v) => v.severity === THRESHOLD_SEVERITY.Fail,
+  );
 
   return { violations, passed };
 };
@@ -570,10 +576,145 @@ export const validateResultThresholds = (
     }
   }
 
-  const passed = !violations.some((v) => v.severity === ThresholdSeverity.Fail);
+  const passed = !violations.some(
+    (v) => v.severity === THRESHOLD_SEVERITY.Fail,
+  );
   return { violations, passed };
 };
 
+const WEB_VITALS_NUMERIC_KEYS = ['inp', 'fcp', 'lcp', 'cls'] as const;
+
+type WebVitalsNumericKey = (typeof WEB_VITALS_NUMERIC_KEYS)[number];
+
+/**
+ * Per-metric sanity bounds for web vitals.
+ *
+ * These differ from timer bounds because:
+ * - CLS is unitless (0-10 range in practice), not milliseconds
+ * - CLS of 0 is valid (perfect visual stability)
+ * - INP/LCP have different reasonable ceilings than arbitrary timer durations
+ */
+const WEB_VITALS_BOUNDS: Record<
+  WebVitalsNumericKey,
+  { min: number; max: number }
+> = {
+  /** INP: interaction responsiveness. Google "poor" starts at 500ms. 0ms means sub-frame. */
+  inp: { min: 0, max: 30_000 },
+  /** FCP: first content paint. Google "poor" starts at 3s. 0ms is invalid. */
+  fcp: { min: 1, max: 60_000 },
+  /** LCP: perceived load time. Google "poor" starts at 4s. 0ms is invalid. */
+  lcp: { min: 1, max: 60_000 },
+  /** CLS: layout shift score (unitless). 0 is perfect stability; >1 is extremely poor. */
+  cls: { min: 0, max: 10 },
+};
+
+/**
+ * Calculate statistics for a single web vitals metric.
+ *
+ * Uses metric-specific sanity bounds, then the same IQR+z-score outlier
+ * detection and percentile analysis as timer statistics.
+ *
+ * @param metricId - The metric name ('inp', 'lcp', or 'cls')
+ * @param values - Raw metric values across benchmark iterations
+ */
+export const calculateWebVitalsStatistics = (
+  metricId: WebVitalsNumericKey,
+  values: number[],
+): TimerStatistics => {
+  const bounds = WEB_VITALS_BOUNDS[metricId];
+
+  // Metric-specific sanity filtering: exclude values outside [min, max]
+  const filtered: number[] = [];
+  let excludedCount = 0;
+  for (const value of values) {
+    if (value < bounds.min || value > bounds.max) {
+      excludedCount += 1;
+    } else {
+      filtered.push(value);
+    }
+  }
+
+  // Standard outlier detection on surviving values
+  const outlierResult = detectOutliers(filtered);
+  const sorted = [...outlierResult.filtered].sort((a, b) => a - b);
+  const mean = calculateMean(outlierResult.filtered);
+  const stdDev = calculateStdDev(outlierResult.filtered);
+  const cv = mean > 0 ? (stdDev / mean) * 100 : 0;
+
+  const totalExcluded = excludedCount + outlierResult.outlierCount;
+
+  return {
+    id: metricId,
+    mean,
+    min: sorted.length > 0 ? sorted[0] : 0,
+    max: sorted.length > 0 ? sorted[sorted.length - 1] : 0,
+    stdDev,
+    cv,
+    p50: calculatePercentile(sorted, 50),
+    p75: calculatePercentile(sorted, 75),
+    p95: calculatePercentile(sorted, 95),
+    p99: calculatePercentile(sorted, 99),
+    samples: outlierResult.filtered.length,
+    outliers: totalExcluded,
+    dataQuality: assessDataQuality(cv),
+  };
+};
+
+function createEmptyRatingDistribution(): RatingDistribution {
+  return { good: 0, 'needs-improvement': 0, poor: 0, null: 0 };
+}
+
+/**
+ * Aggregate per-run web vitals into statistical summaries.
+ *
+ * Uses metric-specific sanity bounds (CLS is unitless, INP/LCP have different
+ * ceilings than generic timer durations), then standard outlier detection and
+ * percentile analysis. Preserves rating distributions for categorical analysis.
+ *
+ * @param runs - Array of per-run web vitals snapshots
+ * @returns Aggregated statistics per metric + rating distributions
+ */
+export function aggregateWebVitals(
+  runs: WebVitalsMetrics[],
+): WebVitalsAggregated {
+  const result: WebVitalsAggregated = {
+    inp: null,
+    fcp: null,
+    lcp: null,
+    cls: null,
+    ratings: {
+      inp: createEmptyRatingDistribution(),
+      fcp: createEmptyRatingDistribution(),
+      lcp: createEmptyRatingDistribution(),
+      cls: createEmptyRatingDistribution(),
+    },
+  };
+
+  for (const metric of WEB_VITALS_NUMERIC_KEYS) {
+    // Extract non-null numeric values for statistical analysis
+    const values = runs
+      .map((r) => r[metric])
+      .filter((v): v is number => v !== null);
+
+    if (values.length > 0) {
+      result[metric] = calculateWebVitalsStatistics(metric, values);
+    }
+
+    // Tally rating distribution across all runs
+    const ratingKey = `${metric}Rating` as const;
+    for (const run of runs) {
+      const rating: WebVitalsRating | null = run[ratingKey];
+      if (rating === null) {
+        result.ratings[metric].null += 1;
+      } else {
+        result.ratings[metric][rating] += 1;
+      }
+    }
+  }
+
+  return result;
+}
+
 /**
  * Log threshold validation results to the console.
  *
@@ -583,7 +724,7 @@ export function logThresholdResult(violations: ThresholdViolation[]): void {
   if (violations.length > 0) {
     console.log('\n  Threshold Violations:');
     violations.forEach((v) => {
-      const icon = v.severity === ThresholdSeverity.Fail ? '🔺' : '🔼';
+      const icon = v.severity === THRESHOLD_SEVERITY.Fail ? '🔺' : '🔼';
       console.log(
         `    ${icon} ${v.metricId} (${v.percentile}): ${v.value.toFixed(2)}ms > ${v.threshold}ms`,
       );
diff --git a/test/e2e/benchmarks/utils/types.ts b/test/e2e/benchmarks/utils/types.ts
index a76ca76edd86..4ebbad4ea602 100644
--- a/test/e2e/benchmarks/utils/types.ts
+++ b/test/e2e/benchmarks/utils/types.ts
@@ -1,6 +1,9 @@
 import type {
   Persona,
   BenchmarkType,
+  WebVitalsMetrics,
+  WebVitalsSummary,
+  TimerStatistics,
   ThresholdViolation,
 } from '../../../../shared/constants/benchmarks';
 
@@ -13,6 +16,8 @@ export type PageLoadBenchmarkOptions = {
   browserLoads?: number;
   pageLoads?: number;
   retries?: number;
+  platform?: string;
+  buildType?: string;
 };
 
 type NavigationMetric = {
@@ -34,12 +39,13 @@ export type Metrics = {
   numNetworkReqs: number;
 };
 
-/** User action result with testTitle, persona and numeric timing metrics. */
+/** User action result with testTitle, persona, timing metrics, and Core Web Vitals. */
 export type UserActionResult = {
   testTitle: string;
   persona: Persona;
+  webVitals?: WebVitalsMetrics;
   benchmarkType?: BenchmarkType;
-  [key: string]: string | number | undefined;
+  [key: string]: string | number | WebVitalsMetrics | undefined;
 };
 
 export type BenchmarkArguments = {
@@ -57,27 +63,13 @@ export type NetworkReport = {
 
 export type BenchmarkRunResult = {
   timers: TimerResult[];
+  /** Per-run web vitals snapshot captured at end of measurement */
+  webVitals?: WebVitalsMetrics;
   success: boolean;
   error?: string;
   benchmarkType?: BenchmarkType;
 };
 
-export type TimerStatistics = {
-  id: string;
-  mean: number;
-  min: number;
-  max: number;
-  stdDev: number;
-  cv: number; // Coefficient of Variation
-  p50: number;
-  p75: number;
-  p95: number;
-  p99: number;
-  samples: number;
-  outliers: number;
-  dataQuality: 'good' | 'poor' | 'unreliable';
-};
-
 export type BenchmarkSummary = {
   name: string;
   iterations: number;
@@ -94,6 +86,8 @@ export type BenchmarkSummary = {
   thresholdsPassed: boolean;
   /** Benchmark type extracted from the first successful run */
   benchmarkType?: BenchmarkType;
+  /** Web vitals per-run data and aggregated statistics */
+  webVitals?: WebVitalsSummary;
 };
 
 export type PerformanceBenchmarkResults = {
@@ -102,3 +96,9 @@ export type PerformanceBenchmarkResults = {
 };
 
 export type BenchmarkFunction = () => Promise<BenchmarkRunResult>;
+
+/** Return type for user-action measurement functions inside flows */
+export type UserActionMeasurement = {
+  timers: TimerResult[];
+  webVitals?: WebVitalsMetrics;
+};
diff --git a/test/e2e/benchmarks/utils/web-vitals-collector.test.ts b/test/e2e/benchmarks/utils/web-vitals-collector.test.ts
new file mode 100644
index 000000000000..49a19a61b177
--- /dev/null
+++ b/test/e2e/benchmarks/utils/web-vitals-collector.test.ts
@@ -0,0 +1,783 @@
+import type { Driver } from '../../webdriver/driver';
+import type { WebVitalsMetrics } from '../../../../shared/constants/benchmarks';
+import { collectWebVitals } from './web-vitals-collector';
+
+function createMockDriver(overrides: {
+  executeScript?: jest.Mock;
+  delay?: jest.Mock;
+  innerActions?: jest.Mock | null;
+  innerSendDevToolsCommand?: jest.Mock | null;
+}): Driver {
+  const innerDriver: Record<string, unknown> = {};
+
+  if (overrides.innerActions !== null) {
+    const perform =
+      overrides.innerActions ?? jest.fn().mockResolvedValue(undefined);
+    innerDriver.actions = jest.fn().mockReturnValue({
+      move: jest.fn().mockReturnThis(),
+      click: jest.fn().mockReturnThis(),
+      perform,
+    });
+  }
+
+  if (overrides.innerSendDevToolsCommand !== null) {
+    innerDriver.sendDevToolsCommand =
+      overrides.innerSendDevToolsCommand ??
+      jest.fn().mockResolvedValue(undefined);
+  }
+
+  const driver = {
+    executeScript: overrides.executeScript ?? jest.fn().mockResolvedValue(null),
+    delay: overrides.delay ?? jest.fn().mockResolvedValue(undefined),
+    switchToWindowWithTitle: jest.fn().mockResolvedValue(undefined),
+    driver:
+      overrides.innerActions === null &&
+      overrides.innerSendDevToolsCommand === null
+        ? undefined
+        : innerDriver,
+  } as unknown as Driver;
+  return driver;
+}
+
+const fullMetrics: WebVitalsMetrics = {
+  inp: 120,
+  fcp: 280,
+  lcp: 1800,
+  cls: 0.05,
+  inpRating: 'good',
+  fcpRating: 'good',
+  lcpRating: 'good',
+  clsRating: 'good',
+};
+
+const nullMetrics: WebVitalsMetrics = {
+  inp: null,
+  fcp: null,
+  lcp: null,
+  cls: null,
+  inpRating: null,
+  fcpRating: null,
+  lcpRating: null,
+  clsRating: null,
+};
+
+function makeReadResult(
+  overrides: Partial<WebVitalsMetrics> = {},
+): WebVitalsMetrics {
+  return { ...nullMetrics, ...overrides };
+}
+
+describe('collectWebVitals', () => {
+  beforeEach(() => {
+    jest.spyOn(console, 'info').mockImplementation(() => undefined);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  describe('execution flow', () => {
+    it('executes 2 scripts: setup and read', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined) // setup
+        .mockResolvedValueOnce(fullMetrics); // read
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      expect(execScript).toHaveBeenCalledTimes(2);
+    });
+
+    it('calls delay(200) between probe and read', async () => {
+      const delay = jest.fn().mockResolvedValue(undefined);
+      const callOrder: string[] = [];
+
+      const perform = jest.fn().mockImplementation(async () => {
+        callOrder.push('actions');
+      });
+      delay.mockImplementation(async () => {
+        callOrder.push('delay');
+      });
+
+      const execScript = jest
+        .fn()
+        .mockImplementationOnce(async () => {
+          callOrder.push('setup');
+        })
+        .mockImplementationOnce(async () => {
+          callOrder.push('read');
+          return fullMetrics;
+        });
+
+      const driver = createMockDriver({
+        executeScript: execScript,
+        delay,
+        innerActions: perform,
+      });
+
+      await collectWebVitals(driver);
+
+      expect(delay).toHaveBeenCalledWith(500);
+      expect(callOrder).toEqual(['setup', 'actions', 'delay', 'read']);
+    });
+  });
+
+  describe('INP probe (Selenium Actions → CDP fallback)', () => {
+    it('uses Selenium Actions API as primary probe', async () => {
+      const perform = jest.fn().mockResolvedValue(undefined);
+      const sendCmd = jest.fn().mockResolvedValue(undefined);
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(fullMetrics);
+
+      const driver = createMockDriver({
+        executeScript: execScript,
+        innerActions: perform,
+        innerSendDevToolsCommand: sendCmd,
+      });
+
+      await collectWebVitals(driver);
+
+      expect(perform).toHaveBeenCalledTimes(1);
+      expect(sendCmd).not.toHaveBeenCalled();
+    });
+
+    it('falls back to CDP when Actions throws', async () => {
+      const perform = jest.fn().mockRejectedValue(new Error('Actions failed'));
+      const sendCmd = jest.fn().mockResolvedValue(undefined);
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(fullMetrics);
+
+      const driver = createMockDriver({
+        executeScript: execScript,
+        innerActions: perform,
+        innerSendDevToolsCommand: sendCmd,
+      });
+
+      await collectWebVitals(driver);
+
+      expect(perform).toHaveBeenCalledTimes(1);
+      expect(sendCmd).toHaveBeenCalledTimes(2);
+      expect(sendCmd).toHaveBeenCalledWith(
+        'Input.dispatchMouseEvent',
+        expect.objectContaining({ type: 'mousePressed', button: 'left' }),
+      );
+      expect(sendCmd).toHaveBeenCalledWith(
+        'Input.dispatchMouseEvent',
+        expect.objectContaining({ type: 'mouseReleased', button: 'left' }),
+      );
+    });
+
+    it('uses CDP when Actions API is unavailable', async () => {
+      const sendCmd = jest.fn().mockResolvedValue(undefined);
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(fullMetrics);
+
+      const driver = {
+        executeScript: execScript,
+        delay: jest.fn().mockResolvedValue(undefined),
+        switchToWindowWithTitle: jest.fn().mockResolvedValue(undefined),
+        driver: { sendDevToolsCommand: sendCmd },
+      } as unknown as Driver;
+
+      await collectWebVitals(driver);
+
+      expect(sendCmd).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('graceful degradation', () => {
+    it('returns metrics when both Actions and CDP throw', async () => {
+      const perform = jest.fn().mockRejectedValue(new Error('Actions gone'));
+      const sendCmd = jest.fn().mockRejectedValue(new Error('CDP gone'));
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(fullMetrics);
+
+      const driver = createMockDriver({
+        executeScript: execScript,
+        innerActions: perform,
+        innerSendDevToolsCommand: sendCmd,
+      });
+
+      const result = await collectWebVitals(driver);
+      expect(result).toEqual(fullMetrics);
+    });
+
+    it('works when inner driver is undefined', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(fullMetrics);
+
+      const driver = createMockDriver({
+        executeScript: execScript,
+        innerActions: null,
+        innerSendDevToolsCommand: null,
+      });
+
+      const result = await collectWebVitals(driver);
+      expect(result).toEqual(fullMetrics);
+    });
+  });
+
+  describe('script content', () => {
+    it('setup script creates PerformanceObservers and reads FCP', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const setupScript = execScript.mock.calls[0][0] as string;
+      expect(setupScript).toContain('PerformanceObserver');
+      expect(setupScript).toContain("type: 'event'");
+      expect(setupScript).toContain("type: 'largest-contentful-paint'");
+      expect(setupScript).toContain("type: 'layout-shift'");
+      expect(setupScript).toContain('buffered: true');
+      expect(setupScript).toContain('first-contentful-paint');
+      expect(setupScript).toContain('__cwv');
+    });
+
+    it('setup script tracks eventObserverSupported and probeReceived', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const setupScript = execScript.mock.calls[0][0] as string;
+      expect(setupScript).toContain('eventObserverSupported');
+      expect(setupScript).toContain('probeReceived');
+    });
+
+    it('read script computes metrics and cleans up', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('window.__cwv');
+      expect(readScript).toContain('return result');
+      expect(readScript).toContain('disconnect');
+      expect(readScript).toContain('delete window.__cwv');
+    });
+
+    it('read script populates FCP from paint entries', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('result.fcp = cwv.fcp');
+      expect(readScript).toContain('result.fcpRating');
+    });
+
+    it('read script does not substitute FCP for LCP', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).not.toContain('result.lcp = result.fcp');
+    });
+
+    it('read script uses mm-hero-painted mark as LCP fallback', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('mm-hero-painted');
+      expect(readScript).toContain("getEntriesByName('mm-hero-painted'");
+    });
+
+    it('read script checks stateHooks for INP, LCP, and CLS', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('stateHooks');
+      expect(readScript).toContain('getWebVitalsMetrics');
+      expect(readScript).toContain('resetWebVitalsMetrics');
+      expect(readScript).toContain('m.inp');
+    });
+
+    it('read script includes diagnostic fields', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('cwvDiagnostic');
+      expect(readScript).toContain('supportedEntryTypes');
+      expect(readScript).toContain('eventEntryCount');
+      expect(readScript).toContain('eventObserverSupported');
+      expect(readScript).toContain('clsSupported');
+      expect(readScript).toContain('clsEntryCount');
+      expect(readScript).toContain('probeReceived');
+      expect(readScript).toContain('stateHooksInp');
+      expect(readScript).toContain('stateHooksAvailable');
+    });
+  });
+
+  describe('diagnostic stripping', () => {
+    it('strips cwvDiagnostic from returned metrics', async () => {
+      const metricsWithDiag = {
+        ...fullMetrics,
+        cwvDiagnostic: {
+          supportedEntryTypes: ['event', 'layout-shift'],
+          eventEntryCount: 3,
+          eventObserverSupported: true,
+          clsSupported: true,
+          clsEntryCount: 0,
+          probeReceived: true,
+          stateHooksInp: 120,
+          stateHooksAvailable: true,
+        },
+      };
+
+      const driver = createMockDriver({
+        executeScript: jest
+          .fn()
+          .mockResolvedValueOnce(undefined)
+          .mockResolvedValueOnce(metricsWithDiag),
+      });
+
+      const result = await collectWebVitals(driver);
+      expect(result).not.toHaveProperty('cwvDiagnostic');
+      expect(result.inp).toBe(120);
+    });
+
+    it('logs diagnostic info via console.info', async () => {
+      const diagnostic = {
+        supportedEntryTypes: [],
+        eventEntryCount: 0,
+        eventObserverSupported: false,
+        clsSupported: false,
+        clsEntryCount: 0,
+        probeReceived: false,
+        stateHooksInp: null,
+        stateHooksAvailable: true,
+      };
+
+      const driver = createMockDriver({
+        executeScript: jest
+          .fn()
+          .mockResolvedValueOnce(undefined)
+          .mockResolvedValueOnce({
+            ...makeReadResult(),
+            cwvDiagnostic: diagnostic,
+          }),
+      });
+
+      await collectWebVitals(driver);
+      expect(console.info).toHaveBeenCalledWith(
+        '[web-vitals-collector] diagnostic:',
+        diagnostic,
+      );
+    });
+  });
+
+  describe('FCP and LCP as separate metrics', () => {
+    it('returns FCP independently from LCP', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(
+              makeReadResult({ fcp: 280, fcpRating: 'good', lcp: null }),
+            ),
+        }),
+      );
+
+      expect(result.fcp).toBe(280);
+      expect(result.fcpRating).toBe('good');
+      expect(result.lcp).toBeNull();
+    });
+
+    it('returns LCP from real largest-contentful-paint entries', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(
+              makeReadResult({
+                fcp: 200,
+                fcpRating: 'good',
+                lcp: 1800,
+                lcpRating: 'good',
+              }),
+            ),
+        }),
+      );
+
+      expect(result.fcp).toBe(200);
+      expect(result.lcp).toBe(1800);
+    });
+
+    it('returns LCP from mm-hero-painted fallback', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(
+              makeReadResult({
+                fcp: 250,
+                fcpRating: 'good',
+                lcp: 1200,
+                lcpRating: 'good',
+              }),
+            ),
+        }),
+      );
+
+      expect(result.fcp).toBe(250);
+      expect(result.lcp).toBe(1200);
+      expect(result.lcpRating).toBe('good');
+    });
+  });
+
+  describe('zero-fallbacks', () => {
+    it('INP stays null when no entries and no stateHooks', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(makeReadResult()),
+        }),
+      );
+
+      expect(result.inp).toBeNull();
+      expect(result.inpRating).toBeNull();
+    });
+
+    it('CLS stays null when layout-shift observer is unsupported', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(makeReadResult()),
+        }),
+      );
+
+      expect(result.cls).toBeNull();
+      expect(result.clsRating).toBeNull();
+    });
+
+    it('CLS falls back to 0 when layout-shift observer is supported but no entries', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(
+              makeReadResult({ cls: 0, clsRating: 'good' }),
+            ),
+        }),
+      );
+
+      expect(result.cls).toBe(0);
+      expect(result.clsRating).toBe('good');
+    });
+
+    it('read script does NOT contain INP = 0 fallback', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).not.toContain('result.inp = 0');
+    });
+
+    it('read script gates CLS fallback on clsSupported', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('result.cls === null');
+      expect(readScript).toContain('cwv.clsSupported');
+      // clsVal starts at 0, so when observer fires but no shifts occurred,
+      // result.cls = clsVal gives 0 (perfect stability)
+      expect(readScript).toContain('result.cls = clsVal');
+    });
+  });
+
+  describe('busy-wait pointerdown handler', () => {
+    it('setup script registers a busy-wait pointerdown handler', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const setupScript = execScript.mock.calls[0][0] as string;
+      expect(setupScript).toContain('busyWait');
+      expect(setupScript).toContain('pointerdown');
+      expect(setupScript).toContain('performance.now()');
+      expect(setupScript).toContain('once: true');
+    });
+
+    it('busy-wait targets 16ms duration', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const setupScript = execScript.mock.calls[0][0] as string;
+      expect(setupScript).toContain('+ 16');
+    });
+  });
+
+  describe('maxDur > 0 guard', () => {
+    it('read script gates INP fallback on maxDur > 0 when stateHooks unavailable', async () => {
+      const execScript = jest
+        .fn()
+        .mockResolvedValueOnce(undefined)
+        .mockResolvedValueOnce(makeReadResult());
+
+      const driver = createMockDriver({ executeScript: execScript });
+      await collectWebVitals(driver);
+
+      const readScript = execScript.mock.calls[1][0] as string;
+      expect(readScript).toContain('if (maxDur > 0)');
+    });
+
+    it('INP is set when event durations are reported', async () => {
+      const result = await collectWebVitals(
+        createMockDriver({
+          executeScript: jest
+            .fn()
+            .mockResolvedValueOnce(undefined)
+            .mockResolvedValueOnce(
+              makeReadResult({ inp: 16, inpRating: 'good' }),
+            ),
+        }),
+      );
+
+      expect(result.inp).toBe(16);
+      expect(result.inp).not.toBeNull();
+      expect(result.inpRating).toBe('good');
+    });
+  });
+
+  describe('metric output', () => {
+    function makeDriver(readResult: WebVitalsMetrics) {
+      return createMockDriver({
+        executeScript: jest
+          .fn()
+          .mockResolvedValueOnce(undefined)
+          .mockResolvedValueOnce(readResult),
+      });
+    }
+
+    it('returns all metrics non-null with correct ratings', async () => {
+      const result = await collectWebVitals(makeDriver(fullMetrics));
+
+      expect(result.inp).toBe(120);
+      expect(result.fcp).toBe(280);
+      expect(result.lcp).toBe(1800);
+      expect(result.cls).toBe(0.05);
+      expect(result.inpRating).toBe('good');
+      expect(result.fcpRating).toBe('good');
+      expect(result.lcpRating).toBe('good');
+      expect(result.clsRating).toBe('good');
+    });
+
+    it('returns CLS of exactly 0 as non-null', async () => {
+      const result = await collectWebVitals(
+        makeDriver(
+          makeReadResult({
+            inp: 50,
+            fcp: 300,
+            cls: 0,
+            inpRating: 'good',
+            fcpRating: 'good',
+            clsRating: 'good',
+          }),
+        ),
+      );
+
+      expect(result.cls).toBe(0);
+      expect(result.cls).not.toBeNull();
+      expect(result.clsRating).toBe('good');
+    });
+
+    describe('INP rating thresholds', () => {
+      // @ts-expect-error '.each' is missing from type definitions
+      it.each([
+        { inp: 200, expected: 'good' },
+        { inp: 201, expected: 'needs-improvement' },
+        { inp: 500, expected: 'needs-improvement' },
+        { inp: 501, expected: 'poor' },
+      ])(
+        'INP $inp ms → $expected',
+        async ({ inp, expected }: { inp: number; expected: string }) => {
+          const result = await collectWebVitals(
+            makeDriver(
+              makeReadResult({
+                inp,
+                inpRating: expected as WebVitalsMetrics['inpRating'],
+              }),
+            ),
+          );
+          expect(result.inp).toBe(inp);
+          expect(result.inpRating).toBe(expected);
+        },
+      );
+    });
+
+    describe('FCP rating thresholds', () => {
+      // @ts-expect-error '.each' is missing from type definitions
+      it.each([
+        { fcp: 1800, expected: 'good' },
+        { fcp: 1801, expected: 'needs-improvement' },
+        { fcp: 3000, expected: 'needs-improvement' },
+        { fcp: 3001, expected: 'poor' },
+      ])(
+        'FCP $fcp ms → $expected',
+        async ({ fcp, expected }: { fcp: number; expected: string }) => {
+          const result = await collectWebVitals(
+            makeDriver(
+              makeReadResult({
+                fcp,
+                fcpRating: expected as WebVitalsMetrics['fcpRating'],
+              }),
+            ),
+          );
+          expect(result.fcp).toBe(fcp);
+          expect(result.fcpRating).toBe(expected);
+        },
+      );
+    });
+
+    describe('CLS rating thresholds', () => {
+      // @ts-expect-error '.each' is missing from type definitions
+      it.each([
+        { cls: 0.1, expected: 'good' },
+        { cls: 0.11, expected: 'needs-improvement' },
+        { cls: 0.25, expected: 'needs-improvement' },
+        { cls: 0.26, expected: 'poor' },
+      ])(
+        'CLS $cls → $expected',
+        async ({ cls, expected }: { cls: number; expected: string }) => {
+          const result = await collectWebVitals(
+            makeDriver(
+              makeReadResult({
+                cls,
+                clsRating: expected as WebVitalsMetrics['clsRating'],
+              }),
+            ),
+          );
+          expect(result.cls).toBe(cls);
+          expect(result.clsRating).toBe(expected);
+        },
+      );
+    });
+
+    describe('partial non-null combinations', () => {
+      it('INP + FCP non-null, LCP + CLS null', async () => {
+        const result = await collectWebVitals(
+          makeDriver(
+            makeReadResult({
+              inp: 16,
+              fcp: 300,
+              inpRating: 'good',
+              fcpRating: 'good',
+            }),
+          ),
+        );
+
+        expect(result.inp).toBe(16);
+        expect(result.fcp).toBe(300);
+        expect(result.lcp).toBeNull();
+        expect(result.cls).toBeNull();
+      });
+
+      it('INP + CLS non-null, FCP + LCP null', async () => {
+        const result = await collectWebVitals(
+          makeDriver(
+            makeReadResult({
+              inp: 250,
+              cls: 0.05,
+              inpRating: 'needs-improvement',
+              clsRating: 'good',
+            }),
+          ),
+        );
+
+        expect(result.inp).toBe(250);
+        expect(result.fcp).toBeNull();
+        expect(result.lcp).toBeNull();
+        expect(result.cls).toBe(0.05);
+      });
+
+      it('only INP non-null', async () => {
+        const result = await collectWebVitals(
+          makeDriver(makeReadResult({ inp: 600, inpRating: 'poor' })),
+        );
+
+        expect(result.inp).toBe(600);
+        expect(result.inpRating).toBe('poor');
+        expect(result.fcp).toBeNull();
+        expect(result.lcp).toBeNull();
+        expect(result.cls).toBeNull();
+      });
+    });
+  });
+});
diff --git a/test/e2e/benchmarks/utils/web-vitals-collector.ts b/test/e2e/benchmarks/utils/web-vitals-collector.ts
new file mode 100644
index 000000000000..ac169b5330e5
--- /dev/null
+++ b/test/e2e/benchmarks/utils/web-vitals-collector.ts
@@ -0,0 +1,164 @@
+/**
+ * Web Vitals collection for E2E benchmarks.
+ *
+ * Measurement strategy per metric:
+ *
+ * **INP** — Two-tier: (1) `stateHooks.getWebVitalsMetrics()` from the
+ * `onINP` observer with `{ reportAllChanges: true }`, capturing INP from
+ * real WebDriver interactions. (2) PerformanceObserver (`event` type,
+ * `buffered: true`) + Selenium Actions probe generating a trusted pointer
+ * interaction with a 16ms busy-wait handler. Falls back to CDP
+ * `Input.dispatchMouseEvent` if Actions API is unavailable.
+ *
+ * **FCP** — Read from `performance.getEntriesByType('paint')`.
+ *
+ * **LCP** — (1) PerformanceObserver (`largest-contentful-paint`), then
+ * (2) `performance.mark('mm-hero-painted')` set by `AccountOverviewLayout`
+ * after hero content renders, then null.
+ *
+ * **CLS** — PerformanceObserver (`layout-shift` type).
+ * Falls back to 0 on extension pages where the observer is unsupported.
+ */
+
+import { readFileSync } from 'fs';
+import path from 'path';
+
+import { WINDOW_TITLES } from '../../constants';
+import type { Driver } from '../../webdriver/driver';
+import type { WebVitalsMetrics } from '../../../../shared/constants/benchmarks';
+
+/**
+ * Setup script: creates PerformanceObservers for event timing, LCP,
+ * and CLS; reads FCP from paint entries; registers a busy-wait
+ * pointerdown handler for the INP probe.
+ * Stores state on `window.__cwv` for the read script.
+ */
+const SETUP_SCRIPT = readFileSync(
+  path.join(__dirname, 'cwv-setup.js'),
+  'utf-8',
+);
+
+/**
+ * Read script: computes metrics from observer entries, paint timing,
+ * and stateHooks (web-vitals library).
+ *
+ * INP priority: stateHooks (captures real interactions since page load)
+ * → direct PerformanceObserver entries (probe + buffered) → null.
+ * FCP from paint entries.
+ * LCP from stateHooks → PerformanceObserver → mm-hero-painted mark.
+ * CLS from stateHooks first, then observer entries as fallback.
+ */
+const READ_SCRIPT = readFileSync(path.join(__dirname, 'cwv-read.js'), 'utf-8');
+
+const CDP_MOUSE_BASE = {
+  x: 100,
+  y: 100,
+  button: 'left' as const,
+  clickCount: 1,
+};
+
+/**
+ * Dispatch a trusted pointer interaction to generate PerformanceEventTiming.
+ *
+ * Tries Selenium Actions API first (W3C WebDriver protocol, same mechanism
+ * used for all other clicks in the test suite), then falls back to CDP
+ * `Input.dispatchMouseEvent`. Clicks at (100,100) away from interactive
+ * elements. The `pointerdown` busy-wait handler in the setup script ensures
+ * non-zero `duration` on the resulting PerformanceEventTiming entry.
+ *
+ * @param driver - MetaMask Driver wrapper with Selenium driver at `.driver`
+ */
+async function dispatchINPProbe(driver: Driver): Promise<void> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const innerDriver = (driver as any).driver;
+  if (!innerDriver) {
+    return;
+  }
+
+  // Approach 1: Selenium W3C Actions API
+  if (innerDriver.actions) {
+    try {
+      await innerDriver
+        .actions({ async: true })
+        .move({ x: CDP_MOUSE_BASE.x, y: CDP_MOUSE_BASE.y })
+        .click()
+        .perform();
+      return;
+    } catch {
+      // Actions failed — fall through to CDP
+    }
+  }
+
+  // Approach 2: CDP sendDevToolsCommand (ChromeDriver-specific)
+  if (innerDriver.sendDevToolsCommand) {
+    try {
+      await innerDriver.sendDevToolsCommand('Input.dispatchMouseEvent', {
+        type: 'mousePressed',
+        ...CDP_MOUSE_BASE,
+      });
+      await innerDriver.sendDevToolsCommand('Input.dispatchMouseEvent', {
+        type: 'mouseReleased',
+        ...CDP_MOUSE_BASE,
+      });
+    } catch {
+      // CDP unavailable — fall through with whatever entries exist
+    }
+  }
+}
+
+/**
+ * Collect web vitals from the running extension.
+ *
+ * INP: stateHooks (web-vitals `onINP`, running since page startup)
+ * is the primary source — it captures real INP from WebDriver
+ * interactions during the benchmark. A Selenium Actions probe
+ * provides a secondary signal via direct PerformanceObserver entries.
+ *
+ * FCP: paint timing entries (always available on extension pages).
+ * LCP: stateHooks → `largest-contentful-paint` observer →
+ * `mm-hero-painted` mark → null.
+ * CLS: stateHooks → `layout-shift` observer → 0 fallback.
+ *
+ * @param driver - Selenium WebDriver instance with access to the extension page
+ * @returns Per-run web vitals snapshot (with `cwvDiagnostic` for debugging)
+ */
+export async function collectWebVitals(
+  driver: Driver,
+): Promise<WebVitalsMetrics> {
+  // Ensure driver context is the extension page (not a dapp tab).
+  // Benchmarks run in extension; explicit switch avoids wrong-context reads.
+  try {
+    await driver.switchToWindowWithTitle(
+      WINDOW_TITLES.ExtensionInFullScreenView,
+    );
+  } catch {
+    try {
+      // Fallback: try MetaMask Dialog (e.g. confirmation popup)
+      await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+    } catch {
+      // Neither window found — proceed with current context
+      console.warn(
+        '[web-vitals-collector] No extension or dialog window found, using current context',
+      );
+    }
+  }
+
+  await driver.executeScript(SETUP_SCRIPT);
+
+  await dispatchINPProbe(driver);
+
+  // Let observer callbacks + PerformanceEventTiming entries settle.
+  // 500ms allows the web-vitals library's rAF-deferred processing to complete.
+  await driver.delay(500);
+
+  const raw = (await driver.executeScript(READ_SCRIPT)) as WebVitalsMetrics & {
+    cwvDiagnostic?: Record<string, unknown>;
+  };
+
+  if (raw.cwvDiagnostic) {
+    console.info('[web-vitals-collector] diagnostic:', raw.cwvDiagnostic);
+    delete raw.cwvDiagnostic;
+  }
+
+  return raw;
+}
diff --git a/test/e2e/dist/vault-decryption-chrome.spec.ts b/test/e2e/dist/vault-decryption-chrome.spec.ts
index 2601380428f2..f3a23a339a0f 100644
--- a/test/e2e/dist/vault-decryption-chrome.spec.ts
+++ b/test/e2e/dist/vault-decryption-chrome.spec.ts
@@ -181,18 +181,18 @@ describe('Vault Decryptor Page', function () {
             WINDOW_TITLES.ExtensionInFullScreenView,
           );
 
-          // go to privacy settings page
+          // go to security and password settings page
           const homePage = new HomePage(driver);
           await homePage.checkPageIsLoaded();
           await homePage.checkBalanceEmptyStateIsDisplayed();
           await new HeaderNavbar(driver).openSettingsPage();
           const settingsPage = new SettingsPage(driver);
           await settingsPage.checkPageIsLoaded();
-          await settingsPage.goToPrivacySettings();
+          await settingsPage.goToSecurityAndPasswordSettings();
 
           // fill password to reveal SRP and get the SRP
           const privacySettings = new PrivacySettings(driver);
-          await privacySettings.checkPageIsLoaded();
+          await privacySettings.checkSecurityAndPasswordPageIsLoaded();
           await privacySettings.openRevealSrpQuiz();
           await privacySettings.completeRevealSrpQuiz();
           await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
@@ -240,18 +240,18 @@ describe('Vault Decryptor Page', function () {
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
 
-        // go to privacy settings page
+        // go to security and password settings page
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
         await homePage.checkBalanceEmptyStateIsDisplayed();
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
         // fill password to reveal SRP and get the SRP
         const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        await privacySettings.checkSecurityAndPasswordPageIsLoaded();
         await privacySettings.openRevealSrpQuiz();
         await privacySettings.completeRevealSrpQuiz();
         await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
diff --git a/test/e2e/dist/wallet-fixture-export.spec.ts b/test/e2e/dist/wallet-fixture-export.spec.ts
index 4d214568795a..45d4ff114097 100644
--- a/test/e2e/dist/wallet-fixture-export.spec.ts
+++ b/test/e2e/dist/wallet-fixture-export.spec.ts
@@ -184,7 +184,6 @@ describe('Wallet State', function () {
         // Set the settings to match the desired fixture state:
         // 1. enabled native balance and 2. enabled test networks
         await enableNativeTokenAsMainBalance(driver);
-        await enableTestNetworks(driver);
 
         // Action needed to apply the changes in the balance as doesn't happen right away (potential bug)
         await switchToNetworkFromNetworkSelect(
@@ -193,6 +192,8 @@ describe('Wallet State', function () {
           'All popular networks',
         );
 
+        await enableTestNetworks(driver);
+
         await switchToNetworkFromNetworkSelect(
           driver,
           'Custom',
diff --git a/test/e2e/dist/wallet-fixture-validation.spec.ts b/test/e2e/dist/wallet-fixture-validation.spec.ts
index e3429853befd..755c6c48afad 100644
--- a/test/e2e/dist/wallet-fixture-validation.spec.ts
+++ b/test/e2e/dist/wallet-fixture-validation.spec.ts
@@ -154,7 +154,6 @@ describe('Wallet State', function () {
         // Set the settings to match the desired fixture state:
         // 1. enabled native balance and 2. enabled test networks
         await enableNativeTokenAsMainBalance(driver);
-        await enableTestNetworks(driver);
 
         // Action needed to apply the changes in the balance as doesn't happen right away (potential bug)
         await switchToNetworkFromNetworkSelect(
@@ -163,6 +162,8 @@ describe('Wallet State', function () {
           'All popular networks',
         );
 
+        await enableTestNetworks(driver);
+
         await switchToNetworkFromNetworkSelect(
           driver,
           'Custom',
diff --git a/test/e2e/feature-flags/feature-flag-registry.ts b/test/e2e/feature-flags/feature-flag-registry.ts
index 3ebcd7c3db3e..b016eda4f507 100644
--- a/test/e2e/feature-flags/feature-flag-registry.ts
+++ b/test/e2e/feature-flags/feature-flag-registry.ts
@@ -64,7 +64,7 @@ export type FeatureFlagRegistryEntry = {
  * Remote flag values are stored in the exact format returned by the production
  * client-config API, so they can be served directly by mock-e2e.js.
  *
- * Production defaults last synced: 2026-02-09
+ * Production defaults last synced: 2026-03-31
  * Source: https://client-config.api.cx.metamask.io/v1/flags?client=extension&distribution=main&environment=prod
  */
 export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
@@ -233,9 +233,13 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     type: FeatureFlagType.Remote,
     inProd: true,
     productionDefault: {
-      minimumVersion: null,
-      enabled: false,
-      featureVersion: null,
+      versions: {
+        '13.15.0': {
+          featureVersion: null,
+          minimumVersion: null,
+          enabled: false,
+        },
+      },
     },
     status: FeatureFlagStatus.Active,
   },
@@ -244,7 +248,13 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     name: 'staticAssetsPollingOptions',
     type: FeatureFlagType.Remote,
     inProd: true,
-    productionDefault: {},
+    productionDefault: {
+      topX: 5,
+      cacheExpirationTime: 3600000,
+      interval: 10800000,
+      occurrenceFloor: {},
+      supportedChains: ['0x10e6'],
+    },
     status: FeatureFlagStatus.Active,
   },
   bridgeConfig: {
@@ -252,16 +262,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     type: FeatureFlagType.Remote,
     inProd: true,
     productionDefault: {
-      maxRefreshCount: 5,
-      priceImpactThreshold: { gasless: 0.2, normal: 0.05 },
       bip44DefaultPairs: {
-        solana: {
-          other: {},
-          standard: {
-            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501':
-              'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-          },
-        },
         bip122: {
           standard: {
             'bip122:000000000019d6689c085ae165831e93/slip44:0':
@@ -270,75 +271,36 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
           other: {},
         },
         eip155: {
+          other: {},
           standard: {
             'eip155:1/slip44:60':
               'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
           },
+        },
+        solana: {
           other: {},
+          standard: {
+            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501':
+              'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+          },
         },
       },
-      sse: { enabled: true, minimumVersion: '13.9.0' },
-      support: true,
-      chainRanking: [
-        { chainId: 'eip155:1', name: 'Ethereum' },
-        { name: 'BNB Chain', chainId: 'eip155:56' },
-        {
-          name: 'BTC',
-          chainId: 'bip122:000000000019d6689c085ae165831e93',
-        },
-        {
-          chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
-          name: 'Solana',
-        },
-        { name: 'Tron', chainId: 'tron:728126428' },
-        { chainId: 'eip155:8453', name: 'Base' },
-        { name: 'Arbitrum', chainId: 'eip155:42161' },
-        { chainId: 'eip155:59144', name: 'Linea' },
-        { chainId: 'eip155:137', name: 'Polygon' },
-        { name: 'Avalanche', chainId: 'eip155:43114' },
-        { chainId: 'eip155:10', name: 'Optimism' },
-        { name: 'Monad', chainId: 'eip155:143' },
-        { name: 'Sei', chainId: 'eip155:1329' },
-        { chainId: 'eip155:324', name: 'zkSync Era' },
-      ],
-      stablecoins: [
-        'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-        'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7',
-        'eip155:59144/erc20:0x176211869ca2b568f2a7d4ee941e073a821ee1ff',
-        'eip155:59144/erc20:0xa219439258ca9da29e9cc4ce5596924745e12b93',
-        'eip155:137/erc20:0x3c499c542cef5e3811e1192ce70d8cc03d5c3359',
-        'eip155:137/erc20:0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
-        'eip155:137/erc20:0xc2132d05d31c914a87c6611c10748aeb04b58e8f',
-        'eip155:42161/erc20:0xaf88d065e77c8cc2239327c5edb3a432268e5831',
-        'eip155:42161/erc20:0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-        'eip155:42161/erc20:0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
-        'eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
-        'eip155:10/erc20:0x0b2c639c533813f4aa9d7837caf62653d097ff85',
-        'eip155:10/erc20:0x7f5c764cbc14f9669b88837ca1490cca17c31607',
-        'eip155:10/erc20:0x94b008aa00579c1307b0ef2c499ad98a8ce58e58',
-        'eip155:56/erc20:0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
-        'eip155:56/erc20:0x55d398326f99059ff775485246999027b3197955',
-        'eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
-        'eip155:43114/erc20:0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664',
-        'eip155:43114/erc20:0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
-        'eip155:43114/erc20:0xc7198437980c041c805a1edcba50c1ce5db95118',
-        'eip155:324/erc20:0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4',
-        'eip155:324/erc20:0x3355df6d4c9c3035724fd0e3914de96a5a83aaf4',
-        'eip155:324/erc20:0x493257fd37edb34451f62edf8d2a0c418852ba4c',
-        'eip155:1329/erc20:0x3894085ef7ff0f0aedf52e2a2704928d1ec074f1',
-      ],
+      priceImpactThreshold: {
+        gasless: 0.2,
+        normal: 0.05,
+      },
       chains: {
         '1': {
-          stablecoins: [
-            '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-            '0xdac17f958d2ee523a2206206994597c13d831ec7',
-          ],
           topAssets: ['0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'],
           isActiveDest: true,
           isActiveSrc: true,
           isGaslessSwapEnabled: true,
           isSingleSwapBridgeButtonEnabled: true,
           noFeeAssets: [],
+          stablecoins: [
+            '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+            '0xdac17f958d2ee523a2206206994597c13d831ec7',
+          ],
         },
         '10': {
           stablecoins: [
@@ -361,6 +323,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
           isGaslessSwapEnabled: true,
         },
         '137': {
+          isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
           stablecoins: [
             '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359',
@@ -368,14 +331,14 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
             '0xc2132d05d31c914a87c6611c10748aeb04b58e8f',
           ],
           isActiveDest: true,
-          isActiveSrc: true,
         },
         '143': {
-          isSingleSwapBridgeButtonEnabled: true,
           isActiveDest: true,
           isActiveSrc: true,
+          isSingleSwapBridgeButtonEnabled: true,
         },
         '324': {
+          isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
           stablecoins: [
             '0x1d17CBcF0D6D143135aE902365D2E5e2A16538D4',
@@ -383,7 +346,12 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
             '0x493257fD37EDB34451f62EDf8D2a0C418852bA4C',
           ],
           isActiveDest: true,
+        },
+        '999': {
+          stablecoins: ['0xb88339CB7199b77E23DB6E890353E22632Ba630f'],
+          isActiveDest: true,
           isActiveSrc: true,
+          isSingleSwapBridgeButtonEnabled: true,
         },
         '1329': {
           stablecoins: ['0x3894085Ef7Ff0f0aeDf52E2A2704928d1Ec074F1'],
@@ -391,15 +359,20 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
           isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
         },
+        '4326': {
+          isSingleSwapBridgeButtonEnabled: true,
+          stablecoins: ['0xB8CE59FC3717ada4C02eaDF9682A9e934F625ebb'],
+          isActiveDest: true,
+          isActiveSrc: true,
+        },
         '8453': {
+          stablecoins: ['0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'],
           isActiveDest: true,
           isActiveSrc: true,
           isGaslessSwapEnabled: true,
           isSingleSwapBridgeButtonEnabled: true,
-          stablecoins: ['0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'],
         },
         '42161': {
-          isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
           stablecoins: [
             '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
@@ -407,21 +380,20 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
             '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9',
           ],
           isActiveDest: true,
+          isActiveSrc: true,
         },
         '43114': {
-          isActiveDest: true,
-          isActiveSrc: true,
-          isSingleSwapBridgeButtonEnabled: true,
           stablecoins: [
             '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
             '0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664',
             '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
             '0xc7198437980c041c805a1edcba50c1ce5db95118',
           ],
+          isActiveDest: true,
+          isActiveSrc: true,
+          isSingleSwapBridgeButtonEnabled: true,
         },
         '59144': {
-          isSingleSwapBridgeButtonEnabled: true,
-          noFeeAssets: [],
           stablecoins: [
             '0x176211869cA2b568f2A7D4EE941E073a821EE1ff',
             '0xA219439258ca9da29E9Cc4cE5596924745e12B93',
@@ -430,16 +402,15 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
           isActiveDest: true,
           isActiveSrc: true,
           isGaslessSwapEnabled: true,
+          isSingleSwapBridgeButtonEnabled: true,
+          noFeeAssets: [],
         },
         '728126428': {
+          isActiveDest: true,
           isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
-          isActiveDest: true,
         },
         '1151111081099710': {
-          isSingleSwapBridgeButtonEnabled: true,
-          isSnapConfirmationEnabled: true,
-          refreshRate: 10000,
           topAssets: [
             'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
             '6p6xgHyF7AeE6TZkSmFsko444wqoP15icUSqi2jfGiPN',
@@ -454,15 +425,118 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
           ],
           isActiveDest: true,
           isActiveSrc: true,
+          isSingleSwapBridgeButtonEnabled: true,
+          isSnapConfirmationEnabled: true,
+          refreshRate: 10000,
         },
         '20000000000001': {
+          isActiveSrc: true,
           isSingleSwapBridgeButtonEnabled: true,
           isActiveDest: true,
-          isActiveSrc: true,
         },
       },
-      minimumVersion: '0.0.0',
+      sse: {
+        enabled: true,
+        minimumVersion: '13.9.0',
+      },
+      support: true,
+      stablecoins: [
+        'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+        'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7',
+        'eip155:59144/erc20:0x176211869ca2b568f2a7d4ee941e073a821ee1ff',
+        'eip155:59144/erc20:0xa219439258ca9da29e9cc4ce5596924745e12b93',
+        'eip155:137/erc20:0x3c499c542cef5e3811e1192ce70d8cc03d5c3359',
+        'eip155:137/erc20:0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
+        'eip155:137/erc20:0xc2132d05d31c914a87c6611c10748aeb04b58e8f',
+        'eip155:42161/erc20:0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+        'eip155:42161/erc20:0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
+        'eip155:42161/erc20:0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+        'eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+        'eip155:10/erc20:0x0b2c639c533813f4aa9d7837caf62653d097ff85',
+        'eip155:10/erc20:0x7f5c764cbc14f9669b88837ca1490cca17c31607',
+        'eip155:10/erc20:0x94b008aa00579c1307b0ef2c499ad98a8ce58e58',
+        'eip155:56/erc20:0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
+        'eip155:56/erc20:0x55d398326f99059ff775485246999027b3197955',
+        'eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
+        'eip155:43114/erc20:0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664',
+        'eip155:43114/erc20:0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+        'eip155:43114/erc20:0xc7198437980c041c805a1edcba50c1ce5db95118',
+        'eip155:324/erc20:0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4',
+        'eip155:324/erc20:0x3355df6d4c9c3035724fd0e3914de96a5a83aaf4',
+        'eip155:324/erc20:0x493257fd37edb34451f62edf8d2a0c418852ba4c',
+        'eip155:1329/erc20:0x3894085ef7ff0f0aedf52e2a2704928d1ec074f1',
+        'eip155:4326/erc20:0xb8ce59fc3717ada4c02eadf9682a9e934f625ebb',
+        'eip155:999/erc20:0xb88339cb7199b77e23db6e890353e22632ba630f',
+      ],
+      chainRanking: [
+        {
+          chainId: 'eip155:1',
+          name: 'Ethereum',
+        },
+        {
+          name: 'BNB Chain',
+          chainId: 'eip155:56',
+        },
+        {
+          chainId: 'bip122:000000000019d6689c085ae165831e93',
+          name: 'BTC',
+        },
+        {
+          name: 'Solana',
+          chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+        },
+        {
+          name: 'Tron',
+          chainId: 'tron:728126428',
+        },
+        {
+          name: 'Base',
+          chainId: 'eip155:8453',
+        },
+        {
+          name: 'Arbitrum',
+          chainId: 'eip155:42161',
+        },
+        {
+          chainId: 'eip155:59144',
+          name: 'Linea',
+        },
+        {
+          chainId: 'eip155:137',
+          name: 'Polygon',
+        },
+        {
+          name: 'Avalanche',
+          chainId: 'eip155:43114',
+        },
+        {
+          chainId: 'eip155:10',
+          name: 'Optimism',
+        },
+        {
+          chainId: 'eip155:143',
+          name: 'Monad',
+        },
+        {
+          chainId: 'eip155:1329',
+          name: 'Sei',
+        },
+        {
+          chainId: 'eip155:4326',
+          name: 'MegaETH',
+        },
+        {
+          chainId: 'eip155:999',
+          name: 'HyperEVM',
+        },
+        {
+          chainId: 'eip155:324',
+          name: 'zkSync Era',
+        },
+      ],
+      maxRefreshCount: 5,
       refreshRate: 30000,
+      minimumVersion: '0.0.0',
     },
     status: FeatureFlagStatus.Active,
   },
@@ -501,8 +575,331 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     type: FeatureFlagType.Remote,
     inProd: true,
     productionDefault: {
-      contracts: {},
-      supportedChains: [],
+      contracts: {
+        '0x531': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Sei Mainnet',
+            signature:
+              '0xde089fc9af662bc4b0f873e4dc79760f6c3539f6f1cf32d9bc46baccf86ebae070a9062436f29ee86d04cc55699b27579f657922a2292ec2f1c5170d587917401b',
+          },
+        ],
+        '0x64': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Gnosis',
+            signature:
+              '0xd0cfc2959c866e5218faf675f852e0c7021a454064e509d40256c5bec395e300381c19dcbec2e921b2f6d7d9a925a39dee8ea2e8dd8f595633b8dc333d91f1af1b',
+          },
+        ],
+        '0x138de': [
+          {
+            signature:
+              '0x2c2037ddedcdfb9b7d8ea7c546259eef371a86b0e3610192eb15ece0114c59d86134791cd9e9df4208bbbdc83776d80b30b1fea6bf1a05bb072575217492497a1b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Berachain',
+          },
+        ],
+        '0xaa37dc': [
+          {
+            signature:
+              '0xa60cab833af6a8aa2dcc80d5e12d9e1566edb6cdf51c38e7cf43d441dac561007f05643e73e6b00107e18dbf15de98aae14192306276e92d654f62bd7c3023241c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Optimism Sepolia',
+          },
+        ],
+        '0x88bb0': [
+          {
+            signature:
+              '0x23de8eb645a65b08721e5d2194063acead5f5f818474b7884ae767c7aaf9bb9b22233ab92684bc41087f8509e945d96083124ae1919a9357f2ae65267df4f0e21b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Hoodi Testnet',
+          },
+        ],
+        '0x61': [
+          {
+            name: 'BNB Testnet',
+            signature:
+              '0x80aaf42c70b0b9efdf26e38ced69fce70f6b4f5496e7e59888819c14fb16290301ad049299d99e3650fa1a616a87bb80eb52ae9f02ddd8b53dd6b983275d0eb61b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x14a34': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Base Sepolia',
+            signature:
+              '0xaed94ac035e745629423c547200eb2411fd7194d832a6b4cf459d3e3d34a6b62124e88640a0bf623146bdef63b0ce1c8797bd2a6c8357fab86c8be466744f55d1c',
+          },
+        ],
+        '0x138c5': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Berachain Testnet',
+            signature:
+              '0x66940bcb2c4b95ec2c1c1024fee1e3a8e51c8f072a52a9f0252a793604c8a6ba58ac3153d4dd041873d33eec349450c4a9acd51ddaed117bee448ed7a388208c1b',
+          },
+        ],
+        '0xa': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Optimism',
+            signature:
+              '0x60e12ffc04e098bd26a897ed2a974e4e255fc6db3b052fe3a2647372bfbac76f096bf5236510ddc217e12b802e08617cc27292d69ca51b0467ba91c6df74cd7b1c',
+          },
+        ],
+        '0xa5bf': [
+          {
+            signature:
+              '0x2413338e5c47c56853195d1870988d721ec502c78e54fe5b98468a401538b942237a2769461ffbfa8269936bf309243d5b0d69f7114938653469c4d8225715ee1c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Tempo Testnet',
+          },
+        ],
+        '0x66eee': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Arbitrum Sepolia',
+            signature:
+              '0x6fdb53ecf8f575b85ff9895277b1f8e11349970fbb42225fe41587a072bbcef43e8d54303c4e1aa38d44cae9ba2c8bf825e9e138176d6b09a729cd82a14356cf1b',
+          },
+        ],
+        '0xa4ba': [
+          {
+            name: 'Arbitrum Nova',
+            signature:
+              '0x818898e7f90f2f1f47dc7bec74dd683dfcc11efc7025d81f57644d366a3d9e442edb789731045ccb5ba89ee0d84bb517194bb9a097b152922bbd39ffd022ff421c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x2105': [
+          {
+            signature:
+              '0xbdddd2e925cf2cc7e148d3c11b02c917995fba8f3a3dc0b73c0059d029feca88014e723b8a32b2310a60c5b1cc17dfb3ae180b5a39f1d3264f985314b9168e0a1c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Base',
+          },
+        ],
+        '0x8f': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Monad',
+            signature:
+              '0x12d31e58c92cdc29dac8af0405883b3b0ee44156d7fdf5c3c2ffa4138f2461cc20e7f8625431dbd24bb784407d1a1d9bdb75b191a6cf127eac68b67d13bd11e41c',
+          },
+        ],
+        '0x27d8': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Chiado',
+            signature:
+              '0x0ff531d6afcc191c3b3bdffc1596d9ce8d1d52fa500ea2097c0823820a66f97963b88b646d4d4edbc0f781127d7985b87132d89c62c3cb4ad42848ce289645fa1b',
+          },
+        ],
+        '0x515': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Unichain Sepolia',
+            signature:
+              '0x64487330691a05700a2321ee1db4092adce9590e7aded6e489df024838ecec734c935d182f74883818cb7659d5c784163573afdf8221252fa68d960cbe1c312f1b',
+          },
+        ],
+        '0x3909': [
+          {
+            signature:
+              '0xc092cc0bcf804f95eb659d281c00586bc72018a242d66fefacdc33a990faf99478c368612277cbbf72aee4a10b7ace6d8666f2c8c4fece9daada40cb360190631b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Sonic Testnet',
+          },
+        ],
+        '0x279f': [
+          {
+            name: 'Monad Testnet',
+            signature:
+              '0x85ec60e9dbac6404b66803b5abace8517ce1325bb6391b7d1ff8ec4433bbe62f4363031873a11ed79364290e196a47830fc36346a9aaf2e44518c1101496983c1b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x1012': [
+          {
+            name: 'Citrea',
+            signature:
+              '0x6818c8c50d25e23dd3810758f3fc45d41c5444bec8fe0983660387414fab00366f6d8a0462b2e8985c16cdff5898d6bf9787e255b1a668d083728b448a5c3f641c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0xa4ec': [
+          {
+            name: 'Celo Mainnet',
+            signature:
+              '0x1421ea4d014170a4fc5d0559f267974f4aa095a6e6047b107eff1807afa425774775f796a52a90b767810eade3b5919087bb361651a7b8f4f9679f1f46adb60e1b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x1079': [
+          {
+            name: 'Tempo',
+            signature:
+              '0x810496170fb570d0d976c58273ad4a423252bac1f2e10c8a63adbbbfc4e79d2c5d894bae20c28e90a577338e68506138ac6dea142a1e80a31c0c2dd2999efa651b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0xa4b1': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Arbitrum One',
+            signature:
+              '0xc3be82057efec197d92b0cbb7cef9d50dba0345646524687a3ae7235a8fcb1706ba79f197d45fcf4c6cfb5808ef70258c5f6bb29b7e3553a4b9660692eb5e81d1b',
+          },
+        ],
+        '0x530': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Sei Testnet',
+            signature:
+              '0x91135fcd7bfb9e2456c227ff12905128c3854db36775278d47b96c3c669f730c4063e3a62d94884617769bbad2868f35d725cb3b611d9bd1231bceb5967724711c',
+          },
+        ],
+        '0x13fb': [
+          {
+            signature:
+              '0xf9e4aa35fc098468212352c2b9662022f9565bd713ca66e634c804f9820b5e0c266d710afba58aed00e5b7e24134dd9b52e2e331076de745137531a6d245a7521b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Citrea Testnet',
+          },
+        ],
+        '0xaa044c': [
+          {
+            name: 'Celo Sepolia',
+            signature:
+              '0x1590458cdfa10225e4fe734ed44deec95ac1887c877e63deb5ad35b41025c9ef2f33666cdd2c189b1999a78072ab9f8f122d93a52eaf12687fb2ff5b74d8de9f1c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x19': [
+          {
+            name: 'Cronos',
+            signature:
+              '0xa1856ef8c948b0a5204da687d53231848de2a585def9faac05c23c47412615dc476db943010164356b1d2ca8a8a66a8b0ae2d30c11b6b2aaf1cca116f0a333761c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x18c6': [
+          {
+            name: 'MegaEth Testnet',
+            signature:
+              '0x6743135a8dfc8f58133d827b4997bc5316c8eb92883d2704a30b1d8a7bf494ce226b523e5f85a681eb5de8349c9564e62d389876d0e5fe5cc06fb9412d9d1cb61b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x13882': [
+          {
+            name: 'Polygon Amoy Testnet',
+            signature:
+              '0x472bb78ebb6686ddf0bb2e75265e1f4266cd050f8b498e88f97e9380afd8bfbd169c4d3221ec8845cb81ba7e9ddb7de9b819a15617803e20aee2aaa07664b6c81b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x92': [
+          {
+            name: 'Sonic Mainnet',
+            signature:
+              '0x9f2a94332f2b71bff8a772053f47dbb65e26e5286341be0a3c55270d5549351f1dddb7566be0619b0150d42d540b0847cb0acbd0ab118ff608a40a18400834711b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+        '0x152': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Cronos Testnet',
+            signature:
+              '0x8fec0190a311f6ba5dc9df8d76fef3673e6c4081c087f779bca7e3247bb40a5070d393d29c6b268deb3fa231a138b7914b25395cd6dec0fdf4b2b7701975e78b1c',
+          },
+        ],
+        '0xaa36a7': [
+          {
+            signature:
+              '0x1aba1c0dafadab6663efdd6086764a9b9fa5ab5c002e88ebae85edea162fbc425c398b2b93afdc036503f12361c05a7ff0b409ee523d5277e0b4d0a840679e591c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Sepolia - Official',
+          },
+          {
+            address: '0xCd8D6C5554e209Fbb0deC797C6293cf7eAE13454',
+            name: 'Sepolia - Testing',
+            signature:
+              '0x016cf109489c415ba28e695eb3cb06ac46689c5c49e2aba101d7ec2f68c890282563b324f5c8df5e0536994451825aa235438b7346e8c18b4e64161d990781891c',
+          },
+        ],
+        '0x1': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Mainnet',
+            signature:
+              '0xffb37facfedf12f1e98b56203de1c855391b791a20ee361234c546f4b50eb11853283cfc311419049f0325ad0a806ec232cc519073e3b5d4ad59ff331964d2e71b',
+          },
+        ],
+        '0x89': [
+          {
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Polygon',
+            signature:
+              '0x302aa2d59940e88f35d2fa140fe6a1e9dc682218a444a7fb2d88f007fbe7792b2b8d615f5ae1e4f184533a02c47d8ac0f6ba3f591679295dff93c65095c0f03d1b',
+          },
+        ],
+        '0x82': [
+          {
+            signature:
+              '0x54c423b1af4abbd1fb226e260dddba757acbcd8881e6b55b842c6b839874fa3f0e2f77685389ad5c28e096f12ef22557cebf6a77f6064baa071453a445a4c7d51c',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+            name: 'Unichain Mainnet',
+          },
+        ],
+        '0x38': [
+          {
+            name: 'BNB',
+            signature:
+              '0x28ae371904b3ba71344e426c8de0e2cee0b8529a9510c059b412671655881ad646b8cf544342a5f8e0753eda83221e14e3c9dae5435417401f5fee8ee1d63dce1b',
+            address: '0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B',
+          },
+        ],
+      },
+      supportedChains: [
+        '0x1',
+        '0x1012',
+        '0x1079',
+        '0x13882',
+        '0x138c5',
+        '0x138de',
+        '0x13fb',
+        '0x14a34',
+        '0x152',
+        '0x18c6',
+        '0x19',
+        '0x2105',
+        '0x279f',
+        '0x27d8',
+        '0x38',
+        '0x3909',
+        '0x515',
+        '0x530',
+        '0x531',
+        '0x61',
+        '0x64',
+        '0x66eee',
+        '0x82',
+        '0x88bb0',
+        '0x89',
+        '0x8f',
+        '0x92',
+        '0xa',
+        '0xa4b1',
+        '0xa4ba',
+        '0xa4ec',
+        '0xa5bf',
+        '0xaa044c',
+        '0xaa36a7',
+        '0xaa37dc',
+      ],
     },
     status: FeatureFlagStatus.Active,
   },
@@ -532,7 +929,9 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     name: 'confirmations_incoming_transactions',
     type: FeatureFlagType.Remote,
     inProd: true,
-    productionDefault: {},
+    productionDefault: {
+      useBackendWebSocketService: true,
+    },
     status: FeatureFlagStatus.Active,
   },
 
@@ -544,14 +943,963 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     // Contains acceleratedPolling per-chain configs, batchSizeLimit, etc.
     // Storing simplified version; full value has ~100 chain entries.
     productionDefault: {
+      gasFeeRandomisation: {
+        randomisedGasFeeDigits: {
+          '0x2105': 5,
+        },
+      },
       acceleratedPolling: {
+        perChainConfig: {
+          '0xe49b1': {
+            name: 'LOGX',
+            blockTime: 250,
+            chainId: '936369',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x32': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'XDC',
+            blockTime: 2000,
+            chainId: '50',
+          },
+          '0xe4': {
+            blockTime: 250,
+            chainId: '228',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'MIND',
+          },
+          '0x6f0': {
+            intervalMs: 500,
+            name: 'INJECTIVE',
+            blockTime: 667,
+            chainId: '1776',
+            countMax: 15,
+          },
+          '0x1331': {
+            name: 'API3',
+            blockTime: 250,
+            chainId: '4913',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x7c5': {
+            intervalMs: 500,
+            name: 'LYDIA',
+            blockTime: 250,
+            chainId: '1989',
+            countMax: 15,
+          },
+          '0x28c61': {
+            intervalMs: 700,
+            name: 'TAIKO_HEKLA',
+            blockTime: 1000,
+            chainId: '167009',
+            countMax: 10,
+          },
+          '0x18c6': {
+            countMax: 10,
+            intervalMs: 700,
+            name: 'MEGAETH_TESTNET',
+            blockTime: 1000,
+            chainId: '6342',
+          },
+          '0x531': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'SEI',
+            blockTime: 667,
+            chainId: '1329',
+          },
+          '0xe705': {
+            blockTime: 2000,
+            chainId: '59141',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'LINEA_SEPOLIA',
+          },
+          '0xfee': {
+            intervalMs: 500,
+            name: 'COMETH',
+            blockTime: 250,
+            chainId: '4078',
+            countMax: 15,
+          },
+          '0xbde31': {
+            chainId: '777777',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'WINR',
+            blockTime: 250,
+          },
+          '0x8173': {
+            blockTime: 250,
+            chainId: '33139',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'APECHAIN',
+          },
+          '0xaa36a7': {
+            blockTime: 12000,
+            chainId: '11155111',
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'ETHEREUM_SEPOLIA',
+          },
+          '0x13e31': {
+            blockTime: 2000,
+            chainId: '81457',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'BLAST',
+          },
+          '0x659': {
+            blockTime: 250,
+            chainId: '1625',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'GRAVITY',
+          },
+          '0xfa': {
+            intervalMs: 2700,
+            name: 'FANTOM',
+            blockTime: 4000,
+            chainId: '250',
+            countMax: 10,
+          },
+          '0x11c3': {
+            blockTime: 250,
+            chainId: '4547',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'TRUMPCHAIN',
+          },
+          '0xf4290': {
+            name: 'SCOREKOUNT',
+            blockTime: 250,
+            chainId: '1000080',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0xfc': {
+            chainId: '252',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'FRAXTAL',
+            blockTime: 2000,
+          },
+          '0x64': {
+            name: 'GNOSIS',
+            blockTime: 5000,
+            chainId: '100',
+            countMax: 10,
+            intervalMs: 3000,
+          },
+          '0x88bb0': {
+            intervalMs: 3000,
+            name: 'HOODI',
+            blockTime: 12000,
+            chainId: '560048',
+            countMax: 10,
+          },
+          '0x144': {
+            name: 'ZKSYNC',
+            blockTime: 1000,
+            chainId: '324',
+            countMax: 10,
+            intervalMs: 700,
+          },
+          '0x725': {
+            chainId: '1829',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'PLAYBLOCK',
+            blockTime: 250,
+          },
+          '0x1042': {
+            chainId: '4162',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'SX_ROLLUP',
+            blockTime: 250,
+          },
+          '0x13a': {
+            blockTime: 12000,
+            chainId: '314',
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'FILECOIN',
+          },
+          '0x2272': {
+            chainId: '8818',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'CLINK',
+            blockTime: 250,
+          },
+          '0x10e6': {
+            name: 'MEGAETH_MAINNET',
+            blockTime: 1000,
+            chainId: '4326',
+            countMax: 10,
+            intervalMs: 700,
+          },
+          '0x1ecf': {
+            intervalMs: 500,
+            name: 'KINTO',
+            blockTime: 250,
+            chainId: '7887',
+            countMax: 15,
+          },
+          '0xb1c9': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'BLESSNET',
+            blockTime: 250,
+            chainId: '45513',
+          },
+          '0x8279': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'SLINGSHOTDAO',
+            blockTime: 250,
+            chainId: '33401',
+          },
+          '0xa6': {
+            chainId: '166',
+            countMax: 10,
+            intervalMs: 900,
+            name: 'OMNI',
+            blockTime: 1333,
+          },
+          '0x82750': {
+            blockTime: 1000,
+            chainId: '534352',
+            countMax: 10,
+            intervalMs: 700,
+            name: 'SCROLL',
+          },
+          '0xab5': {
+            countMax: 10,
+            intervalMs: 2700,
+            name: 'ABSTRACT',
+            blockTime: 4000,
+            chainId: '2741',
+          },
+          '0x9dd': {
+            name: 'INEVM',
+            blockTime: 250,
+            chainId: '2525',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x2a': {
+            name: 'LUKSO',
+            blockTime: 4000,
+            chainId: '42',
+            countMax: 10,
+            intervalMs: 2700,
+          },
+          '0xb5f': {
+            intervalMs: 500,
+            name: 'HYTOPIA',
+            blockTime: 250,
+            chainId: '2911',
+            countMax: 15,
+          },
+          '0x82': {
+            name: 'UNICHAIN',
+            blockTime: 2000,
+            chainId: '130',
+            countMax: 10,
+            intervalMs: 1300,
+          },
+          '0x16fd8': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'LUMITERRA',
+            blockTime: 250,
+            chainId: '94168',
+          },
+          '0x1b58': {
+            countMax: 10,
+            intervalMs: 2400,
+            name: 'ZETACHAIN',
+            blockTime: 3667,
+            chainId: '7000',
+          },
+          '0x46f': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'LISK',
+            blockTime: 2000,
+            chainId: '1135',
+          },
+          '0x14a34': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'BASE_SEPOLIA_TESTNET',
+            blockTime: 250,
+            chainId: '84532',
+          },
+          '0x1b254': {
+            intervalMs: 500,
+            name: 'REAL',
+            blockTime: 250,
+            chainId: '111188',
+            countMax: 15,
+          },
+          '0x76adf1': {
+            intervalMs: 1300,
+            name: 'ZORA',
+            blockTime: 2000,
+            chainId: '7777777',
+            countMax: 10,
+          },
+          '0xb67d2': {
+            chainId: '747474',
+            countMax: 10,
+            intervalMs: 700,
+            name: 'KATANA',
+            blockTime: 1000,
+          },
+          '0x515': {
+            chainId: '1301',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'UNICHAIN_SEPOLIA',
+            blockTime: 2000,
+          },
+          '0x1': {
+            name: 'ETHEREUM',
+            blockTime: 12000,
+            chainId: '1',
+            countMax: 10,
+            intervalMs: 3000,
+          },
+          '0xa1337': {
+            intervalMs: 500,
+            name: 'XAI',
+            blockTime: 250,
+            chainId: '660279',
+            countMax: 15,
+          },
+          '0x13882': {
+            chainId: '80002',
+            countMax: 10,
+            intervalMs: 1100,
+            name: 'POLYGON_AMOY',
+            blockTime: 1667,
+          },
+          '0x89': {
+            chainId: '137',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'POLYGON',
+            blockTime: 2000,
+          },
+          '0xa': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'OPTIMISM',
+            blockTime: 2000,
+            chainId: '10',
+          },
+          '0x13c23': {
+            name: 'FORTA',
+            blockTime: 250,
+            chainId: '80931',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0xc350': {
+            blockTime: 250,
+            chainId: '50000',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'CITRONUS',
+          },
+          '0xa4b1': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ARBITRUM_ONE',
+            blockTime: 250,
+            chainId: '42161',
+          },
+          '0xa33fc': {
+            name: 'CONWAI',
+            blockTime: 250,
+            chainId: '668668',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x343b': {
+            blockTime: 2000,
+            chainId: '13371',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'IMMUTABLE',
+          },
+          '0x171': {
+            intervalMs: 3000,
+            name: 'PULSECHAIN',
+            blockTime: 10000,
+            chainId: '369',
+            countMax: 10,
+          },
+          '0x16876': {
+            blockTime: 250,
+            chainId: '92278',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'MIRACLE',
+          },
+          '0x2ba': {
+            intervalMs: 1300,
+            name: 'MATCHAIN',
+            blockTime: 2000,
+            chainId: '698',
+            countMax: 10,
+          },
+          '0xe8': {
+            intervalMs: 3000,
+            name: 'LENS',
+            blockTime: 25333,
+            chainId: '232',
+            countMax: 10,
+          },
+          '0x13881': {
+            blockTime: 2000,
+            chainId: '80001',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'POLYGON_MUMBAI',
+          },
+          '0xa3c3': {
+            name: 'EDUCHAIN',
+            blockTime: 250,
+            chainId: '41923',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0xa0c71fd': {
+            blockTime: 2000,
+            chainId: '168587773',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'BLAST_SEPOLIA',
+          },
+          '0x1142d': {
+            chainId: '70701',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'PROOF_OF_PLAY_BOSS',
+            blockTime: 250,
+          },
+          '0x9c4400': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ALIENX',
+            blockTime: 250,
+            chainId: '10241024',
+          },
+          '0x15eb': {
+            name: 'OPBNB_TESTNET',
+            blockTime: 1000,
+            chainId: '5611',
+            countMax: 10,
+            intervalMs: 700,
+          },
+          '0x3bd': {
+            chainId: '957',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'LYRA',
+            blockTime: 2000,
+          },
+          '0xb9': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'MINT',
+            blockTime: 2000,
+            chainId: '185',
+          },
+          '0x42af': {
+            chainId: '17071',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ONCHAIN_POINTS',
+            blockTime: 250,
+          },
+          '0x15b43': {
+            chainId: '88899',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'UNITE',
+            blockTime: 250,
+          },
+          '0x128ca': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'FUSION',
+            blockTime: 250,
+            chainId: '75978',
+          },
+          '0xa867': {
+            chainId: '43111',
+            countMax: 10,
+            intervalMs: 800,
+            name: 'HEMI',
+            blockTime: 1200,
+          },
+          '0x13a43': {
+            name: 'GEO_GENESIS',
+            blockTime: 250,
+            chainId: '80451',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x9c4401': {
+            name: 'ALIENX_TESTNET',
+            blockTime: 250,
+            chainId: '10241025',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x2b2': {
+            blockTime: 2000,
+            chainId: '690',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'REDSTONE',
+          },
+          '0x15a9': {
+            intervalMs: 500,
+            name: 'DUCK',
+            blockTime: 250,
+            chainId: '5545',
+            countMax: 15,
+          },
+          '0x134b3cf': {
+            blockTime: 250,
+            chainId: '20231119',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'DERI',
+          },
+          '0x13bf8': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ONYX',
+            blockTime: 250,
+            chainId: '80888',
+          },
+          '0x2780b': {
+            blockTime: 250,
+            chainId: '161803',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'EVENTUM',
+          },
+          '0x1406f40': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'CORN',
+            blockTime: 250,
+            chainId: '21000000',
+          },
+          '0x99797f': {
+            blockTime: 250,
+            chainId: '10058111',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'SPOTLIGHT',
+          },
+          '0xaa37dc': {
+            intervalMs: 1300,
+            name: 'OPTIMISM_SEPOLIA',
+            blockTime: 2000,
+            chainId: '11155420',
+            countMax: 10,
+          },
+          '0x18232': {
+            blockTime: 667,
+            chainId: '98866',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'PLUME',
+          },
+          '0x279f': {
+            blockTime: 500,
+            chainId: '10143',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'MONAD_TESTNET',
+          },
+          '0x88b': {
+            blockTime: 250,
+            chainId: '2187',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'GAME7',
+          },
+          '0x28c58': {
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'TAIKO',
+            blockTime: 6000,
+            chainId: '167000',
+          },
+          '0x38': {
+            blockTime: 667,
+            chainId: '56',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'BNB',
+          },
+          '0xa86a': {
+            countMax: 10,
+            intervalMs: 700,
+            name: 'AVALANCHE',
+            blockTime: 1000,
+            chainId: '43114',
+          },
+          '0x813df': {
+            name: 'LAYER_K',
+            blockTime: 250,
+            chainId: '529375',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x3023': {
+            intervalMs: 500,
+            name: 'HUDDLE01',
+            blockTime: 250,
+            chainId: '12323',
+            countMax: 15,
+          },
+          '0x5d979': {
+            name: 'CHEESE',
+            blockTime: 250,
+            chainId: '383353',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x868b': {
+            intervalMs: 1300,
+            name: 'MODE',
+            blockTime: 2000,
+            chainId: '34443',
+            countMax: 10,
+          },
+          '0x163e7': {
+            blockTime: 250,
+            chainId: '91111',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'HENEZ',
+          },
+          '0x316b8': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'BLOCKFIT',
+            blockTime: 250,
+            chainId: '202424',
+          },
+          '0xa9': {
+            chainId: '169',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'MANTA',
+            blockTime: 2000,
+          },
+          '0x19': {
+            name: 'CRONOS',
+            blockTime: 667,
+            chainId: '25',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x2105': {
+            name: 'BASE',
+            blockTime: 2000,
+            chainId: '8453',
+            countMax: 10,
+            intervalMs: 1300,
+          },
+          '0x138de': {
+            chainId: '80094',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'BERACHAIN',
+            blockTime: 2000,
+          },
+          '0x2f0': {
+            name: 'RIVALZ',
+            blockTime: 250,
+            chainId: '752',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x123': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'ORDERLY',
+            blockTime: 2000,
+            chainId: '291',
+          },
+          '0x3e7': {
+            name: 'HYPEREVM',
+            blockTime: 1000,
+            chainId: '999',
+            countMax: 10,
+            intervalMs: 700,
+          },
+          '0xd0d0': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'DODO',
+            blockTime: 250,
+            chainId: '53456',
+          },
+          '0xd7cc': {
+            blockTime: 250,
+            chainId: '55244',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'SUPERPOSITION',
+          },
+          '0x27bc86aa': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'DEGEN_CHAIN',
+            blockTime: 250,
+            chainId: '666666666',
+          },
+          '0x52415249': {
+            intervalMs: 500,
+            name: 'RARIBLE',
+            blockTime: 250,
+            chainId: '1380012617',
+            countMax: 15,
+          },
+          '0x974': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'DOGELON',
+            blockTime: 250,
+            chainId: '2420',
+          },
+          '0xa4ba': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ARBITRUM_NOVA',
+            blockTime: 250,
+            chainId: '42170',
+          },
+          '0x62ef': {
+            chainId: '25327',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'EVERCLEAR',
+            blockTime: 250,
+          },
+          '0xa1ef': {
+            chainId: '41455',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'ALEPH_ZERO',
+            blockTime: 250,
+          },
+          '0x7ea': {
+            name: 'EDGELESS',
+            blockTime: 2000,
+            chainId: '2026',
+            countMax: 10,
+            intervalMs: 1300,
+          },
+          '0x74c': {
+            name: 'SONEIUM',
+            blockTime: 2000,
+            chainId: '1868',
+            countMax: 10,
+            intervalMs: 1300,
+          },
+          '0xe34': {
+            chainId: '3636',
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'BOTANIX_TESTNET',
+            blockTime: 6000,
+          },
+          '0xe35': {
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'BOTANIX',
+            blockTime: 5667,
+            chainId: '3637',
+          },
+          '0x7cc': {
+            name: 'SANKO',
+            blockTime: 250,
+            chainId: '1996',
+            countMax: 15,
+            intervalMs: 500,
+          },
+          '0x61': {
+            countMax: 10,
+            intervalMs: 700,
+            name: 'BNB_TESTNET',
+            blockTime: 1000,
+            chainId: '97',
+          },
+          '0x2eb': {
+            blockTime: 1000,
+            chainId: '747',
+            countMax: 10,
+            intervalMs: 700,
+            name: 'FLOW',
+          },
+          '0xcc': {
+            chainId: '204',
+            countMax: 10,
+            intervalMs: 700,
+            name: 'OPBNB',
+            blockTime: 1000,
+          },
+          '0x8f': {
+            chainId: '143',
+            countMax: 15,
+            intervalMs: 500,
+            name: 'MONAD',
+            blockTime: 500,
+          },
+          '0x34fb5e38': {
+            intervalMs: 1300,
+            name: 'ANXIENT8',
+            blockTime: 2000,
+            chainId: '888888888',
+            countMax: 10,
+          },
+          '0x6c1': {
+            intervalMs: 500,
+            name: 'REYA',
+            blockTime: 250,
+            chainId: '1729',
+            countMax: 15,
+          },
+          '0x1142c': {
+            intervalMs: 500,
+            name: 'PROOF_OF_PLAY_APEX',
+            blockTime: 250,
+            chainId: '70700',
+            countMax: 15,
+          },
+          '0x8274f': {
+            name: 'SCROLL_SEPOLIA',
+            blockTime: 3667,
+            chainId: '534351',
+            countMax: 10,
+            intervalMs: 2400,
+          },
+          '0x18c7': {
+            name: 'MEGAETH_TESTNET_V2',
+            blockTime: 1000,
+            chainId: '6343',
+            countMax: 10,
+            intervalMs: 700,
+          },
+          '0xe708': {
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'LINEA',
+            blockTime: 2000,
+            chainId: '59144',
+          },
+          '0x13f8': {
+            chainId: '5112',
+            countMax: 10,
+            intervalMs: 1300,
+            name: 'HAM',
+            blockTime: 2000,
+          },
+          '0x98967f': {
+            intervalMs: 500,
+            name: 'FLUENCE',
+            blockTime: 250,
+            chainId: '9999999',
+            countMax: 15,
+          },
+          '0x142b6': {
+            intervalMs: 500,
+            name: 'VEMP',
+            blockTime: 250,
+            chainId: '82614',
+            countMax: 15,
+          },
+          '0x4268': {
+            chainId: '17000',
+            countMax: 10,
+            intervalMs: 3000,
+            name: 'ETHEREUM_HOLESKY',
+            blockTime: 12000,
+          },
+          '0x2611': {
+            blockTime: 1000,
+            chainId: '9745',
+            countMax: 10,
+            intervalMs: 700,
+            name: 'PLASMA',
+          },
+          '0xca74': {
+            countMax: 15,
+            intervalMs: 500,
+            name: 'CHAINBOUNTY',
+            blockTime: 250,
+            chainId: '51828',
+          },
+          '0x1713c': {
+            intervalMs: 500,
+            name: 'IDEX',
+            blockTime: 250,
+            chainId: '94524',
+            countMax: 15,
+          },
+          '0x1388': {
+            intervalMs: 1300,
+            name: 'MANTLE',
+            blockTime: 2000,
+            chainId: '5000',
+            countMax: 10,
+          },
+          '0x1b59': {
+            intervalMs: 2000,
+            name: 'ZETACHAIN_TESTNET',
+            blockTime: 3000,
+            chainId: '7001',
+            countMax: 10,
+          },
+          '0x34a1': {
+            name: 'IMMUTABLE_TESTNET',
+            blockTime: 2000,
+            chainId: '13473',
+            countMax: 10,
+            intervalMs: 1300,
+          },
+        },
         defaultCountMax: 10,
         defaultIntervalMs: 3000,
-        perChainConfig: {},
       },
       batchSizeLimit: 10,
-      gasEstimateFallback: { perChainConfig: {} },
-      gasFeeRandomisation: { randomisedGasFeeDigits: {} },
+      gasEstimateFallback: {
+        perChainConfig: {
+          '0x279f': {
+            fixed: 1000000,
+          },
+        },
+      },
     },
     status: FeatureFlagStatus.Active,
   },
@@ -560,56 +1908,63 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     type: FeatureFlagType.Remote,
     inProd: true,
     productionDefault: {
-      default: {
-        expectedDeadline: 45,
+      '0xa86a': {
         extensionActive: false,
-        extensionReturnTxHashAsap: true,
-        extensionReturnTxHashAsapBatch: true,
-        extensionSkipSmartTransactionStatusPage: false,
-        maxDeadline: 150,
-        batchStatusPollingInterval: 1000,
+        sentinelUrl: 'https://tx-sentinel-avalanche-mainnet.api.cx.metamask.io',
       },
-      '0x1': {
-        expectedDeadline: 45,
+      '0x2105': {
         extensionActive: true,
-        maxDeadline: 160,
-        sentinelUrl: 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io',
+        gaslessBridgeWith7702Enabled: true,
+        sentinelUrl: 'https://tx-sentinel-base-mainnet.api.cx.metamask.io',
       },
-      '0x89': {
-        extensionActive: false,
-        sentinelUrl: 'https://tx-sentinel-polygon-mainnet.api.cx.metamask.io',
+      '0xe708': {
+        sentinelUrl: 'https://tx-sentinel-linea-mainnet.api.cx.metamask.io',
+        extensionActive: true,
+        gaslessBridgeWith7702Enabled: false,
       },
-      '0xa4b1': {
+      '0x89': {
         extensionActive: true,
-        sentinelUrl: 'https://tx-sentinel-arbitrum-mainnet.api.cx.metamask.io',
+        gaslessBridgeWith7702Enabled: true,
+        sentinelUrl: 'https://tx-sentinel-polygon-mainnet.api.cx.metamask.io',
       },
-      '0x38': {
+      '0x1': {
+        maxDeadline: 160,
+        sentinelUrl: 'https://tx-sentinel-ethereum-mainnet.api.cx.metamask.io',
+        expectedDeadline: 45,
         extensionActive: true,
-        sentinelUrl: 'https://tx-sentinel-bsc-mainnet.api.cx.metamask.io',
+        gaslessBridgeWith7702Enabled: false,
       },
-      '0x2105': {
+      '0xa4b1': {
+        gaslessBridgeWith7702Enabled: true,
+        sentinelUrl: 'https://tx-sentinel-arbitrum-mainnet.api.cx.metamask.io',
         extensionActive: true,
-        sentinelUrl: 'https://tx-sentinel-base-mainnet.api.cx.metamask.io',
       },
-      '0xa': {
+      default: {
+        maxDeadline: 150,
+        batchStatusPollingInterval: 1000,
+        expectedDeadline: 45,
         extensionActive: false,
-        sentinelUrl: 'https://tx-sentinel-optimism-mainnet.api.cx.metamask.io',
-      },
-      '0xe708': {
-        extensionActive: true,
-        sentinelUrl: 'https://tx-sentinel-linea-mainnet.api.cx.metamask.io',
+        extensionReturnTxHashAsap: true,
+        extensionReturnTxHashAsapBatch: true,
+        extensionSkipSmartTransactionStatusPage: false,
+        gaslessBridgeWith7702Enabled: false,
       },
       '0x531': {
-        extensionActive: false,
         sentinelUrl: 'https://tx-sentinel-sei-mainnet.api.cx.metamask.io',
-      },
-      '0xa86a': {
         extensionActive: false,
-        sentinelUrl: 'https://tx-sentinel-avalanche-mainnet.api.cx.metamask.io',
       },
       '0x144': {
-        extensionActive: false,
         sentinelUrl: 'https://tx-sentinel-zksync-mainnet.api.cx.metamask.io',
+        extensionActive: false,
+      },
+      '0xa': {
+        extensionActive: false,
+        sentinelUrl: 'https://tx-sentinel-optimism-mainnet.api.cx.metamask.io',
+      },
+      '0x38': {
+        extensionActive: true,
+        gaslessBridgeWith7702Enabled: false,
+        sentinelUrl: 'https://tx-sentinel-bsc-mainnet.api.cx.metamask.io',
       },
       '0x8f': {
         extensionActive: false,
@@ -661,17 +2016,13 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
         name: 'feature is ON',
         scope: {
           type: 'threshold',
-          value: 0,
+          value: 1,
         },
-        value: { maxAccounts: 0, maxNetworks: 0, enabled: 1 },
-      },
-      {
-        scope: {
-          type: 'threshold',
-          value: { maxAccounts: 0, maxNetworks: 0, enabled: 0 },
+        value: {
+          maxAccounts: 99999,
+          maxNetworks: 99999,
+          enabled: 1,
         },
-        value: { maxAccounts: 0, maxNetworks: 0 },
-        name: 'feature is OFF',
       },
     ],
     status: FeatureFlagStatus.Active,
@@ -725,8 +2076,11 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
   extensionUxDefaultAddressVersioned: {
     name: 'extensionUxDefaultAddressVersioned',
     type: FeatureFlagType.Remote,
-    inProd: false,
-    productionDefault: false,
+    inProd: true,
+    productionDefault: {
+      enabled: false,
+      minimumVersion: '0.0.0',
+    },
     status: FeatureFlagStatus.Active,
   },
 
@@ -743,8 +2097,9 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     type: FeatureFlagType.Remote,
     inProd: true,
     productionDefault: {
+      asterdex: true,
+      gmx: true,
       hyperliquid: true,
-      gmx: false,
     },
     status: FeatureFlagStatus.Active,
   },
@@ -792,7 +2147,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     productionDefault: {
       '0x38': false,
       '0x531': false,
-      '0x8f': false,
+      '0x8f': true,
     },
     status: FeatureFlagStatus.Active,
   },
@@ -863,8 +2218,8 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
   rwaTokensEnabled: {
     name: 'rwaTokensEnabled',
     type: FeatureFlagType.Remote,
-    inProd: false,
-    productionDefault: false,
+    inProd: true,
+    productionDefault: true,
     status: FeatureFlagStatus.Active,
   },
 
@@ -874,6 +2229,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
     inProd: true,
     productionDefault: [
       'https://aerodrome.finance',
+      'https://www.aerodrome.finance',
       'https://app.bio.xyz',
       'https://app.ethena.fi',
       'https://app.euler.finance',
@@ -890,6 +2246,7 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
       'https://fluid.io',
       'https://flyingtulip.com',
       'https://jumper.exchange',
+      'https://jumper.xyz',
       'https://linea.build',
       'https://pancakeswap.finance',
       'https://privacypools.com',
@@ -909,9 +2266,187 @@ export const FEATURE_FLAG_REGISTRY: Record<string, FeatureFlagRegistryEntry> = {
       'https://yearn.fi',
       'https://app.teller.org',
       'https://kalshi.com',
+      'https://app.carbondefi.xyz',
+      'https://celo.carbondefi.xyz',
+      'https://sei.carbondefi.xyz',
+      'https://matcha.xyz',
+      'https://app.trysweep.finance',
     ],
     status: FeatureFlagStatus.Active,
   },
+  complianceEnabled: {
+    name: 'complianceEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: false,
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  confirmations_pay: {
+    name: 'confirmations_pay',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      name: 'empty',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  confirmations_pay_dapps: {
+    name: 'confirmations_pay_dapps',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: false,
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMerklCampaignClaiming: {
+    name: 'earnMerklCampaignClaiming',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: true,
+      minimumVersion: '13.24.0',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionAssetOverviewCtaEnabled: {
+    name: 'earnMusdConversionAssetOverviewCtaEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: true,
+      minimumVersion: '13.24.0',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionCtaTokens: {
+    name: 'earnMusdConversionCtaTokens',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      '0x1': ['USDC', 'USDT', 'DAI'],
+      '0xe708': ['USDC', 'USDT', 'DAI'],
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionFlowEnabled: {
+    name: 'earnMusdConversionFlowEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: true,
+      minimumVersion: '13.24.0',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionGeoBlockedCountries: {
+    name: 'earnMusdConversionGeoBlockedCountries',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      blockedRegions: ['GB'],
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionMinAssetBalanceRequired: {
+    name: 'earnMusdConversionMinAssetBalanceRequired',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: 0.01,
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConversionTokenListItemCtaEnabled: {
+    name: 'earnMusdConversionTokenListItemCtaEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: true,
+      minimumVersion: '13.24.0',
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConvertibleTokensAllowlist: {
+    name: 'earnMusdConvertibleTokensAllowlist',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      '0x1': ['USDC', 'USDT', 'DAI'],
+      '0xe708': ['USDC', 'USDT', 'DAI'],
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdConvertibleTokensBlocklist: {
+    name: 'earnMusdConvertibleTokensBlocklist',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {},
+    status: FeatureFlagStatus.Active,
+  },
+
+  earnMusdCtaEnabled: {
+    name: 'earnMusdCtaEnabled',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      minimumVersion: '13.24.0',
+      enabled: true,
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  perpsPerpTradingGeoBlockedCountriesV2: {
+    name: 'perpsPerpTradingGeoBlockedCountriesV2',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      blockedRegions: ['BE', 'US', 'CA-ON', 'GB'],
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  settingsRedesign: {
+    name: 'settingsRedesign',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: false,
+    status: FeatureFlagStatus.Active,
+  },
+
+  tempoConfig: {
+    name: 'tempoConfig',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      enabled: false,
+    },
+    status: FeatureFlagStatus.Active,
+  },
+
+  stellarAccounts: {
+    name: 'stellarAccounts',
+    type: FeatureFlagType.Remote,
+    inProd: true,
+    productionDefault: {
+      minimumVersion: '0.0.1',
+      enabled: false,
+    },
+    status: FeatureFlagStatus.Active,
+  },
 };
 
 // ============================================================================
diff --git a/test/e2e/fixtures/default-fixture.js b/test/e2e/fixtures/default-fixture.js
index 66b448de8ab9..0c5cfedde442 100644
--- a/test/e2e/fixtures/default-fixture.js
+++ b/test/e2e/fixtures/default-fixture.js
@@ -258,7 +258,6 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           avatarType: 'maskicon',
         },
         theme: 'light',
-        useBlockie: false,
         useNftDetection: false,
         usePhishDetect: true,
         useTokenDetection: false,
diff --git a/test/e2e/fixtures/default-fixture.json b/test/e2e/fixtures/default-fixture.json
index 1fb929bf4ea0..b9e6cf75ca0e 100644
--- a/test/e2e/fixtures/default-fixture.json
+++ b/test/e2e/fixtures/default-fixture.json
@@ -39,7 +39,7 @@
         },
         "0x89": {
           "0x5CfE73b6021E818B776b421B1c4Db2474086a7e1": {
-            "balance": "0x0"
+            "balance": "0x15af1d78b58c40000"
           }
         },
         "0xa": {
@@ -72,7 +72,8 @@
     "AccountTreeController": {
       "accountGroupsMetadata": {},
       "accountWalletsMetadata": {},
-      "hasAccountTreeSyncingSyncedAtLeastOnce": true
+      "hasAccountTreeSyncingSyncedAtLeastOnce": true,
+      "selectedAccountGroup": "entropy:01KMMTZZ3ZEF3008S2RXXR2CXS/0"
     },
     "AccountsController": {
       "internalAccounts": {
@@ -170,7 +171,7 @@
       "announcements": {}
     },
     "AppMetadataController": {
-      "currentMigrationVersion": 200,
+      "currentMigrationVersion": 202,
       "firstTimeInfo": {},
       "previousAppVersion": "",
       "previousMigrationVersion": 0
@@ -918,7 +919,6 @@
       "theme": "os",
       "use4ByteResolution": true,
       "useAddressBarEnsResolution": true,
-      "useBlockie": false,
       "useCurrencyRateCheck": true,
       "useExternalNameSources": true,
       "useExternalServices": true,
@@ -1072,6 +1072,6 @@
   },
   "meta": {
     "storageKind": "split",
-    "version": 200
+    "version": 202
   }
 }
diff --git a/test/e2e/fixtures/fixture-builder-v2.ts b/test/e2e/fixtures/fixture-builder-v2.ts
index 692f75d7c78c..6c1d4ece280a 100644
--- a/test/e2e/fixtures/fixture-builder-v2.ts
+++ b/test/e2e/fixtures/fixture-builder-v2.ts
@@ -5,7 +5,9 @@ import type { AccountsControllerState } from '@metamask/accounts-controller';
 import type { AddressBookControllerState } from '@metamask/address-book-controller';
 import type {
   CurrencyRateState,
+  MultichainAssetsRatesControllerState,
   NftControllerState,
+  RatesControllerState,
   TokenBalancesControllerState,
   TokenListMap,
   TokenListState,
@@ -103,6 +105,18 @@ type FixtureBuildResult = FixtureType & {
   storageServiceData?: Record<string, unknown>;
 };
 
+/**
+ * Like `Partial<MultichainAssetsRatesControllerState>`, but `conversionRates` may be a
+ * partial map (lodash `merge` fills the rest).
+ */
+type MultichainAssetsRatesControllerFixturePatch = Partial<
+  Omit<MultichainAssetsRatesControllerState, 'conversionRates'>
+> & {
+  conversionRates?: Partial<
+    MultichainAssetsRatesControllerState['conversionRates']
+  >;
+};
+
 class FixtureBuilderV2 {
   fixture: FixtureType;
 
@@ -157,6 +171,18 @@ class FixtureBuilderV2 {
     return this;
   }
 
+  withMultichainAssetsRatesController(
+    data: MultichainAssetsRatesControllerFixturePatch,
+  ): this {
+    merge(this.fixture.data.MultichainAssetsRatesController, data);
+    return this;
+  }
+
+  withMultichainRatesController(data: Partial<RatesControllerState>): this {
+    merge(this.fixture.data.MultichainRatesController, data);
+    return this;
+  }
+
   withNameController(data: Partial<NameControllerState>): this {
     merge(this.fixture.data.NameController, data);
     return this;
@@ -270,6 +296,22 @@ class FixtureBuilderV2 {
     });
   }
 
+  withConversionRates(
+    conversionRates: Partial<
+      MultichainAssetsRatesControllerState['conversionRates']
+    > = {},
+  ): this {
+    return this.withMultichainAssetsRatesController({ conversionRates });
+  }
+
+  withCurrencyRates(
+    currencyRates: CurrencyRateState['currencyRates'] = {},
+  ): this {
+    return this.withCurrencyController({
+      currencyRates: { ...currencyRates },
+    });
+  }
+
   withEnabledNetworks(
     data: NetworkEnablementControllerState['enabledNetworkMap'],
   ): this {
diff --git a/test/e2e/fixtures/fixture-builder.js b/test/e2e/fixtures/fixture-builder.js
index 52f7900788b0..9423a4f5a5c7 100644
--- a/test/e2e/fixtures/fixture-builder.js
+++ b/test/e2e/fixtures/fixture-builder.js
@@ -1069,6 +1069,7 @@ class FixtureBuilder {
                   pinned: false,
                   hidden: false,
                   entropy: { groupIndex: 0 },
+                  lastSelected: 0,
                 },
               },
             },
@@ -1103,6 +1104,7 @@ class FixtureBuilder {
               name: `${keyringType} Account 1`,
               pinned: false,
               hidden: false,
+              lastSelected: 0,
             },
           };
         }
@@ -1132,6 +1134,7 @@ class FixtureBuilder {
               name: `${account?.metadata?.snap?.name || 'Snap Account'} 1`,
               pinned: false,
               hidden: false,
+              lastSelected: 0,
             },
           };
         }
@@ -1165,8 +1168,10 @@ class FixtureBuilder {
 
     this.fixture.data.AccountTreeController ??= {};
 
+    const { selectedAccountGroup, wallets } = buildDefaultAccountTree();
     const defaultState = {
-      accountTree: buildDefaultAccountTree(),
+      selectedAccountGroup,
+      accountTree: { wallets },
       accountGroupsMetadata: {},
       accountWalletsMetadata: {},
     };
diff --git a/test/e2e/fixtures/fixture-validation.ts b/test/e2e/fixtures/fixture-validation.ts
index 88e3282fc54b..82b360aee98f 100644
--- a/test/e2e/fixtures/fixture-validation.ts
+++ b/test/e2e/fixtures/fixture-validation.ts
@@ -42,7 +42,7 @@ const getFixtureIgnoredKeys = (): string[] => [
   'data.SnapController.snaps',
   'data.SnapController.snapStates',
   'data.SnapController.unencryptedSnapStates',
-  'data.SnapsRegistry',
+  'data.SnapRegistryController',
   // Subject Metadata
   'data.SubjectMetadataController.subjectMetadata',
   // Locale-related keys
@@ -69,6 +69,7 @@ const getFixtureIgnoredKeys = (): string[] => [
   'data.RemoteFeatureFlagController.thresholdCache',
   'data.RemoteFeatureFlagController.rawRemoteFeatureFlags',
   // Entire objects/controllers ignored (dynamic or impractical to validate)
+  'data.AccountTreeController.selectedAccountGroup', // Entropy source is random and non-deterministic, and the selected group can change on each run.
   'data.AccountsController.internalAccounts.accounts',
   'data.AuthenticationController',
   'data.MetaMetricsController',
diff --git a/test/e2e/fixtures/onboarding-fixture.json b/test/e2e/fixtures/onboarding-fixture.json
index c5dc26eb83c9..4e5c53b7409d 100644
--- a/test/e2e/fixtures/onboarding-fixture.json
+++ b/test/e2e/fixtures/onboarding-fixture.json
@@ -12,7 +12,8 @@
     "AccountTreeController": {
       "accountGroupsMetadata": {},
       "accountWalletsMetadata": {},
-      "hasAccountTreeSyncingSyncedAtLeastOnce": false
+      "hasAccountTreeSyncingSyncedAtLeastOnce": false,
+      "selectedAccountGroup": ""
     },
     "AccountsController": {
       "internalAccounts": {
@@ -36,7 +37,7 @@
       "announcements": {}
     },
     "AppMetadataController": {
-      "currentMigrationVersion": 200,
+      "currentMigrationVersion": 202,
       "firstTimeInfo": {
         "date": 0,
         "version": "13.17.0"
@@ -1982,7 +1983,6 @@
       "theme": "os",
       "use4ByteResolution": true,
       "useAddressBarEnsResolution": true,
-      "useBlockie": false,
       "useCurrencyRateCheck": true,
       "useExternalNameSources": true,
       "useExternalServices": true,
@@ -2074,7 +2074,7 @@
     "SnapInterfaceController": {
       "interfaces": {}
     },
-    "SnapsRegistry": {
+    "SnapRegistryController": {
       "database": null,
       "databaseUnavailable": false,
       "lastUpdated": null,
@@ -2186,6 +2186,6 @@
   },
   "meta": {
     "storageKind": "split",
-    "version": 200
+    "version": 202
   }
 }
diff --git a/test/e2e/flask/create-watch-account.spec.ts b/test/e2e/flask/create-watch-account.spec.ts
index 63865286042b..904cdff2a204 100644
--- a/test/e2e/flask/create-watch-account.spec.ts
+++ b/test/e2e/flask/create-watch-account.spec.ts
@@ -303,7 +303,7 @@ describe.skip('Account-watcher snap', function (this: Suite) {
             'Toggle should be off by default',
           );
           await experimentalSettings.toggleWatchAccount();
-          await settingsPage.closeSettingsPage();
+          await settingsPage.clickBackButton();
 
           // verify the 'Watch and Ethereum account (Beta)' option is available
           await homePage.checkPageIsLoaded();
@@ -336,7 +336,7 @@ describe.skip('Account-watcher snap', function (this: Suite) {
           const experimentalSettings = new ExperimentalSettings(driver);
           await experimentalSettings.checkPageIsLoaded();
           await experimentalSettings.toggleWatchAccount();
-          await settingsPage.closeSettingsPage();
+          await settingsPage.clickBackButton();
 
           // verify the 'Watch and Ethereum account (Beta)' option is available
           await homePage.checkPageIsLoaded();
@@ -355,7 +355,7 @@ describe.skip('Account-watcher snap', function (this: Suite) {
           await settingsPage.goToExperimentalSettings();
           await experimentalSettings.checkPageIsLoaded();
           await experimentalSettings.toggleWatchAccount();
-          await settingsPage.closeSettingsPage();
+          await settingsPage.clickBackButton();
 
           // verify the 'Watch and Ethereum account (Beta)' option is not available
           await homePage.checkPageIsLoaded();
diff --git a/test/e2e/flask/multi-srp/common-multi-srp.ts b/test/e2e/flask/multi-srp/common-multi-srp.ts
index 5973d9ec9b1e..a46be30e3c57 100644
--- a/test/e2e/flask/multi-srp/common-multi-srp.ts
+++ b/test/e2e/flask/multi-srp/common-multi-srp.ts
@@ -51,6 +51,8 @@ export async function withMultiSrp(
       await accountListPage.checkPageIsLoaded();
       await accountListPage.startImportSecretPhrase(srpToUse);
       await homePage.checkNewSrpAddedToastIsDisplayed();
+      await homePage.dismissSrpAddedToast();
+      await homePage.checkPageIsLoaded();
       await test(driver);
     },
   );
@@ -64,9 +66,10 @@ export const verifySrp = async (
   await new HeaderNavbar(driver).openSettingsPage();
   const settingsPage = new SettingsPage(driver);
   await settingsPage.checkPageIsLoaded();
-  await settingsPage.goToPrivacySettings();
+  await settingsPage.goToSecurityAndPasswordSettings();
 
   const privacySettings = new PrivacySettings(driver);
+  await privacySettings.checkSecurityAndPasswordPageIsLoaded();
   await privacySettings.openRevealSrpQuiz(srpIndex);
   await privacySettings.completeRevealSrpQuiz();
   await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
diff --git a/test/e2e/flask/snaps/preinstalled-example.spec.ts b/test/e2e/flask/snaps/preinstalled-example.spec.ts
index 8f83ae1857d3..4f6cfc11381d 100644
--- a/test/e2e/flask/snaps/preinstalled-example.spec.ts
+++ b/test/e2e/flask/snaps/preinstalled-example.spec.ts
@@ -1,8 +1,7 @@
 import { strict as assert } from 'assert';
 import { Mockttp } from 'mockttp';
 import { Driver } from '../../webdriver/driver';
-import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import {
   DAPP_PATH,
@@ -15,6 +14,7 @@ import PreinstalledExampleSettings from '../../page-objects/pages/settings/prein
 import { TestSnaps } from '../../page-objects/pages/test-snaps';
 import { mockTestSnapsSite } from '../../mock-response-data/snaps/snap-local-sites/test-snaps-site-mocks';
 import { TEST_SNAPS_WEBSITE_URL } from '../../snaps/enums';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
 
 async function mockSentryTestError(mockServer: Mockttp) {
   return await mockServer
@@ -61,12 +61,13 @@ describe('Preinstalled example Snap', function () {
         dappOptions: {
           customDappPaths: [DAPP_PATH.TEST_SNAPS],
         },
-        fixtures: new FixtureBuilder().build(),
+        fixtures: new FixtureBuilderV2().build(),
         testSpecificMock: mockTestSnapsSite,
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
+        const settingsPage = new SettingsPage(driver);
         const preInstalledExample = new PreinstalledExampleSettings(driver);
         await navigateToPreInstalledExample(driver);
 
@@ -76,9 +77,7 @@ describe('Preinstalled example Snap', function () {
         await preInstalledExample.checkIsToggleOn();
         await preInstalledExample.checkSelectedRadioOption('option2');
         await preInstalledExample.checkSelectedDropdownOption('option2');
-        await driver.clickElement(
-          '.settings-page__header__title-container__close-button',
-        );
+        await settingsPage.clickBackButton();
 
         // Navigate to `test-snaps` page, we don't need to connect because the Snap uses
         // initialConnections to pre-approve the dapp.
@@ -106,7 +105,7 @@ describe('Preinstalled example Snap', function () {
         dappOptions: {
           customDappPaths: [DAPP_PATH.TEST_SNAPS],
         },
-        fixtures: new FixtureBuilder().build(),
+        fixtures: new FixtureBuilderV2().build(),
         testSpecificMock: mockTestSnapsSite,
         title: this.test?.fullTitle(),
       },
@@ -137,7 +136,7 @@ describe('Preinstalled example Snap', function () {
         dappOptions: {
           customDappPaths: [DAPP_PATH.TEST_SNAPS],
         },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withMetaMetricsController({
             metaMetricsId: MOCK_META_METRICS_ID,
             participateInMetaMetrics: true,
@@ -189,7 +188,7 @@ describe('Preinstalled example Snap', function () {
         dappOptions: {
           customDappPaths: [DAPP_PATH.TEST_SNAPS],
         },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withMetaMetricsController({
             metaMetricsId: MOCK_META_METRICS_ID,
             participateInMetaMetrics: true,
@@ -237,7 +236,7 @@ describe('Preinstalled example Snap', function () {
         dappOptions: {
           customDappPaths: [DAPP_PATH.TEST_SNAPS],
         },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withMetaMetricsController({
             metaMetricsId: MOCK_META_METRICS_ID,
             participateInMetaMetrics: true,
@@ -291,9 +290,7 @@ async function navigateToPreInstalledExample(driver: Driver) {
   const headerNavbar = new HeaderNavbar(driver);
   const settingsPage = new SettingsPage(driver);
   const preInstalledExample = new PreinstalledExampleSettings(driver);
-
   await headerNavbar.openSettingsPage();
-
   await settingsPage.goToPreInstalledExample();
   await preInstalledExample.checkPageIsLoaded();
 }
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index 0a34ac759f56..1a35d8e8c685 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -89,6 +89,7 @@ const blocklistedHosts = [
   'linea-sepolia.infura.io',
   'mainnet.infura.io',
   'optimism-mainnet.infura.io',
+  'polygon-mainnet.infura.io',
   'sei-mainnet.infura.io',
   'sepolia.infura.io',
   'testnet-rpc.monad.xyz',
diff --git a/test/e2e/mock-response-data/snaps/update-snaps-registry.ts b/test/e2e/mock-response-data/snaps/update-snaps-registry.ts
index 7cfdf28b8884..164573753843 100644
--- a/test/e2e/mock-response-data/snaps/update-snaps-registry.ts
+++ b/test/e2e/mock-response-data/snaps/update-snaps-registry.ts
@@ -18,7 +18,7 @@ import {
  * Registry bytes use `*.txt` so `yarn lint:prettier:fix` does not touch them.
  */
 
-/** Public key from JsonSnapsRegistry / extension snaps registry init. */
+/** Public key from SnapRegistryController / extension snaps registry init. */
 const REGISTRY_PUBLIC_KEY =
   '0x025b65308f0f0fb8bc7f7ff87bfc296e0330eee5d3c1d1ee4a048b2fd6a86fa0a6';
 
diff --git a/test/e2e/page-objects/flows/crash.flow.ts b/test/e2e/page-objects/flows/crash.flow.ts
index 51585ccdd97d..7c375f893f28 100644
--- a/test/e2e/page-objects/flows/crash.flow.ts
+++ b/test/e2e/page-objects/flows/crash.flow.ts
@@ -13,7 +13,7 @@ export const triggerCrash = async (driver: Driver): Promise<void> => {
   await headerNavbar.openSettingsPage();
   const settingsPage = new SettingsPage(driver);
   await settingsPage.checkPageIsLoaded();
-  await settingsPage.goToDeveloperOptions();
+  await settingsPage.goToDebugSettings();
 
   const developOptionsPage = new DevelopOptions(driver);
   await developOptionsPage.checkPageIsLoaded();
diff --git a/test/e2e/page-objects/flows/onboarding.flow.ts b/test/e2e/page-objects/flows/onboarding.flow.ts
index e6c38d76011a..63dfc0cdf3a7 100644
--- a/test/e2e/page-objects/flows/onboarding.flow.ts
+++ b/test/e2e/page-objects/flows/onboarding.flow.ts
@@ -528,7 +528,10 @@ export const completeCreateNewWalletOnboardingFlowWithCustomSettings = async ({
 };
 
 /**
- * Add custom network in onboarding privacy settings
+ * Add custom network in onboarding privacy settings, then finish onboarding,
+ * navigate to home, and enable “Show test networks” from Settings → Networks
+ * before any later flow that switches the asset list to Localhost (e.g. wallet
+ * fixture export).
  *
  * @param options - The options object.
  * @param options.driver - The WebDriver instance.
diff --git a/test/e2e/page-objects/flows/settings.flow.ts b/test/e2e/page-objects/flows/settings.flow.ts
index 1dbca710210f..bd4c15c54b6d 100644
--- a/test/e2e/page-objects/flows/settings.flow.ts
+++ b/test/e2e/page-objects/flows/settings.flow.ts
@@ -1,25 +1,24 @@
 import { Driver } from '../../webdriver/driver';
 import HomePage from '../pages/home/homepage';
 import SettingsPage from '../pages/settings/settings-page';
-import GeneralSettings from '../pages/settings/general-settings';
-import AdvancedSettings from '../pages/settings/advanced-settings';
+import PreferencesAndDisplaySettings from '../pages/settings/preferences-and-display-settings';
+import SelectNetwork from '../pages/dialog/select-network';
+import HeaderNavbar from '../pages/header-navbar';
 
 /**
- * Enable test networks (testnets) from settings
+ * Enable test networks (testnets) from Settings → Networks (opens the network
+ * list menu; toggles “Show test networks”).
  *
  * @param driver - The WebDriver instance
  */
 export const enableTestNetworks = async (driver: Driver): Promise<void> => {
-  const homePage = new HomePage(driver);
-  await homePage.headerNavbar.openSettingsPage();
-
-  const settingsPage = new SettingsPage(driver);
-  await settingsPage.clickAdvancedTab();
+  const headerNavbar = new HeaderNavbar(driver);
+  await headerNavbar.openGlobalNetworksMenu();
 
-  const advancedSettings = new AdvancedSettings(driver);
-  await advancedSettings.checkPageIsLoaded();
-  await advancedSettings.toggleShowTestnets();
-  await settingsPage.closeSettingsPage();
+  const selectNetworkDialog = new SelectNetwork(driver);
+  await selectNetworkDialog.checkPageIsLoaded();
+  await selectNetworkDialog.toggleShowTestNetwork();
+  await selectNetworkDialog.clickCloseButton();
 };
 
 /**
@@ -33,10 +32,13 @@ export const enableNativeTokenAsMainBalance = async (
   const homePage = new HomePage(driver);
   await homePage.headerNavbar.openSettingsPage();
 
-  const generalSettings = new GeneralSettings(driver);
-  await generalSettings.checkPageIsLoaded();
-  await generalSettings.toggleShowNativeTokenAsMainBalance();
-
   const settingsPage = new SettingsPage(driver);
-  await settingsPage.closeSettingsPage();
+  await settingsPage.checkPageIsLoaded();
+  await settingsPage.goToAssetsSettings();
+
+  const assetsSettings = new PreferencesAndDisplaySettings(driver);
+  await assetsSettings.checkAssetsPageIsLoaded();
+  await assetsSettings.toggleShowNativeTokenAsMainBalance();
+
+  await settingsPage.clickBackButton();
 };
diff --git a/test/e2e/page-objects/flows/transaction.ts b/test/e2e/page-objects/flows/transaction.ts
index 7c79bb09fc5f..993c0a48fc08 100644
--- a/test/e2e/page-objects/flows/transaction.ts
+++ b/test/e2e/page-objects/flows/transaction.ts
@@ -75,11 +75,6 @@ export const createInternalTransactionWithMaxAmount = async ({
   });
 };
 
-export const reviewTransaction = async (driver: Driver) => {
-  const transactionConfirmation = new TransactionConfirmation(driver);
-  await transactionConfirmation.validateSendFees('0.0004', '$0.75');
-};
-
 export const createDappTransaction = async (
   driver: Driver,
   override?: Partial<TransactionParams>,
diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index c4dfc88ef1ee..17a04c755615 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -218,7 +218,7 @@ class AccountListPage {
 
   private readonly importSrpConfirmButton = {
     text: 'Continue',
-    tag: 'button',
+    tag: 'span',
   };
 
   private readonly exportSrpButton = {
@@ -1138,17 +1138,20 @@ class AccountListPage {
     await new HeaderNavbar(this.driver).openSettingsPage();
     const settingsPage = new SettingsPage(this.driver);
     await settingsPage.checkPageIsLoaded();
-    await settingsPage.goToPrivacySettings();
+    await settingsPage.goToSecurityAndPasswordSettings();
 
     const privacySettings = new PrivacySettings(this.driver);
+    await privacySettings.checkSecurityAndPasswordPageIsLoaded();
     await privacySettings.openSrpList();
 
     if (srpIndex === 0) {
       throw new Error('SRP index must be > 0');
     }
 
-    const srps = await this.driver.findElements('.select-srp__container');
-    const selectedSrp = srps[srpIndex - 1];
+    const selectedSrp = await this.driver.waitForSelector({
+      css: '.select-srp__container',
+      text: `Secret Recovery Phrase ${srpIndex}`,
+    });
     const showAccountsButton = await this.driver.waitForSelector(
       `[data-testid="srp-list-show-accounts-${srpIndex - 1}"]`,
     );
diff --git a/test/e2e/page-objects/pages/bridge/quote-page.ts b/test/e2e/page-objects/pages/bridge/quote-page.ts
index dadf1ad820ef..b9bfc6a84e8e 100644
--- a/test/e2e/page-objects/pages/bridge/quote-page.ts
+++ b/test/e2e/page-objects/pages/bridge/quote-page.ts
@@ -1,5 +1,10 @@
 import { strict as assert } from 'assert';
+import { Hex } from '@metamask/utils';
+import { toAssetId } from '../../../../../shared/lib/asset-utils';
+import { ASSET_ROUTE } from '../../../../../shared/lib/deep-links/routes/route';
+import { toChecksumHexAddress } from '../../../../../shared/lib/hexstring-utils';
 import { Driver } from '../../../webdriver/driver';
+import TokenOverviewPage from '../token-overview-page';
 
 export type BridgeQuote = {
   amount: string;
@@ -15,7 +20,7 @@ class BridgeQuotePage {
 
   public sourceAssetPickerButton = '[data-testid="bridge-source-button"]';
 
-  private destinationAssetPickerButton =
+  public destinationAssetPickerButton =
     '[data-testid="bridge-destination-button"]';
 
   private mutlichainAssetPicker =
@@ -30,7 +35,7 @@ class BridgeQuotePage {
 
   private lineaNetwork = '[data-testid="Linea"]';
 
-  public tokenButton = '[data-testid="bridge-asset"]';
+  public tokenButton = '[data-testid^="bridge-asset--"]';
 
   private submitButton = { text: 'Swap', tag: 'button' };
 
@@ -148,6 +153,69 @@ class BridgeQuotePage {
     );
   };
 
+  searchForAsset = async (
+    token: string,
+    assetPicker = this.sourceAssetPickerButton,
+  ) => {
+    console.log(`Opening asset picker`);
+    await this.driver.clickElement(assetPicker);
+    await this.driver.fill(this.assetPrickerSearchInput, token);
+    console.log(`Filled search input with ${token}`);
+    const assetElement = await this.driver.findElement({
+      css: this.tokenButton,
+      text: token,
+    });
+    return assetElement;
+  };
+
+  goToAssetPage = async (
+    token: string,
+    chainId: Hex,
+    address: string,
+    assetPicker = this.sourceAssetPickerButton,
+  ) => {
+    const expectedAssetId = toAssetId(address, chainId)?.toLowerCase();
+    const expectedUrl = `${ASSET_ROUTE}/${chainId}/${encodeURIComponent(toChecksumHexAddress(address))}`;
+
+    console.log(`Opening asset picker`);
+    await this.driver.clickElement(assetPicker);
+    await this.driver.fill(this.assetPrickerSearchInput, token);
+    console.log(`Filled search input with ${token}`);
+    const assetElement = await this.driver.findElement({
+      tag: 'button',
+      testId: `bridge-asset-info-icon-${expectedAssetId}`,
+    });
+    console.log(`Clicked link to the asset page`);
+    await assetElement.click();
+    await this.driver.waitForUrlContaining({
+      url: expectedUrl,
+    });
+    const assetPage = new TokenOverviewPage(this.driver);
+    await assetPage.checkPageIsLoaded();
+  };
+
+  checkAssetsAreSelected = async (sourceToken: string, destToken: string) => {
+    await this.driver.waitForSelector({
+      css: this.sourceAssetPickerButton,
+      text: sourceToken,
+    });
+    console.log(`Expected source asset ${sourceToken} is selected`);
+    await this.driver.waitForSelector({
+      css: this.destinationAssetPickerButton,
+      text: destToken,
+    });
+    console.log(`Expected dest asset ${destToken} is selected`);
+  };
+
+  checkAssetPickerModalIsReopened = async () => {
+    await this.driver.waitForSelector({
+      testId: 'bridge-asset-picker-modal',
+    });
+    console.log('Asset picker modal is visible');
+    await this.driver.clickElementAndWaitToDisappear('[aria-label="Close"]');
+    console.log('Asset picker modal closed');
+  };
+
   waitForQuote = async () => {
     await this.driver.waitForSelector(this.submitButton, { timeout: 30000 });
   };
diff --git a/test/e2e/page-objects/pages/confirmations/speed-up-and-cancel-modal.ts b/test/e2e/page-objects/pages/confirmations/speed-up-and-cancel-modal.ts
index db72d17a9b46..c9b414ac7a9f 100644
--- a/test/e2e/page-objects/pages/confirmations/speed-up-and-cancel-modal.ts
+++ b/test/e2e/page-objects/pages/confirmations/speed-up-and-cancel-modal.ts
@@ -18,8 +18,8 @@ export default class SpeedUpAndCancelModal {
   private readonly modal: RawLocator =
     '[data-testid="speed-up-and-cancel-modal"]';
 
-  private readonly siteSuggestedText: RawLocator = {
-    text: 'Site suggested',
+  private readonly tenPercentText: RawLocator = {
+    text: '10% increase',
   };
 
   private readonly speedRow: RawLocator =
@@ -42,12 +42,12 @@ export default class SpeedUpAndCancelModal {
   }
 
   /**
-   * Checks that the Speed row in the modal displays "Site suggested".
+   * Checks that the Speed row in the modal displays "10% increased".
    */
-  async checkSpeedRowShowsSiteSuggested(): Promise<void> {
-    console.log('Checking Speed row shows Site suggested');
+  async checkSpeedRowShowsTenPercentIncreased(): Promise<void> {
+    console.log('Checking Speed row shows 10% increased');
     await this.driver.waitForSelector(this.speedRow);
-    await this.driver.waitForSelector(this.siteSuggestedText);
+    await this.driver.waitForSelector(this.tenPercentText);
   }
 
   /**
diff --git a/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts b/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts
index c54b75e9c46d..4bb75199d106 100644
--- a/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts
+++ b/test/e2e/page-objects/pages/confirmations/transaction-confirmation.ts
@@ -81,6 +81,11 @@ class TransactionConfirmation extends Confirmation {
 
   private readonly saveButton: RawLocator = { tag: 'button', text: 'Save' };
 
+  private readonly sendAmountFiat = (amount: string): RawLocator => ({
+    text: amount,
+    css: '.text-alternative',
+  });
+
   private readonly senderAccount: RawLocator = '[data-testid="sender-address"]';
 
   private readonly siteSuggestedGasFee = (estimatedTime: string) => ({
@@ -92,6 +97,9 @@ class TransactionConfirmation extends Confirmation {
     text: tEn('confirmTitleSending'),
   };
 
+  private readonly walletInitiatedBackButton =
+    '[data-testid="wallet-initiated-header-back-button"]';
+
   private readonly tokenGasFeeDropdown =
     '[data-testid="selected-gas-fee-token-arrow"]';
 
@@ -331,6 +339,13 @@ class TransactionConfirmation extends Confirmation {
     });
   }
 
+  async checkSendAmountConversion(amountFiat: string) {
+    console.log(
+      `Checking send amount conversion ${amountFiat} on transaction confirmation page.`,
+    );
+    await this.driver.waitForSelector(this.sendAmountFiat(amountFiat));
+  }
+
   async checkSiteSuggestedGas(time: string) {
     console.log(
       `Check Site suggested time ${time} on transaction confirmation page.`,
@@ -367,6 +382,13 @@ class TransactionConfirmation extends Confirmation {
     await this.driver.clickElementSafe(this.gasFeeCloseToastMessage, 10000);
   }
 
+  async clickBackButton(): Promise<void> {
+    console.log('Clicking wallet-initiated back button');
+    await this.driver.clickElementAndWaitToDisappear(
+      this.walletInitiatedBackButton,
+    );
+  }
+
   /**
    * Opens the gas fee modal by clicking the edit gas fee icon.
    */
diff --git a/test/e2e/page-objects/pages/developer-options-page.ts b/test/e2e/page-objects/pages/developer-options-page.ts
index 5b4f9719aaf1..e1c2a7d549d8 100644
--- a/test/e2e/page-objects/pages/developer-options-page.ts
+++ b/test/e2e/page-objects/pages/developer-options-page.ts
@@ -12,11 +12,6 @@ class DevelopOptions {
   private readonly generatePageCrashButton: string =
     '[data-testid="developer-options-generate-page-crash-button"]';
 
-  private readonly developOptionsPageTitle: object = {
-    text: 'Developer options',
-    css: 'h4',
-  };
-
   private readonly developerOptionsRemoteFeatureFlagsState: string =
     '[data-testid="developer-options-remote-feature-flags"]';
 
@@ -26,15 +21,14 @@ class DevelopOptions {
 
   async checkPageIsLoaded(): Promise<void> {
     try {
-      await this.driver.waitForSelector(this.developOptionsPageTitle);
-    } catch (e) {
-      console.log(
-        'Timeout while waiting for Developer options page to be loaded',
-        e,
+      await this.driver.waitForSelector(
+        this.developerOptionsRemoteFeatureFlagsState,
       );
+    } catch (e) {
+      console.log('Timeout while waiting for Debug page to be loaded', e);
       throw e;
     }
-    console.log('Developer option page is loaded');
+    console.log('Debug page is loaded');
   }
 
   async clickGenerateCrashButton(): Promise<void> {
diff --git a/test/e2e/page-objects/pages/dialog/select-network.ts b/test/e2e/page-objects/pages/dialog/select-network.ts
index 06525b4389c6..e2cef0dccc05 100644
--- a/test/e2e/page-objects/pages/dialog/select-network.ts
+++ b/test/e2e/page-objects/pages/dialog/select-network.ts
@@ -29,6 +29,9 @@ class SelectNetwork {
     testId: 'network-list-item-options-discover',
   };
 
+  private readonly drawerOverlay =
+    'div[class*="bg-[var(--color-overlay-default)]"]';
+
   private readonly editNetworkButton =
     '[data-testid="network-list-item-options-edit"]';
 
@@ -52,7 +55,7 @@ class SelectNetwork {
     tag: 'h4',
   };
 
-  private readonly toggleButton = '.toggle-button > div';
+  private readonly showTestNetworksToggle = '.toggle-button';
 
   private readonly addPopularNetworkByChainIdIcon = (chainId: string) =>
     `[data-testid="popular-network-${chainId}"] [data-testid="test-add-button"] button`;
@@ -123,6 +126,10 @@ class SelectNetwork {
     await this.openNetworkListOptions(chainId);
     await this.driver.clickElementAndWaitToDisappear(this.deleteNetworkButton);
     await this.driver.waitForSelector(this.confirmDeleteNetworkModal);
+    // Ensure drawer overlay is not present to avoid ElementClickInterceptedError
+    await this.driver.assertElementNotPresent(this.drawerOverlay, {
+      waitAtLeastGuard: 200,
+    });
     await this.driver.clickElementAndWaitToDisappear(
       this.confirmDeleteNetworkButton,
     );
@@ -185,7 +192,8 @@ class SelectNetwork {
 
   async toggleShowTestNetwork(): Promise<void> {
     console.log('Toggle show test network in select network dialog');
-    await this.driver.clickElement(this.toggleButton);
+    await this.driver.clickElement(this.showTestNetworksToggle);
+    await this.driver.waitForElementToStopMoving(this.showTestNetworksToggle);
   }
 
   /**
diff --git a/test/e2e/page-objects/pages/error-page.ts b/test/e2e/page-objects/pages/error-page.ts
index 4574beae758f..0845fccf93f5 100644
--- a/test/e2e/page-objects/pages/error-page.ts
+++ b/test/e2e/page-objects/pages/error-page.ts
@@ -10,10 +10,7 @@ class ErrorPage {
   private readonly driver: Driver;
 
   // Locators
-  private readonly errorPageTitle: object = {
-    text: 'MetaMask encountered an error',
-    css: 'h3',
-  };
+  private readonly errorPageTitle = '[data-testid="error-page-title"]';
 
   private readonly errorMessage = '[data-testid="error-page-error-message"]';
 
@@ -63,11 +60,11 @@ class ErrorPage {
     await headerNavbar.openSettingsPage();
     const settingsPage = new SettingsPage(this.driver);
     await settingsPage.checkPageIsLoaded();
-    await settingsPage.goToDeveloperOptions();
+    await settingsPage.goToDebugSettings();
 
-    const developOptionsPage = new DevelopOptionsPage(this.driver);
-    await developOptionsPage.checkPageIsLoaded();
-    await developOptionsPage.clickGenerateCrashButton();
+    const developerOptionsPage = new DevelopOptionsPage(this.driver);
+    await developerOptionsPage.checkPageIsLoaded();
+    await developerOptionsPage.clickGenerateCrashButton();
   }
 
   async validateErrorMessage(): Promise<void> {
@@ -90,7 +87,7 @@ class ErrorPage {
   async clickContactButton(): Promise<void> {
     console.log(`Contact metamask support form in a separate page`);
     await this.driver.waitUntilXWindowHandles(1);
-    await this.driver.clickElement(this.contactSupportButton);
+    await this.driver.findScrollToAndClickElement(this.contactSupportButton);
   }
 
   async consentDataToMetamaskSupport(): Promise<void> {
diff --git a/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts b/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
index 0afad13fd3f8..c6992c3e4ca7 100644
--- a/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
+++ b/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
@@ -20,7 +20,7 @@ class ConnectHardwareWalletPage {
 
   private readonly connectQrButton = '[data-testid="connect-qr-btn"]';
 
-  private readonly continueButton = { text: 'Continue', tag: 'button' };
+  private readonly continueButton = { testId: 'connect-hardware-continue-btn' };
 
   private readonly closeButton = '[data-testid="hardware-connect-close-btn"]';
 
@@ -84,10 +84,7 @@ class ConnectHardwareWalletPage {
     });
 
     // Continue button should be disabled
-    const continueButton = await this.driver.findElement({
-      text: 'Continue',
-      tag: 'button',
-    });
+    const continueButton = await this.driver.findElement(this.continueButton);
     const isDisabled = (await continueButton.getAttribute('disabled')) !== null;
     if (!isDisabled) {
       throw new Error('Continue button should be disabled in Firefox');
diff --git a/test/e2e/page-objects/pages/hardware-wallet/select-hardware-wallet-account-page.ts b/test/e2e/page-objects/pages/hardware-wallet/select-hardware-wallet-account-page.ts
index 37f7c89582ce..27a3460733d7 100644
--- a/test/e2e/page-objects/pages/hardware-wallet/select-hardware-wallet-account-page.ts
+++ b/test/e2e/page-objects/pages/hardware-wallet/select-hardware-wallet-account-page.ts
@@ -7,7 +7,9 @@ import { Driver } from '../../../webdriver/driver';
 class SelectHardwareWalletAccountPage {
   protected driver: Driver;
 
-  protected readonly cancelButton = { text: 'Cancel', tag: 'button' };
+  protected readonly cancelButton = {
+    testId: 'connect-hardware-account-list-cancel-btn',
+  };
 
   protected readonly selectAccountPageTitle = {
     text: 'Select an account',
@@ -16,12 +18,12 @@ class SelectHardwareWalletAccountPage {
 
   protected readonly accountCheckbox = '.hw-account-list__item__checkbox';
 
-  protected readonly forgetDeviceButton = {
-    text: 'Forget this device',
-    tag: 'a',
-  };
+  protected readonly forgetDeviceButton =
+    '[data-testid="hardware-forget-device-button"]';
 
-  protected readonly unlockButton = { text: 'Unlock', tag: 'button' };
+  protected readonly unlockButton = {
+    testId: 'connect-hardware-account-list-unlock-btn',
+  };
 
   constructor(driver: Driver) {
     this.driver = driver;
@@ -55,10 +57,7 @@ class SelectHardwareWalletAccountPage {
 
   async selectAccount(accountIndex: number): Promise<void> {
     console.log(`Select account ${accountIndex}`);
-    const accountCheckboxes = await this.driver.findElements(
-      this.accountCheckbox,
-    );
-    await accountCheckboxes[accountIndex - 1].click();
+    await this.driver.clickElement(`label[for="address-${accountIndex - 1}"]`);
   }
 
   async unlockAccount(accountIndex: number): Promise<void> {
diff --git a/test/e2e/page-objects/pages/header-navbar.ts b/test/e2e/page-objects/pages/header-navbar.ts
index 3255d767db06..7879b9471ee9 100644
--- a/test/e2e/page-objects/pages/header-navbar.ts
+++ b/test/e2e/page-objects/pages/header-navbar.ts
@@ -16,11 +16,6 @@ class HeaderNavbar {
   private readonly allPermissionsButton =
     '[data-testid="global-menu-connected-sites"]';
 
-  private readonly connectedSitePopoverNetworkButton =
-    '[data-testid="connected-site-popover-network-button"]';
-
-  private readonly connectionMenu = '[data-testid="connection-menu"]';
-
   private readonly copyAddressButton = '[aria-label="Copy address"]';
 
   private readonly drawerBackButton = '[data-testid="drawer-close-button"]';
@@ -33,6 +28,9 @@ class HeaderNavbar {
 
   private readonly globalNetworksMenu = '[data-testid="global-menu-networks"]';
 
+  private readonly dappNetworkButton =
+    '[data-testid="dapp-connection-control-bar__network-button"]';
+
   private readonly lockMetaMaskButton = '[data-testid="global-menu-lock"]';
 
   private readonly networkAddressesLink =
@@ -43,6 +41,9 @@ class HeaderNavbar {
 
   private readonly networkPicker = '.mm-picker-network';
 
+  private readonly toastBannerButton =
+    '.toasts-container__banner-base button[aria-label="Close"]';
+
   private readonly notificationCounterMenuIcon = {
     testId: 'notifications-tag-counter__unread-dot',
   };
@@ -237,19 +238,13 @@ class HeaderNavbar {
   }
 
   /**
-   * Open the connection menu
-   */
-  async openConnectionMenu(): Promise<void> {
-    console.log('Opening connection menu');
-    await this.driver.clickElement(this.connectionMenu);
-  }
-
-  /**
-   * Click the connected site popover network button
+   * Open the dapp network selector from the connection control bar
    */
-  async clickConnectedSitePopoverNetworkButton(): Promise<void> {
-    console.log('Clicking connected site popover network button');
-    await this.driver.clickElement(this.connectedSitePopoverNetworkButton);
+  async openDappNetworkMenu(): Promise<void> {
+    console.log('Opening dapp network menu from control bar');
+    // the toast message automatically disappears after some seconds, so we need to use clickElementSafe to prevent race conditions
+    await this.driver.clickElementSafe(this.toastBannerButton, 3000);
+    await this.driver.clickElement(this.dappNetworkButton);
   }
 
   /**
diff --git a/test/e2e/page-objects/pages/home/activity-list.ts b/test/e2e/page-objects/pages/home/activity-list.ts
index 7bd899da8738..dd5d450bfad9 100644
--- a/test/e2e/page-objects/pages/home/activity-list.ts
+++ b/test/e2e/page-objects/pages/home/activity-list.ts
@@ -333,6 +333,88 @@ class ActivityListPage {
     );
   }
 
+  /**
+   * This function checks a swap or bridge transaction's details
+   *
+   * @param action - The expected action text for the Activity List item
+   * @param isBridge - Whether the transaction is a bridge or swap
+   * @param expectedStatus - The expected status of the transaction
+   * @param expectedSrcAmount - The expected source amount
+   * @param expectedSrcToken - The expected source token
+   * @param expectedDestAmount - The expected destination amount
+   * @param expectedDestToken - The expected destination token
+   * @returns A promise that resolves when the expected transaction details are displayed within the timeout period.
+   */
+  async checkBridgeTransactionDetails(
+    action: string,
+    isBridge: boolean,
+    expectedStatus: 'success' | 'failed' | 'pending',
+    expectedSrcAmount?: string,
+    expectedSrcToken?: string,
+    expectedDestAmount?: string,
+    expectedDestToken?: string,
+  ): Promise<void> {
+    console.log(`Open bridge transaction details`);
+    const [completedTx] = await this.driver.findElements({
+      text: action,
+    });
+    await completedTx.click();
+    await this.driver.waitForUrlContaining({
+      url: '/cross-chain/tx-details',
+    });
+    await this.driver.waitForSelector({
+      text: `${isBridge ? 'Bridge' : 'Swap'} details`,
+    });
+
+    console.log('Checking scanner links');
+    const scannerLinks = await this.driver.findElements({
+      tag: 'button',
+      text: 'View on',
+    });
+    assert.equal(
+      scannerLinks.length,
+      isBridge && expectedStatus === 'success' ? 2 : 1,
+      'Scanner links are displayed',
+    );
+
+    console.log(`Checking ${isBridge ? 'bridge' : 'swap'} status`);
+    const BRIDGE_STATUSES = {
+      success: 'complete',
+      failed: 'failed',
+      pending: 'pending',
+    };
+    const SWAP_STATUSES = {
+      success: 'confirmed',
+      failed: 'failed',
+      pending: 'pending',
+    };
+    const expectedStatusText = isBridge
+      ? BRIDGE_STATUSES[expectedStatus]
+      : SWAP_STATUSES[expectedStatus];
+    const statusElement = await this.driver.findElement({
+      text: expectedStatusText,
+    });
+    assert.equal(
+      (await statusElement.getText()).toLowerCase(),
+      expectedStatusText,
+      `Status is displayed as ${expectedStatusText}`,
+    );
+
+    console.log('Checking displayed amounts');
+    await this.driver.waitForSelector({
+      text: `${expectedSrcAmount} ${expectedSrcToken} on`,
+    });
+    if (expectedDestAmount) {
+      await this.driver.waitForSelector({
+        text: `${expectedDestAmount} ${expectedDestToken}`,
+      });
+    }
+
+    console.log('Navigating back to activity list');
+    const backButton = await this.driver.findElement('.mm-button-icon');
+    await backButton.click();
+  }
+
   /**
    * This function checks if a specified transaction amount at the specified index matches the expected one.
    *
diff --git a/test/e2e/page-objects/pages/home/asset-list.ts b/test/e2e/page-objects/pages/home/asset-list.ts
index 0e82aacca80c..585211beb620 100644
--- a/test/e2e/page-objects/pages/home/asset-list.ts
+++ b/test/e2e/page-objects/pages/home/asset-list.ts
@@ -81,6 +81,13 @@ class AssetListPage {
   private readonly tokenFiatAmount =
     '[data-testid="multichain-token-list-item-secondary-value"]';
 
+  private readonly selectedNetwork = (networkName: string) => {
+    return {
+      testId: 'test-import-tokens-drop-down-custom-import',
+      text: networkName,
+    };
+  };
+
   private readonly sendButton = '[data-testid="eth-overview-send"]';
 
   private readonly tokenAddressInput =
@@ -337,12 +344,19 @@ class AssetListPage {
     await this.driver.waitForSelector(this.tokenImportedSuccessMessage);
   }
 
-  async importTokenBySearch(tokenName: string) {
+  async importTokenBySearch({
+    tokenName,
+    networkName,
+  }: {
+    tokenName: string;
+    networkName: string;
+  }) {
     console.log(`Import token ${tokenName} on homepage by search`);
     await this.driver.waitForSelector(this.multichainTokenListButton);
     await this.driver.clickElement(this.tokenOptionsButton);
     await this.driver.clickElement(this.importTokensButton);
     await this.driver.waitForSelector(this.importTokenModalTitle);
+    await this.driver.waitForSelector(this.selectedNetwork(networkName));
     await this.driver.fill(this.tokenSearchInput, tokenName);
     // Wait until the token search matches 1 result to prevent flakiness with token result re-renders
     await this.waitUntilTokenSearchMatch(1);
diff --git a/test/e2e/page-objects/pages/home/bitcoin-homepage.ts b/test/e2e/page-objects/pages/home/bitcoin-homepage.ts
index f567f6397b96..51d659c065d8 100644
--- a/test/e2e/page-objects/pages/home/bitcoin-homepage.ts
+++ b/test/e2e/page-objects/pages/home/bitcoin-homepage.ts
@@ -21,6 +21,15 @@ class BitcoinHomepage extends HomePage {
         this.buySellButton,
         this.receiveButton,
       ]);
+
+      // Bitcoin accounts get created asynchronously during wallet alignment, so we need
+      // to wait for this to succeed to be able to use Bitcoin accounts.
+      await this.waitForNonEvmAccountsLoaded();
+
+      // FIXME: For some reason, balances are taking a bit more time to display in full
+      // view mode compared to the sidepanel. To warkaround this, we are adding a small
+      // delay that helps stabilizing the Bitcoin tests.
+      await this.driver.delay(2000);
     } catch (e) {
       console.log('Timeout while waiting for bitcoin homepage to be loaded', e);
       throw e;
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
index 493bf2948c31..c6fa3bdcae8e 100644
--- a/test/e2e/page-objects/pages/home/homepage.ts
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -103,6 +103,9 @@ class HomePage {
 
   private readonly srpAddedToast = '.toasts-container__banner-base';
 
+  private readonly srpAddedToastCloseButton =
+    '.toasts-container__banner-base button[aria-label="Close"]';
+
   private readonly surveyToast = '[data-testid="survey-toast"]';
 
   private readonly tokensTab = {
@@ -560,6 +563,11 @@ class HomePage {
     // });
   }
 
+  async dismissSrpAddedToast(): Promise<void> {
+    console.log('Dismiss SRP added toast');
+    await this.driver.clickElementSafe(this.srpAddedToastCloseButton, 3000);
+  }
+
   async checkNoSurveyToastIsDisplayed(): Promise<void> {
     console.log('Check no survey toast is displayed on homepage');
     await this.driver.assertElementNotPresent(this.surveyToast, {
diff --git a/test/e2e/page-objects/pages/home/nft-list.ts b/test/e2e/page-objects/pages/home/nft-list.ts
index 329753caa927..5665839b0f86 100644
--- a/test/e2e/page-objects/pages/home/nft-list.ts
+++ b/test/e2e/page-objects/pages/home/nft-list.ts
@@ -39,6 +39,9 @@ class NftListPage {
 
   private readonly nftListItem = '[data-testid="nft-wrapper"]';
 
+  private readonly toastCloseButton =
+    '.toasts-container__banner-base button[aria-label="Close"]';
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -55,6 +58,14 @@ class NftListPage {
   }
 
   async clickNFTIconOnActivityList() {
+    try {
+      await this.driver.waitForSelector(this.toastCloseButton, {
+        timeout: 5000,
+      });
+      await this.driver.clickElement(this.toastCloseButton);
+    } catch {
+      // Toast not present, continue
+    }
     await this.driver.clickElement(this.nftIconOnActivityList);
   }
 
diff --git a/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts b/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
index 2753f4b30deb..f72645acac25 100644
--- a/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
+++ b/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
@@ -21,6 +21,9 @@ class OnboardingPrivacySettingsPage {
   private readonly basicFunctionalityToggle =
     '[data-testid="basic-functionality-toggle"] .toggle-button';
 
+  private readonly basicFunctionalityToggleOffState =
+    '[data-testid="basic-functionality-toggle"] .toggle-button.toggle-button--off';
+
   private readonly basicFunctionalityTurnOffButton =
     '[data-testid="basic-configuration-modal-toggle-button"]';
 
@@ -190,6 +193,9 @@ class OnboardingPrivacySettingsPage {
         (toggle) => toggle.click(),
       ),
     );
+    console.log('Verify all asset privacy toggles are off');
+    await this.driver.assertElementNotPresent(this.assetsPrivacyToggle);
+
     await this.navigateBackToSettingsPage();
   }
 
@@ -203,6 +209,10 @@ class OnboardingPrivacySettingsPage {
     await this.driver.waitForSelector(this.basicFunctionalityTurnOffMessage);
     await this.driver.clickElement(this.basicFunctionalityCheckbox);
     await this.driver.clickElement(this.basicFunctionalityTurnOffButton);
+
+    console.log('Verify basic functionality toggle is off');
+    await this.driver.waitForSelector(this.basicFunctionalityToggleOffState);
+
     await this.navigateBackToSettingsPage();
   }
 }
diff --git a/test/e2e/page-objects/pages/phishing-warning-page.ts b/test/e2e/page-objects/pages/phishing-warning-page.ts
index b5c50e9c83d9..deb494816acd 100644
--- a/test/e2e/page-objects/pages/phishing-warning-page.ts
+++ b/test/e2e/page-objects/pages/phishing-warning-page.ts
@@ -60,16 +60,20 @@ class PhishingWarningPage {
           )) as WebElement;
           await this.driver.switchToFrame(iframe as unknown as string);
           await this.checkPageIsLoaded();
+          await this.driver.clickElement(this.openWarningInNewTabLink);
           return true;
         } catch {
-          // Switch back to default content before retrying, in case we're stuck in the iframe context that was replaced on load
-          await this.driver.switchToDefaultContent();
+          try {
+            // Switch back to default content before retrying, in case we're stuck in the iframe context that was replaced on load
+            await this.driver.switchToDefaultContent();
+          } catch {
+            // context may already be discarded
+          }
           return false;
         }
       },
       { interval: 1000, timeout: 10000 },
     );
-    await this.driver.clickElement(this.openWarningInNewTabLink);
   }
 
   async clickProceedAnywayButton(): Promise<void> {
diff --git a/test/e2e/page-objects/pages/settings/about-page.ts b/test/e2e/page-objects/pages/settings/about-page.ts
index 9e0e8caa0689..1d58e8ebf30b 100644
--- a/test/e2e/page-objects/pages/settings/about-page.ts
+++ b/test/e2e/page-objects/pages/settings/about-page.ts
@@ -3,11 +3,6 @@ import { Driver } from '../../../webdriver/driver';
 class AboutPage {
   private readonly driver: Driver;
 
-  private readonly aboutPageTitle = {
-    text: 'About',
-    tag: 'h4',
-  };
-
   private readonly metaMaskLogo = '.info-tab__logo';
 
   private readonly metaMaskVersionNumber = '.info-tab__version-number';
@@ -19,7 +14,6 @@ class AboutPage {
   async checkPageIsLoaded(): Promise<void> {
     try {
       await this.driver.waitForMultipleSelectors([
-        this.aboutPageTitle,
         this.metaMaskLogo,
         this.metaMaskVersionNumber,
       ]);
diff --git a/test/e2e/page-objects/pages/settings/advanced-settings.ts b/test/e2e/page-objects/pages/settings/advanced-settings.ts
index 5e2f82526bf4..8fb46b4fd0ff 100644
--- a/test/e2e/page-objects/pages/settings/advanced-settings.ts
+++ b/test/e2e/page-objects/pages/settings/advanced-settings.ts
@@ -35,11 +35,13 @@ class AdvancedSettings {
   };
 
   private readonly hexDataToggle = {
-    testId: 'advanced-setting-hex-data',
+    testId: 'transactions-show-hex-data-toggle',
   };
 
-  private readonly showConversionOnTestnetsToggle =
-    '.show-fiat-on-testnets-toggle';
+  private readonly showConversionOnTestnetsToggle = {
+    xpath:
+      "//label[contains(@class,'toggle-button')][.//*[@data-testid='developer-options-show-testnet-conversion-toggle']]",
+  };
 
   private readonly showTestnetsToggle =
     '[data-testid="advanced-setting-show-testnets"] .toggle-button';
diff --git a/test/e2e/page-objects/pages/settings/assets-settings-page.ts b/test/e2e/page-objects/pages/settings/assets-settings-page.ts
new file mode 100644
index 000000000000..625b4edd0270
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/assets-settings-page.ts
@@ -0,0 +1,7 @@
+import PreferencesAndDisplaySettings from './preferences-and-display-settings';
+
+/**
+ * Settings → Assets (Settings V2). Reuses {@link PreferencesAndDisplaySettings}
+ * helpers for `ASSETS_ROUTE` (load assets tab, hide-zero-balance toggle, etc.).
+ */
+export default class AssetsSettingsPage extends PreferencesAndDisplaySettings {}
diff --git a/test/e2e/page-objects/pages/settings/change-password-page.ts b/test/e2e/page-objects/pages/settings/change-password-page.ts
index 1223ff4147d3..fc22eff0c014 100644
--- a/test/e2e/page-objects/pages/settings/change-password-page.ts
+++ b/test/e2e/page-objects/pages/settings/change-password-page.ts
@@ -3,11 +3,6 @@ import { Driver } from '../../../webdriver/driver';
 export default class ChangePasswordPage {
   private readonly driver: Driver;
 
-  private readonly changePasswordPageTitle = {
-    text: 'Change password',
-    css: 'h4',
-  };
-
   private readonly currentPasswordInput =
     '[data-testid="verify-current-password-input"]';
 
@@ -37,7 +32,7 @@ export default class ChangePasswordPage {
 
   async checkPageIsLoaded(): Promise<void> {
     console.log('Check change password page is loaded');
-    await this.driver.waitForSelector(this.changePasswordPageTitle);
+    await this.driver.waitForSelector(this.currentPasswordInput);
   }
 
   async confirmCurrentPassword(password: string): Promise<void> {
diff --git a/test/e2e/page-objects/pages/settings/experimental-settings.ts b/test/e2e/page-objects/pages/settings/experimental-settings.ts
index 524d878232ad..b294167db03e 100644
--- a/test/e2e/page-objects/pages/settings/experimental-settings.ts
+++ b/test/e2e/page-objects/pages/settings/experimental-settings.ts
@@ -8,8 +8,8 @@ class ExperimentalSettings {
     '[data-testid="add-account-snap-toggle-div"]';
 
   private readonly experimentalPageTitle = {
-    text: 'Experimental',
-    tag: 'h4',
+    text: 'Enable "Add account Snap (Beta)"',
+    tag: 'p',
   };
 
   private readonly watchAccountToggleState =
diff --git a/test/e2e/page-objects/pages/settings/general-settings.ts b/test/e2e/page-objects/pages/settings/general-settings.ts
deleted file mode 100644
index 7bec97d11962..000000000000
--- a/test/e2e/page-objects/pages/settings/general-settings.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import { Driver } from '../../../webdriver/driver';
-
-class GeneralSettings {
-  private readonly driver: Driver;
-
-  private readonly blockiesAccountIdenticon = {
-    tag: 'h6',
-    text: 'Blockies',
-  };
-
-  private readonly generalSettingsPageTitle = {
-    text: 'General',
-    tag: 'h4',
-  };
-
-  private readonly hideTokensWithoutBalanceToggle =
-    '[id="toggle-zero-balance"] .toggle-button';
-
-  private readonly jazziconsAccountIdenticon = {
-    tag: 'h6',
-    text: 'Jazzicons',
-  };
-
-  private readonly loadingOverlay = '.loading-overlay';
-
-  private readonly loadingOverlaySpinner = '.loading-overlay__spinner';
-
-  private readonly selectLanguageField = '[data-testid="locale-select"]';
-
-  private readonly identicons = {
-    maskicon: '[data-testid="maskicon_icon"]',
-    blockies: '[data-testid="blockie_icon"]',
-    jazzicon: '[data-testid="jazz_icon"]',
-  };
-
-  private readonly toggleNativeTokenAsMainBalance =
-    '[id="toggle-show-native-token-as-main-balance"] .toggle-button';
-
-  private readonly showDefaultAddressToggle =
-    '[id="show-default-address"] .toggle-button';
-
-  constructor(driver: Driver) {
-    this.driver = driver;
-  }
-
-  /**
-   * Check if the General Settings page is loaded
-   */
-  async checkPageIsLoaded(): Promise<void> {
-    try {
-      await this.checkNoLoadingOverlaySpinner();
-      await this.driver.waitForMultipleSelectors([
-        this.generalSettingsPageTitle,
-        this.selectLanguageField,
-      ]);
-    } catch (e) {
-      console.log(
-        'Timeout while waiting for General Settings page to be loaded',
-        e,
-      );
-      throw e;
-    }
-    console.log('General Settings page is loaded');
-  }
-
-  /**
-   * Change the language of MM on General Settings page
-   *
-   * @param languageToSelect - The language to select
-   */
-  async changeLanguage(languageToSelect: string): Promise<void> {
-    console.log(
-      'Changing language to ',
-      languageToSelect,
-      'on general settings page',
-    );
-    await this.checkNoLoadingOverlaySpinner();
-    // We use send keys, because clicking the dropdown causes flakiness, if it's not auto closed after selecting the language
-    const dropdown = await this.driver.findElement(this.selectLanguageField);
-    await dropdown.sendKeys(languageToSelect);
-    await this.checkNoLoadingOverlaySpinner();
-  }
-
-  /**
-   * Verify that both Jazzicon and Blockies options are visible
-   */
-  async checkIdenticonOptionsAreDisplayed(): Promise<void> {
-    console.log(
-      'Checking if identicon options are displayed on general settings page',
-    );
-    await this.driver.waitForSelector(this.jazziconsAccountIdenticon);
-    await this.driver.waitForSelector(this.blockiesAccountIdenticon);
-  }
-
-  /**
-   * Check if the specified identicon type is active
-   *
-   * @param identicon - The type of identicon to check ('maskicon' or 'jazzicon' or 'blockies')
-   */
-  async checkIdenticonIsActive(
-    identicon: 'maskicon' | 'jazzicon' | 'blockies',
-  ): Promise<void> {
-    console.log(
-      `Checking if ${identicon} identicon is active on general settings page`,
-    );
-
-    const activeSelector = this.identicons[identicon];
-    await this.driver.waitForSelector(activeSelector);
-  }
-
-  async assertLoadingOverlayNotPresent(): Promise<void> {
-    await this.driver.assertElementNotPresent(this.loadingOverlay);
-  }
-
-  async checkNoLoadingOverlaySpinner(): Promise<void> {
-    await this.driver.assertElementNotPresent(this.loadingOverlaySpinner);
-  }
-
-  async toggleHideTokensWithoutBalance(): Promise<void> {
-    await this.driver.clickElement(this.hideTokensWithoutBalanceToggle);
-  }
-
-  async toggleShowNativeTokenAsMainBalance(): Promise<void> {
-    await this.driver.clickElement(this.toggleNativeTokenAsMainBalance);
-  }
-
-  async toggleShowDefaultAddress(): Promise<void> {
-    await this.driver.clickElement(this.showDefaultAddressToggle);
-  }
-
-  async checkShowDefaultAddressSectionIsDisplayed(): Promise<void> {
-    await this.driver.waitForSelector(this.showDefaultAddressToggle);
-  }
-
-  async checkShowDefaultAddressSectionIsNotDisplayed(): Promise<void> {
-    await this.driver.assertElementNotPresent(this.showDefaultAddressToggle);
-  }
-}
-
-export default GeneralSettings;
diff --git a/test/e2e/page-objects/pages/settings/notifications-settings-page.ts b/test/e2e/page-objects/pages/settings/notifications-settings-page.ts
index 66a98e992943..e46d25f08f57 100644
--- a/test/e2e/page-objects/pages/settings/notifications-settings-page.ts
+++ b/test/e2e/page-objects/pages/settings/notifications-settings-page.ts
@@ -5,11 +5,6 @@ import { shortenAddress } from '../../../../../ui/helpers/utils/util';
 class NotificationsSettingsPage {
   private driver: Driver;
 
-  private readonly notificationsSettingsPageTitle = {
-    text: 'Notifications',
-    css: '.tab-bar__tab__content__title',
-  };
-
   private readonly allowNotificationsToggle =
     '[data-testid="notifications-settings-allow-toggle-box"]';
 
@@ -48,7 +43,6 @@ class NotificationsSettingsPage {
   async checkPageIsLoaded(): Promise<void> {
     try {
       await this.driver.waitForMultipleSelectors([
-        this.notificationsSettingsPageTitle,
         this.allowNotificationsToggle,
       ]);
     } catch (e) {
diff --git a/test/e2e/page-objects/pages/settings/preferences-and-display-settings.ts b/test/e2e/page-objects/pages/settings/preferences-and-display-settings.ts
new file mode 100644
index 000000000000..4f28206f8474
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/preferences-and-display-settings.ts
@@ -0,0 +1,174 @@
+import { Driver } from '../../../webdriver/driver';
+import {
+  ACCOUNT_IDENTICON_ROUTE,
+  LANGUAGE_ROUTE,
+} from '../../../../../ui/helpers/constants/routes';
+
+class PreferencesAndDisplaySettings {
+  private readonly driver: Driver;
+
+  private readonly preferencesTabButton =
+    '[data-testid="settings-v2-tab-item-preferences-and-display"]';
+
+  private readonly assetsTabButton =
+    '[data-testid="settings-v2-tab-item-assets"]';
+
+  private readonly languageSubpageLink = `a[href="#${LANGUAGE_ROUTE}"]`;
+
+  private readonly accountIdenticonSubpageLink = `a[href="#${ACCOUNT_IDENTICON_ROUTE}"]`;
+
+  /**
+   * Hidden checkbox; click the wrapping label (same pattern as native-token toggle).
+   */
+  private readonly hideTokensWithoutBalanceToggleLabel =
+    "label.toggle-button:has([data-testid='toggle-zero-balance-button'])";
+
+  private readonly loadingOverlay = '.loading-overlay';
+
+  private readonly loadingOverlaySpinner = '.loading-overlay__spinner';
+
+  private readonly localeSelectList = '[data-testid="locale-select-list"]';
+
+  private readonly accountIdenticonList =
+    '[data-testid="account-identicon-list"]';
+
+  private readonly identicons = {
+    maskicon: '[data-testid="account-identicon-option-maskicon"]',
+    blockies: '[data-testid="account-identicon-option-blockies"]',
+    jazzicon: '[data-testid="account-identicon-option-jazzicon"]',
+  };
+
+  /**
+   * Visible toggle: `data-testid="show-native-token-as-main-balance"` is on the
+   * hidden input inside ToggleButton; click the wrapping label.
+   */
+  private readonly showNativeTokenAsMainBalanceToggleLabel =
+    "label.toggle-button:has([data-testid='show-native-token-as-main-balance'])";
+
+  private readonly showDefaultAddressToggle =
+    '[data-testid="show-default-address-toggle"]';
+
+  private readonly showDefaultAddressToggleLabel =
+    "label.toggle-button:has([data-testid='show-default-address-toggle'])";
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async checkPageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.clickElement(this.preferencesTabButton);
+      await this.checkNoLoadingOverlaySpinner();
+      await this.driver.waitForMultipleSelectors([this.languageSubpageLink]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Preferences and Display settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Preferences and Display settings page is loaded');
+  }
+
+  async checkAssetsPageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.clickElement(this.assetsTabButton);
+      await this.driver.waitForMultipleSelectors([
+        this.showNativeTokenAsMainBalanceToggleLabel,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Assets settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Assets settings page is loaded');
+  }
+
+  async changeLanguage(languageToSelect: string): Promise<void> {
+    console.log(
+      'Changing language to ',
+      languageToSelect,
+      'on preferences and display settings page',
+    );
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.clickElement(this.languageSubpageLink);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.waitForSelector(this.localeSelectList);
+    await this.driver.clickElement({ text: languageToSelect });
+    await this.checkNoLoadingOverlaySpinner();
+  }
+
+  async checkIdenticonOptionsAreDisplayed(): Promise<void> {
+    console.log(
+      'Checking if identicon options are displayed on preferences and display settings page',
+    );
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.clickElement(this.accountIdenticonSubpageLink);
+    await this.driver.waitForSelector(this.accountIdenticonList);
+    await this.driver.waitForSelector(
+      '[data-testid="account-identicon-option-blockies"]',
+    );
+    await this.driver.waitForSelector(
+      '[data-testid="account-identicon-option-jazzicon"]',
+    );
+  }
+
+  async checkIdenticonIsActive(
+    identicon: 'maskicon' | 'jazzicon' | 'blockies',
+  ): Promise<void> {
+    console.log(
+      `Checking if ${identicon} identicon is active on preferences and display settings page`,
+    );
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.clickElement(this.accountIdenticonSubpageLink);
+    await this.driver.waitForSelector(this.accountIdenticonList);
+    const activeSelector = this.identicons[identicon];
+    await this.driver.waitForSelector(activeSelector);
+  }
+
+  async assertLoadingOverlayNotPresent(): Promise<void> {
+    await this.driver.assertElementNotPresent(this.loadingOverlay);
+  }
+
+  async checkNoLoadingOverlaySpinner(): Promise<void> {
+    await this.driver.assertElementNotPresent(this.loadingOverlaySpinner);
+  }
+
+  async toggleHideTokensWithoutBalance(): Promise<void> {
+    await this.checkAssetsPageIsLoaded();
+    await this.driver.clickElement(this.hideTokensWithoutBalanceToggleLabel);
+  }
+
+  async toggleShowNativeTokenAsMainBalance(): Promise<void> {
+    await this.checkAssetsPageIsLoaded();
+    await this.driver.clickElement(
+      this.showNativeTokenAsMainBalanceToggleLabel,
+    );
+  }
+
+  async toggleShowDefaultAddress(): Promise<void> {
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.waitForSelector(this.showDefaultAddressToggleLabel);
+    await this.driver.clickElement(this.showDefaultAddressToggleLabel);
+  }
+
+  async checkShowDefaultAddressSectionIsDisplayed(): Promise<void> {
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.waitForSelector(this.showDefaultAddressToggle);
+  }
+
+  async checkShowDefaultAddressSectionIsNotDisplayed(): Promise<void> {
+    await this.driver.clickElement(this.preferencesTabButton);
+    await this.checkNoLoadingOverlaySpinner();
+    await this.driver.assertElementNotPresent(this.showDefaultAddressToggle);
+  }
+}
+
+export default PreferencesAndDisplaySettings;
diff --git a/test/e2e/page-objects/pages/settings/preinstalled-example-settings.ts b/test/e2e/page-objects/pages/settings/preinstalled-example-settings.ts
index 22835a806276..875ce4a5b485 100644
--- a/test/e2e/page-objects/pages/settings/preinstalled-example-settings.ts
+++ b/test/e2e/page-objects/pages/settings/preinstalled-example-settings.ts
@@ -4,8 +4,8 @@ class PreinstalledExampleSettings {
   private readonly driver: Driver;
 
   private readonly settingsPageTitle = {
-    text: 'General',
-    tag: 'h4',
+    text: 'Preferences and display',
+    tag: 'p',
   };
 
   private readonly snapRenderPanel = '.snap-ui-renderer__panel';
diff --git a/test/e2e/page-objects/pages/settings/privacy-settings.ts b/test/e2e/page-objects/pages/settings/privacy-settings.ts
index a5100c2612a2..88a60e89aaa0 100644
--- a/test/e2e/page-objects/pages/settings/privacy-settings.ts
+++ b/test/e2e/page-objects/pages/settings/privacy-settings.ts
@@ -1,5 +1,6 @@
 import { Driver } from '../../../webdriver/driver';
 import { tEn } from '../../../../lib/i18n-helpers';
+import { THIRD_PARTY_APIS_ROUTE } from '../../../../../ui/helpers/constants/routes';
 
 class PrivacySettings {
   private readonly driver: Driver;
@@ -13,6 +14,10 @@ class PrivacySettings {
   private readonly blockaidAlertsToggle =
     '[data-testid="securityAlert"] .toggle-button';
 
+  /** Security alerts (Blockaid) live under Transactions in Settings V2, not Privacy. */
+  private readonly settingsTransactionsTab =
+    '[data-testid="settings-v2-tab-item-transactions"]';
+
   private readonly closeRevealSrpDialogButton = {
     text: tEn('close'),
     tag: 'button',
@@ -29,19 +34,24 @@ class PrivacySettings {
   private readonly dataCollectionForMarketingToggle =
     '[data-testid="data-collection-for-marketing-toggle"] .toggle-button';
 
-  private readonly dataCollectionWarningAckButton = {
-    text: 'Okay',
-    tag: 'button',
-  };
-
-  private readonly dataCollectionWarningMessage = {
-    text: 'You turned off data collection for our marketing purposes. This only applies to this device. ',
-    tag: 'p',
-  };
-
   private readonly deleteMetaMetricsDataButton =
     '[data-testid="delete-metametrics-data-button"]';
 
+  private readonly downloadStateLogsButton =
+    '[data-testid="advanced-setting-state-logs-button"]';
+
+  private readonly downloadStateLogsModalRoot =
+    '[data-testid="download-state-logs-modal"]';
+
+  private readonly downloadStateLogsModalButton =
+    '[data-testid="download-state-logs-modal-button"]';
+
+  private readonly exportYourDataButton =
+    '[data-testid="privacy-tab-export-your-data-button"]';
+
+  private readonly exportYourDataModalDownloadButton =
+    '[data-testid="export-your-data-modal-download-button"]';
+
   private readonly deleteMetaMetricsModalTitle = {
     text: 'Delete MetaMetrics data?',
     tag: 'h4',
@@ -53,11 +63,21 @@ class PrivacySettings {
   private readonly ipfsGatewayToggle =
     '[data-testid="ipfsToggle"] .toggle-button';
 
-  private readonly privacySettingsPageTitle = {
-    text: 'Security & privacy',
-    tag: 'h4',
+  private readonly privacySettingsLoadedMarker = {
+    xpath:
+      "//label[contains(@class,'toggle-button')][.//*[@data-testid='basic-functionality-toggle']]",
   };
 
+  private readonly securityAndPasswordSettingsLoadedMarker =
+    '[data-testid="reveal-seed-words"]';
+
+  private readonly selectSrpContainer = '[data-testid="select-srp-container"]';
+
+  private readonly privacyTabButton =
+    '[data-testid="settings-v2-tab-item-privacy"]';
+
+  private readonly thirdPartyApisSubpageLink = `a[href="#${THIRD_PARTY_APIS_ROUTE}"]`;
+
   // reveal SRP related locators
   private readonly displayedSrpText = '[data-testid="recovery-phrase-chip-0"]';
 
@@ -139,7 +159,7 @@ class PrivacySettings {
 
   async checkPageIsLoaded(): Promise<void> {
     try {
-      await this.driver.waitForSelector(this.privacySettingsPageTitle);
+      await this.driver.waitForSelector(this.privacySettingsLoadedMarker);
     } catch (e) {
       console.log(
         'Timeout while waiting for Privacy & Security Settings page to be loaded',
@@ -150,13 +170,44 @@ class PrivacySettings {
     console.log('Privacy & Security Settings page is loaded');
   }
 
+  async checkSecurityAndPasswordPageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForSelector(
+        this.securityAndPasswordSettingsLoadedMarker,
+      );
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Security and password settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Security and password settings page is loaded');
+  }
+
   async checkSrpListIsLoaded(): Promise<void> {
     console.log('Check SRP list is loaded on privacy settings page');
-    const srpSelector = {
-      text: `Secret Recovery Phrase 1`,
-      tag: 'p',
-    };
-    await this.driver.waitForSelector(srpSelector);
+    await this.driver.waitForSelector(this.selectSrpContainer);
+  }
+
+  async downloadStateLogs(): Promise<void> {
+    console.log('Downloading state logs on privacy settings page');
+    await this.driver.findScrollToAndClickElement(this.downloadStateLogsButton);
+    await this.driver.waitForSelector(this.downloadStateLogsModalRoot);
+    await this.driver.waitForSelector(this.downloadStateLogsModalButton);
+    await this.driver.clickElement(this.downloadStateLogsModalButton);
+  }
+
+  /**
+   * Settings V2 Privacy → Export your data: opens confirmation modal then downloads
+   * the JSON backup (preferences, accounts, address book, networks) from `backupUserData`.
+   */
+  async exportYourData(): Promise<void> {
+    console.log(
+      'Exporting user data (account settings backup) on privacy settings page',
+    );
+    await this.driver.clickElement(this.exportYourDataButton);
+    await this.driver.clickElement(this.exportYourDataModalDownloadButton);
   }
 
   async deleteMetaMetrics(): Promise<void> {
@@ -264,25 +315,24 @@ class PrivacySettings {
 
   async openRevealSrpQuiz(srpIndex: number = 1): Promise<void> {
     await this.openSrpList();
-    // We only pass in the srpIndex when there are multiple SRPs
-    const srpSelector = {
+    await this.driver.waitForSelector(this.selectSrpContainer);
+    await this.driver.clickElement({
+      css: '.select-srp__container',
       text: `Secret Recovery Phrase ${srpIndex.toString()}`,
-      tag: 'p',
-    };
-    await this.driver.clickElement(srpSelector);
+    });
 
     await this.driver.waitForSelector(this.revealSrpQuizModalTitle);
   }
 
+  /**
+   * Settings V2 does not show the legacy “device only” popover when opting out;
+   * this only toggles the control off.
+   */
   async optOutDataCollectionForMarketing(): Promise<void> {
     console.log(
       'Opt out data collection for marketing on privacy settings page',
     );
     await this.toggleDataCollectionForMarketing({ targetState: 'off' });
-    await this.driver.waitForSelector(this.dataCollectionWarningMessage);
-    await this.driver.clickElementAndWaitToDisappear(
-      this.dataCollectionWarningAckButton,
-    );
   }
 
   async toggleAutodetectNft(): Promise<void> {
@@ -292,6 +342,8 @@ class PrivacySettings {
 
   async toggleBlockaidAlerts(): Promise<void> {
     console.log('Toggle blockaid alerts on privacy settings page');
+    await this.driver.clickElement(this.settingsTransactionsTab);
+    await this.driver.waitForSelector(this.blockaidAlertsToggle);
     await this.driver.clickElement(this.blockaidAlertsToggle);
   }
 
@@ -305,27 +357,36 @@ class PrivacySettings {
     await this.driver.clickElement(this.ipfsGatewayToggle);
   }
 
+  /**
+   * Opens Third-party APIs (nested under Privacy) by clicking the sidebar Privacy
+   * tab when needed, then the in-page link — same path a user takes in Settings V2.
+   */
+  async goToThirdPartyApisSettings(): Promise<void> {
+    console.log('Go to Third-party APIs settings page');
+    await this.driver.clickElement(this.privacyTabButton);
+    await this.checkPageIsLoaded();
+    await this.driver.clickElement(this.thirdPartyApisSubpageLink);
+    await this.driver.waitForSelector(this.ipfsGatewayToggle);
+  }
+
   async toggleNetworkDetailsCheck(): Promise<void> {
     console.log('Toggle network details check on privacy settings page');
+    await this.goToThirdPartyApisSettings();
+    await this.driver.waitForSelector(this.networkDetailsCheckToggle);
     await this.driver.clickElement(this.networkDetailsCheckToggle);
   }
 
   /**
-   * Checks if the delete MetaMetrics data button is enabled on privacy settings page.
-   *
+   * Waits until the Delete MetaMetrics data button reaches the expected enabled/disabled state.
+   * Prefer this over reading `isEnabled()` immediately to avoid flakes on slow CI.
+   * @param expectedState
    */
-  async checkDeleteMetaMetricsDataButtonEnabled(): Promise<boolean> {
-    try {
-      await this.driver.findClickableElement(this.deleteMetaMetricsDataButton, {
-        waitAtLeastGuard: 2000,
-        timeout: 5000,
-      });
-    } catch (e) {
-      console.log('Delete MetaMetrics data button not enabled', e);
-      return false;
-    }
-    console.log('Delete MetaMetrics data button is enabled');
-    return true;
+  async waitForDeleteMetaMetricsDataButtonState(
+    expectedState: 'enabled' | 'disabled',
+  ): Promise<void> {
+    await this.driver.waitForSelector(this.deleteMetaMetricsDataButton, {
+      state: expectedState,
+    });
   }
 
   async checkDisplayedSrpCanBeCopied(): Promise<void> {
diff --git a/test/e2e/page-objects/pages/settings/settings-page.ts b/test/e2e/page-objects/pages/settings/settings-page.ts
index 1a8e7ccdaf42..126588499780 100644
--- a/test/e2e/page-objects/pages/settings/settings-page.ts
+++ b/test/e2e/page-objects/pages/settings/settings-page.ts
@@ -1,73 +1,124 @@
+import HomePage from '../home/homepage';
 import { Driver } from '../../../webdriver/driver';
 
 class SettingsPage {
   private readonly driver: Driver;
 
-  private readonly aboutViewButton = {
-    text: 'About',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly aboutViewButton =
+    '[data-testid="settings-v2-tab-item-about-us"]';
 
-  private readonly closeSettingsPageButton =
-    '.settings-page__header__title-container__close-button';
+  private readonly autoLockSettingsButton = '[data-testid="auto-lock-button"]';
 
-  private readonly developerOptionsButton = {
-    text: 'Developer options',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly assetsSettingsButton =
+    '[data-testid="settings-v2-tab-item-assets"]';
 
-  private readonly experimentalSettingsButton = {
-    text: 'Experimental',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly developerToolsSettingsButton =
+    '[data-testid="settings-v2-tab-item-developer-tools"]';
+
+  /** Full internal developer options (crash, remote flags, etc.); see `debug-tab.tsx`. */
+  private readonly debugSettingsButton =
+    '[data-testid="settings-v2-tab-item-debug"]';
+
+  private readonly experimentalSettingsButton =
+    '[data-testid="settings-v2-tab-item-experimental"]';
 
   private readonly noMatchingResultsFoundMessage = {
-    text: 'No matching results found',
-    tag: 'span',
+    text: 'No matching results found.',
   };
 
-  private readonly privacySettingsButton = {
-    text: 'Security & privacy',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly privacySettingsButton =
+    '[data-testid="settings-v2-tab-item-privacy"]';
 
-  private readonly preInstalledExampleButton = {
-    text: 'Preinstalled Example Snap',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly securityAndPasswordSettingsButton =
+    '[data-testid="settings-v2-tab-item-security-and-password"]';
 
   private readonly searchResultItem =
-    '.settings-page__header__search__list__item__tab';
+    '[data-testid="settings-v2-search-result-item"]';
 
-  private readonly searchSettingsInput = '#search-settings';
+  private readonly searchSettingsInput =
+    '[data-testid="settings-v2-header-search-input"]';
 
-  private readonly settingsPageTitle = {
-    text: 'Settings',
-    css: 'h3',
-  };
+  private readonly searchButton =
+    '[data-testid="settings-v2-header-search-button"]';
 
-  private readonly notificationsSettingsButton = {
-    text: 'Notifications',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly settingsPageRoot = '[data-testid="settings-v2-root"]';
+
+  private readonly settingsPageFullscreenRoot =
+    '[data-testid="settings-v2-tab-bar-grouped"]';
+
+  private readonly notificationsSettingsButton =
+    '[data-testid="settings-v2-tab-item-notifications"]';
+
+  private readonly backupAndSyncSettingsButton =
+    '[data-testid="settings-v2-tab-item-backup-and-sync"]';
 
-  private readonly backupAndSyncSettingsButton = {
-    text: 'Backup and sync',
-    css: '.tab-bar__tab__content__title',
+  private readonly showNativeTokenAsMainBalanceToggleLabel = {
+    xpath:
+      "//label[contains(@class,'toggle-button')][.//*[@data-testid='show-native-token-as-main-balance']]",
   };
 
-  private readonly transactionShieldButton = {
-    text: 'Transaction Shield',
-    css: '.tab-bar__tab__content__title',
+  private readonly showFiatOnTestnetsToggleLabel = {
+    xpath:
+      "//label[contains(@class,'toggle-button')][.//*[@data-testid='developer-options-show-testnet-conversion-toggle']]",
   };
 
+  private readonly transactionsSettingsButton =
+    '[data-testid="settings-v2-tab-item-transactions"]';
+
+  private readonly transactionShieldButton =
+    '[data-testid="settings-v2-tab-item-transaction-shield"]';
+
+  private readonly preinstalledExampleSnapSidebarItem = {
+    text: 'Preinstalled Example Snap',
+    tag: 'p',
+  } as const;
+
+  private readonly autoLockOptionsList =
+    '[data-testid="auto-lock-options-list"]';
+
+  private readonly autoLockOptionQuarterMinute =
+    '[data-testid="auto-lock-option-0.25"]';
+
+  private readonly developerOptionsDeleteActivityAndNonceData =
+    '[data-testid="developer-options-delete-activity-and-nonce-data"]';
+
+  private readonly deleteActivityAndNonceModal =
+    '[data-testid="delete-activity-and-nonce-data-modal"]';
+
+  private readonly deleteActivityAndNonceConfirmButton =
+    '[data-testid="delete-activity-and-nonce-data-button"]';
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
 
   async checkPageIsLoaded(): Promise<void> {
     console.log('Check settings page is loaded');
-    await this.driver.waitForSelector(this.settingsPageTitle);
+    await this.driver.wait(async () => {
+      return await this.isOnSettingsPage();
+    });
+  }
+
+  async hasElement(
+    locator: string | { css?: string; text?: string; tag?: string },
+  ) {
+    const elements = await this.driver.findElements(locator);
+    return elements.length > 0;
+  }
+
+  async isOnSettingsPage() {
+    return await this.hasElement(this.settingsPageFullscreenRoot);
+  }
+
+  /**
+   * Navigates to wallet home (`/` — same path as app `DEFAULT_ROUTE`) and
+   * waits for the home page. Kept E2E-local to avoid importing `ui` routes.
+   */
+  async clickBackButton(): Promise<void> {
+    await this.driver.executeScript(
+      `window.location.hash = ${JSON.stringify('/')}`,
+    );
+    await new HomePage(this.driver).checkPageIsLoaded();
   }
 
   async waitForTransactionShieldButtonReady(): Promise<void> {
@@ -83,43 +134,70 @@ class SettingsPage {
     await this.driver.clickElement(this.transactionShieldButton);
   }
 
-  async clickAdvancedTab(): Promise<void> {
-    console.log('Clicking on Advanced tab');
-    await this.driver.clickElement({
-      css: '.tab-bar__tab__content__title',
-      text: 'Advanced',
-    });
+  /**
+   * Legacy V1 "Advanced" tab does not exist in Settings V2. Uses Developer Tools
+   * tab (closest surface for former advanced-style controls).
+   */
+  async goToAdvancedSettings(): Promise<void> {
+    console.log('Navigating to Advanced Settings page (Developer Tools in V2)');
+    await this.goToDeveloperOptions();
   }
 
   async fillSearchSettingsInput(text: string): Promise<void> {
     console.log(`Filling search settings input with ${text}`);
+    await this.openSearch();
+    await this.driver.waitForSelector(this.searchSettingsInput);
     await this.driver.fill(this.searchSettingsInput, text);
   }
 
+  async openSearch(): Promise<void> {
+    console.log('Opening settings search');
+    await this.driver.clickElement(this.searchButton);
+    await this.driver.waitForSelector(this.searchSettingsInput);
+    console.log('Search input is opened');
+  }
+
   async toggleShowFiatOnTestnets(): Promise<void> {
     console.log('Toggling Show Fiat on Testnets setting');
-    await this.driver.clickElement(
-      '.toggle-button.show-fiat-on-testnets-toggle',
-    );
+    await this.driver.waitForSelector(this.showFiatOnTestnetsToggleLabel);
+    await this.driver.clickElement(this.showFiatOnTestnetsToggleLabel);
   }
 
-  async toggleBalanceSetting(): Promise<void> {
-    console.log('Toggling balance setting');
+  async goToPreInstalledExample(): Promise<void> {
+    console.log('Navigating to Preinstalled Example Snap settings page');
+    await this.driver.clickElement(this.preinstalledExampleSnapSidebarItem);
+  }
+
+  async waitForAutoLockOptionsList(): Promise<void> {
+    await this.driver.waitForSelector(this.autoLockOptionsList);
+  }
+
+  async selectQuarterMinuteAutoLockOption(): Promise<void> {
+    await this.driver.clickElement(this.autoLockOptionQuarterMinute);
+  }
+
+  async clickDeveloperOptionsDeleteActivityAndNonceData(): Promise<void> {
     await this.driver.clickElement(
-      '.toggle-button.show-native-token-as-main-balance',
+      this.developerOptionsDeleteActivityAndNonceData,
     );
   }
 
-  async exitSettings(): Promise<void> {
-    console.log('Exiting settings page');
-    await this.driver.clickElement(
-      '.settings-page__header__title-container__close-button',
+  async confirmDeleteActivityAndNonceModal(): Promise<void> {
+    await this.driver.waitForSelector(this.deleteActivityAndNonceModal);
+    await this.driver.clickElementAndWaitToDisappear(
+      this.deleteActivityAndNonceConfirmButton,
     );
   }
 
-  async closeSettingsPage(): Promise<void> {
-    console.log('Closing Settings page');
-    await this.driver.clickElement(this.closeSettingsPageButton);
+  async toggleBalanceSetting(): Promise<void> {
+    console.log('Toggling balance setting');
+    await this.goToAssetsSettings();
+    await this.driver.waitForSelector(
+      this.showNativeTokenAsMainBalanceToggleLabel,
+    );
+    await this.driver.clickElement(
+      this.showNativeTokenAsMainBalanceToggleLabel,
+    );
   }
 
   async goToAboutPage(): Promise<void> {
@@ -127,9 +205,36 @@ class SettingsPage {
     await this.driver.clickElement(this.aboutViewButton);
   }
 
+  async goToAssetsSettings(): Promise<void> {
+    console.log('Navigating to Assets Settings page');
+    await this.driver.clickElement(this.assetsSettingsButton);
+  }
+
+  async goToAutoLockSettings(): Promise<void> {
+    console.log('Navigating to Auto-lock settings page');
+    await this.driver.clickElement(this.autoLockSettingsButton);
+  }
+
+  /**
+   * Opens the Developer Tools tab (fiat on testnets, clear activity, etc.).
+   */
   async goToDeveloperOptions(): Promise<void> {
-    console.log('Navigating to Developer options page');
-    await this.driver.clickElement(this.developerOptionsButton);
+    console.log('Navigating to Developer Tools page');
+    await this.driver.clickElement(this.developerToolsSettingsButton);
+  }
+
+  /**
+   * Opens the Debug tab, which embeds the legacy developer options page (crash
+   * generator, remote feature flags display, etc.).
+   */
+  async goToDebugSettings(): Promise<void> {
+    console.log('Navigating to Debug settings page');
+    await this.driver.clickElement(this.debugSettingsButton);
+  }
+
+  async goToSecurityAndPasswordSettings(): Promise<void> {
+    console.log('Navigating to Security and password page');
+    await this.driver.clickElement(this.securityAndPasswordSettingsButton);
   }
 
   async goToExperimentalSettings(): Promise<void> {
@@ -142,11 +247,6 @@ class SettingsPage {
     await this.driver.clickElement(this.privacySettingsButton);
   }
 
-  async goToPreInstalledExample(): Promise<void> {
-    console.log('Navigating to Preinstalled Example Snap settings page');
-    await this.driver.clickElement(this.preInstalledExampleButton);
-  }
-
   async goToNotificationsSettings(): Promise<void> {
     console.log('Navigating to Notifications Settings page');
     await this.driver.clickElement(this.notificationsSettingsButton);
@@ -157,6 +257,11 @@ class SettingsPage {
     await this.driver.clickElement(this.backupAndSyncSettingsButton);
   }
 
+  async goToTransactionsSettings(): Promise<void> {
+    console.log('Navigating to Transactions Settings page');
+    await this.driver.clickElement(this.transactionsSettingsButton);
+  }
+
   async goToSearchResultPage(page: string): Promise<void> {
     console.log(`Navigating to ${page} settings page from search results`);
     await this.driver.clickElement({
diff --git a/test/e2e/page-objects/pages/settings/shield/shield-claim-page.ts b/test/e2e/page-objects/pages/settings/shield/shield-claim-page.ts
index 136dc3d854e8..147ed35b0bbe 100644
--- a/test/e2e/page-objects/pages/settings/shield/shield-claim-page.ts
+++ b/test/e2e/page-objects/pages/settings/shield/shield-claim-page.ts
@@ -15,7 +15,8 @@ export default class ShieldClaimPage {
     text: accountName,
   });
 
-  private readonly backButton = '[data-testid="settings-back-button"]';
+  private readonly backButton =
+    '[data-testid="settings-v2-header-back-button"]';
 
   private readonly claimErrorToast = '[data-testid="claim-submit-toast-error"]';
 
diff --git a/test/e2e/page-objects/pages/settings/transactions-settings.ts b/test/e2e/page-objects/pages/settings/transactions-settings.ts
new file mode 100644
index 000000000000..db751d4d9cb3
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/transactions-settings.ts
@@ -0,0 +1,28 @@
+import { Driver } from '../../../webdriver/driver';
+
+export default class TransactionsSettingsPage {
+  private readonly driver: Driver;
+
+  private readonly hexDataToggle =
+    '[data-testid="transactions-settings-hex-data-toggle"] .toggle-button';
+
+  private readonly securityAlertSection = '[data-testid="securityAlert"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async waitForSecurityAlertsSection(): Promise<void> {
+    await this.driver.waitForSelector(this.securityAlertSection);
+  }
+
+  async checkPageIsLoaded(): Promise<void> {
+    console.log('Check transactions settings page is loaded');
+    await this.driver.waitForSelector(this.hexDataToggle);
+  }
+
+  async toggleOnHexData(): Promise<void> {
+    console.log('Toggling on hex data in transactions settings');
+    await this.driver.clickElement(this.hexDataToggle);
+  }
+}
diff --git a/test/e2e/page-objects/pages/swap/swap-page.ts b/test/e2e/page-objects/pages/swap/swap-page.ts
index 7c148ed0eabe..b2f071fd60b2 100644
--- a/test/e2e/page-objects/pages/swap/swap-page.ts
+++ b/test/e2e/page-objects/pages/swap/swap-page.ts
@@ -49,7 +49,7 @@ class SwapPage {
   private readonly assetPickerSearchInput =
     '[data-testid="bridge-asset-picker-search-input"]';
 
-  private readonly bridgeAsset = '[data-testid="bridge-asset"]';
+  private readonly bridgeAsset = '[data-testid^="bridge-asset--"]';
 
   private readonly moreQuotesButton = '[aria-label="More quotes"]';
 
diff --git a/test/e2e/page-objects/pages/token-overview-page.ts b/test/e2e/page-objects/pages/token-overview-page.ts
index 74e3606229fe..a9e16673cacd 100644
--- a/test/e2e/page-objects/pages/token-overview-page.ts
+++ b/test/e2e/page-objects/pages/token-overview-page.ts
@@ -25,6 +25,8 @@ class TokenOverviewPage {
     tag: 'div',
   };
 
+  private readonly backButton = '.asset-page__back-button';
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -67,6 +69,10 @@ class TokenOverviewPage {
       this.viewAssetInExplorerButton,
     );
   }
+
+  async clickBack(): Promise<void> {
+    await this.driver.clickElement(this.backButton);
+  }
 }
 
 export default TokenOverviewPage;
diff --git a/test/e2e/playwright/llm-workflow/launcher/state-inspector.js b/test/e2e/playwright/llm-workflow/launcher/state-inspector.js
new file mode 100644
index 000000000000..d2c258916ae5
--- /dev/null
+++ b/test/e2e/playwright/llm-workflow/launcher/state-inspector.js
@@ -0,0 +1,85 @@
+'use strict';
+
+/**
+ * JS stub for state-inspector — mirrors the TypeScript original.
+ * Used by cdp-session-manager.js in the recipe runner.
+ */
+
+async function detectCurrentScreen(page) {
+  if (!page) {
+    return 'unknown';
+  }
+
+  const url = page.url();
+  const hash = url.split('#')[1] ?? '';
+  const hashPath = hash.split(/[?#]/u)[0] || hash;
+
+  const routeMap = [
+    ['/send', 'send'],
+    ['/cross-chain/prepare-swap', 'swap'],
+    ['/confirm-transaction/signature-request', 'confirm-signature'],
+    ['/confirm-transaction', 'confirm-transaction'],
+    ['/confirmation', 'confirmation'],
+    ['/connect', 'connect'],
+    ['/settings', 'settings'],
+    ['/unlock', 'unlock'],
+  ];
+
+  for (const [route, screen] of routeMap) {
+    if (
+      hashPath === route ||
+      hashPath.startsWith(`${route}/`) ||
+      url.includes(route)
+    ) {
+      return screen;
+    }
+  }
+
+  // DOM fallback
+  const selectors = [
+    ['[data-testid="unlock-password"]', 'unlock'],
+    ['[data-testid="account-menu-icon"]', 'home'],
+    ['[data-testid="settings-page"]', 'settings'],
+    ['[data-testid="get-started"]', 'onboarding-welcome'],
+  ];
+
+  for (const [selector, screen] of selectors) {
+    const visible = await page
+      .locator(selector)
+      .isVisible({ timeout: 500 })
+      .catch(() => false);
+    if (visible) {
+      return screen;
+    }
+  }
+
+  return 'unknown';
+}
+
+async function getExtensionState(page, options) {
+  if (!page || !options.extensionId) {
+    throw new Error('Extension not initialized');
+  }
+
+  const currentUrl = page.url();
+  const isUnlocked = await page
+    .locator('[data-testid="account-menu-icon"]')
+    .isVisible()
+    .catch(() => false);
+
+  const currentScreen = await detectCurrentScreen(page);
+
+  return {
+    isLoaded: true,
+    currentUrl,
+    extensionId: options.extensionId,
+    isUnlocked,
+    currentScreen,
+    accountAddress: null,
+    networkName: null,
+    chainId: options.chainId,
+    balance: null,
+  };
+}
+
+module.exports = { getExtensionState, detectCurrentScreen };
diff --git a/test/e2e/restore/MetaMaskUserData.json b/test/e2e/restore/MetaMaskUserData.json
index 0876f65fb518..e183d706e880 100644
--- a/test/e2e/restore/MetaMaskUserData.json
+++ b/test/e2e/restore/MetaMaskUserData.json
@@ -39,7 +39,6 @@
       "smartTransactionsOptInStatus": true
     },
     "theme": "light",
-    "useBlockie": false,
     "useNftDetection": false,
     "usePhishDetect": true,
     "useTokenDetection": false,
diff --git a/test/e2e/scripts/feature-flag-coverage-report.ts b/test/e2e/scripts/feature-flag-coverage-report.ts
new file mode 100644
index 000000000000..f7e8a10ff694
--- /dev/null
+++ b/test/e2e/scripts/feature-flag-coverage-report.ts
@@ -0,0 +1,529 @@
+/**
+ * Feature Flag Test Coverage Report
+ *
+ * Scans E2E test files for references to feature flags from the registry
+ * and generates a coverage report showing which flags have explicit test
+ * coverage vs. which are only tested via default mock values.
+ *
+ * Usage:
+ * yarn feature-flag:coverage
+ *
+ * Output:
+ * - Console table with per-flag coverage details
+ * - JSON report at test/e2e/scripts/feature-flag-coverage-report.json
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+import type { Json } from '@metamask/utils';
+
+import { FEATURE_FLAG_REGISTRY, FeatureFlagStatus } from '../feature-flags';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+type CoverageLevel = 'full' | 'partial' | 'default-only';
+
+type FlagReference = {
+  file: string;
+  values: string[];
+};
+
+type FlagCoverageEntry = {
+  flag: string;
+  type: string;
+  status: string;
+  inProd: boolean;
+  productionDefault: string;
+  coverage: CoverageLevel;
+  testedStates: { true: boolean; false: boolean };
+  references: FlagReference[];
+};
+
+export type CoverageReport = {
+  generatedAt: string;
+  summary: {
+    totalFlags: number;
+    activeFlags: number;
+    deprecatedFlags: number;
+    inProdFlags: number;
+    fullCoverage: number;
+    partialCoverage: number;
+    defaultOnlyCoverage: number;
+    coveragePercentage: number;
+  };
+  flags: FlagCoverageEntry[];
+};
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+const SCAN_DIRS = [
+  'test/e2e/tests',
+  'test/e2e/benchmarks',
+  'test/e2e/flask',
+  'test/e2e/snaps',
+  'test/e2e/json-rpc',
+  'test/e2e/accounts',
+  'test/e2e/provider',
+  'test/e2e/multi-injected-provider',
+  'test/e2e/api-specs',
+  'test/e2e/background-socket',
+];
+const SCAN_EXTENSIONS = new Set(['.ts', '.js', '.mts', '.mjs']);
+const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', 'build']);
+
+// ============================================================================
+// File Scanner
+// ============================================================================
+
+function collectTestFiles(dir: string): string[] {
+  const files: string[] = [];
+
+  if (!fs.existsSync(dir)) {
+    return files;
+  }
+
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    if (SKIP_DIRS.has(entry.name)) {
+      continue;
+    }
+
+    const fullPath = path.join(dir, entry.name);
+
+    if (entry.isDirectory()) {
+      files.push(...collectTestFiles(fullPath));
+    } else if (
+      entry.isFile() &&
+      SCAN_EXTENSIONS.has(path.extname(entry.name))
+    ) {
+      files.push(fullPath);
+    }
+  }
+
+  return files;
+}
+
+// ============================================================================
+// Flag Scanner
+// ============================================================================
+
+/**
+ * Uses word-boundary regex (\b) to avoid substring false positives
+ * (e.g. "addBitcoinAccount" matching inside "addBitcoinAccountDummyFlag").
+ * \b treats underscores as word chars, which works because flag names in
+ * test files appear as object keys where word boundaries naturally occur.
+ * @param content
+ * @param flagName
+ */
+function fileContainsFlag(content: string, flagName: string): boolean {
+  const regex = new RegExp(`\\b${escapeRegex(flagName)}\\b`, 'u');
+  return regex.test(content);
+}
+
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+}
+
+function extractFlagValues(content: string, flagName: string): string[] {
+  const escapedName = escapeRegex(flagName);
+  const regex = new RegExp(`\\b${escapedName}\\b\\s*[:=]\\s*`, 'gu');
+  const values = new Set<string>();
+  let match;
+
+  while ((match = regex.exec(content)) !== null) {
+    const rest = content.slice(match.index + match[0].length);
+    values.add(extractValueSnippet(rest));
+  }
+
+  return [...values];
+}
+
+function extractValueSnippet(after: string): string {
+  const trimmed = after.trimStart();
+
+  if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
+    return extractBalanced(trimmed);
+  }
+
+  const untilEnd = trimmed.match(/^[^,\n}]+/u);
+  const raw = untilEnd ? untilEnd[0].trim() : trimmed.split('\n')[0].trim();
+  return truncate(raw);
+}
+
+function extractBalanced(str: string): string {
+  const open = str[0];
+  const close = open === '{' ? '}' : ']';
+  let depth = 0;
+  for (let i = 0; i < str.length; i += 1) {
+    if (str[i] === open) {
+      depth += 1;
+    } else if (str[i] === close) {
+      depth -= 1;
+    }
+    if (depth === 0) {
+      const value = str
+        .slice(0, i + 1)
+        .replace(/\s+/gu, ' ')
+        .trim();
+      return truncate(value);
+    }
+  }
+  return truncate(str.split('\n')[0].trim());
+}
+
+function truncate(str: string, max = 80): string {
+  if (str.length <= max) {
+    return str;
+  }
+  return `${str.slice(0, max - 3)}...`;
+}
+
+function summarizeDefault(value: Json): string {
+  const str = JSON.stringify(value);
+  if (str.length <= 50) {
+    return str;
+  }
+  return `${str.slice(0, 47)}...`;
+}
+
+// ============================================================================
+// State Detection
+// ============================================================================
+
+function resolveEnabledState(value: Json): boolean | null {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+    const obj = value as Record<string, Json>;
+    if (typeof obj.enabled === 'boolean') {
+      return obj.enabled;
+    }
+  }
+  return null;
+}
+
+const TRUTHY_PATTERNS = [/\btrue\b/u, /enabled:\s*true/u];
+const FALSY_PATTERNS = [/\bfalse\b/u, /enabled:\s*false/u];
+
+function extractTestedStates(
+  references: FlagReference[],
+  productionDefault: Json,
+): { true: boolean; false: boolean } {
+  const states = { true: false, false: false };
+
+  const defaultState = resolveEnabledState(productionDefault);
+  if (defaultState === true) {
+    states.true = true;
+  }
+  if (defaultState === false) {
+    states.false = true;
+  }
+
+  for (const ref of references) {
+    for (const val of ref.values) {
+      if (TRUTHY_PATTERNS.some((p) => p.test(val))) {
+        states.true = true;
+      }
+      if (FALSY_PATTERNS.some((p) => p.test(val))) {
+        states.false = true;
+      }
+    }
+  }
+
+  return states;
+}
+
+function determineCoverage(
+  references: FlagReference[],
+  testedStates: { true: boolean; false: boolean },
+): CoverageLevel {
+  if (references.length === 0) {
+    return 'default-only';
+  }
+  if (testedStates.true && testedStates.false) {
+    return 'full';
+  }
+  return 'partial';
+}
+
+// ============================================================================
+// Report Generation
+// ============================================================================
+
+export function generateReport(repoRoot: string): CoverageReport {
+  const testFiles: string[] = [];
+  for (const scanDir of SCAN_DIRS) {
+    const absDir = path.join(repoRoot, scanDir);
+    testFiles.push(...collectTestFiles(absDir));
+  }
+
+  console.log(`Scanning ${testFiles.length} test files...\n`);
+
+  const fileContents = new Map<string, string>();
+  for (const filePath of testFiles) {
+    fileContents.set(filePath, fs.readFileSync(filePath, 'utf-8'));
+  }
+
+  const registryEntries = Object.values(FEATURE_FLAG_REGISTRY);
+  const flagResults: FlagCoverageEntry[] = [];
+
+  for (const entry of registryEntries) {
+    const references: FlagReference[] = [];
+
+    for (const [filePath, content] of fileContents) {
+      if (fileContainsFlag(content, entry.name)) {
+        references.push({
+          file: path.relative(repoRoot, filePath),
+          values: extractFlagValues(content, entry.name),
+        });
+      }
+    }
+
+    const testedStates = extractTestedStates(
+      references,
+      entry.productionDefault,
+    );
+
+    flagResults.push({
+      flag: entry.name,
+      type: entry.type,
+      status: entry.status,
+      inProd: entry.inProd,
+      productionDefault: summarizeDefault(entry.productionDefault),
+      coverage: determineCoverage(references, testedStates),
+      testedStates,
+      references,
+    });
+  }
+
+  const coverageOrder: Record<CoverageLevel, number> = {
+    full: 0,
+    partial: 1,
+    'default-only': 2,
+  };
+
+  flagResults.sort((a, b) => {
+    if (a.coverage !== b.coverage) {
+      return coverageOrder[a.coverage] - coverageOrder[b.coverage];
+    }
+    return a.flag.localeCompare(b.flag);
+  });
+
+  const activeFlagCount = flagResults.filter(
+    (f) => f.status === FeatureFlagStatus.Active,
+  ).length;
+  const deprecatedFlagCount = flagResults.filter(
+    (f) => f.status === FeatureFlagStatus.Deprecated,
+  ).length;
+  const inProdFlagCount = flagResults.filter((f) => f.inProd).length;
+  const fullCount = flagResults.filter((f) => f.coverage === 'full').length;
+  const partialCount = flagResults.filter(
+    (f) => f.coverage === 'partial',
+  ).length;
+  const defaultOnlyCount = flagResults.filter(
+    (f) => f.coverage === 'default-only',
+  ).length;
+
+  return {
+    generatedAt: new Date().toISOString(),
+    summary: {
+      totalFlags: flagResults.length,
+      activeFlags: activeFlagCount,
+      deprecatedFlags: deprecatedFlagCount,
+      inProdFlags: inProdFlagCount,
+      fullCoverage: fullCount,
+      partialCoverage: partialCount,
+      defaultOnlyCoverage: defaultOnlyCount,
+      coveragePercentage:
+        flagResults.length > 0
+          ? Math.round(((fullCount + partialCount) / flagResults.length) * 100)
+          : 0,
+    },
+    flags: flagResults,
+  };
+}
+
+// ============================================================================
+// Console Output
+// ============================================================================
+
+function printReport(report: CoverageReport): void {
+  const { summary, flags } = report;
+
+  console.log('='.repeat(80));
+  console.log('  FEATURE FLAG TEST COVERAGE REPORT');
+  console.log('='.repeat(80));
+  console.log(`  Generated: ${report.generatedAt}`);
+  console.log('');
+  console.log('  LEGEND');
+  console.log(`  ${'-'.repeat(40)}`);
+  console.log('  Coverage levels:');
+  console.log('    FULL         Both true and false states are tested');
+  console.log('    PARTIAL      Only one state (true or false) is tested');
+  console.log(
+    '    DEFAULT-ONLY No explicit test references; tested only via global mock defaults',
+  );
+  console.log('');
+  console.log('  States column:');
+  console.log('    T:✓/✗        True state tested / not tested');
+  console.log('    F:✓/✗        False state tested / not tested');
+  console.log('');
+  console.log(
+    '  State detection considers the production default (served by mock-e2e.js)',
+  );
+  console.log('  plus any explicit overrides found in test files.');
+  console.log('');
+
+  console.log('  SUMMARY');
+  console.log(`  ${'-'.repeat(40)}`);
+  console.log(`  Total flags:       ${summary.totalFlags}`);
+  console.log(`  Active flags:      ${summary.activeFlags}`);
+  console.log(`  Deprecated flags:  ${summary.deprecatedFlags}`);
+  console.log(`  In production:     ${summary.inProdFlags}`);
+  console.log(`  Full coverage:     ${summary.fullCoverage}`);
+  console.log(`  Partial coverage:  ${summary.partialCoverage}`);
+  console.log(`  Default-only:      ${summary.defaultOnlyCoverage}`);
+  console.log(
+    `  Coverage:          ${summary.coveragePercentage}% of flags have explicit tests`,
+  );
+  console.log('');
+
+  const flagCol = 45;
+  const coverageCol = 14;
+  const statesCol = 12;
+  const filesCol = 6;
+  const defaultCol = 50;
+
+  const header = [
+    'Flag'.padEnd(flagCol),
+    'Coverage'.padEnd(coverageCol),
+    'States'.padEnd(statesCol),
+    'Files'.padEnd(filesCol),
+    'Prod Default'.padEnd(defaultCol),
+  ].join(' | ');
+
+  console.log(`  ${header}`);
+  console.log(`  ${'-'.repeat(header.length)}`);
+
+  for (const entry of flags) {
+    const coverageLabel = entry.coverage.toUpperCase();
+    const statesLabel =
+      entry.coverage === 'default-only'
+        ? '-'
+        : `T:${entry.testedStates.true ? '✓' : '✗'} F:${entry.testedStates.false ? '✓' : '✗'}`;
+    const row = [
+      entry.flag.padEnd(flagCol),
+      coverageLabel.padEnd(coverageCol),
+      statesLabel.padEnd(statesCol),
+      String(entry.references.length).padEnd(filesCol),
+      entry.productionDefault.padEnd(defaultCol),
+    ].join(' | ');
+
+    console.log(`  ${row}`);
+  }
+
+  console.log('');
+
+  const fullFlags = flags.filter((f) => f.coverage === 'full');
+  if (fullFlags.length > 0) {
+    console.log('  FULL COVERAGE (both true and false states tested)');
+    console.log(`  ${'-'.repeat(40)}`);
+    for (const entry of fullFlags) {
+      console.log(
+        `  ${entry.flag}  (prod default: ${entry.productionDefault})`,
+      );
+      for (const ref of entry.references) {
+        const valueStr =
+          ref.values.length > 0 ? ref.values.join(', ') : '(reference only)';
+        console.log(`    ${ref.file}: ${valueStr}`);
+      }
+    }
+    console.log('');
+  }
+
+  const partialFlags = flags.filter((f) => f.coverage === 'partial');
+  if (partialFlags.length > 0) {
+    console.log('  PARTIAL COVERAGE (only one state tested)');
+    console.log(`  ${'-'.repeat(40)}`);
+    for (const entry of partialFlags) {
+      const missingStates = [
+        !entry.testedStates.true && 'true',
+        !entry.testedStates.false && 'false',
+      ].filter(Boolean);
+      const missingLabel =
+        missingStates.length === 2
+          ? 'both true and false states'
+          : `${missingStates[0]} state`;
+      console.log(`  ${entry.flag}  (missing: ${missingLabel})`);
+      for (const ref of entry.references) {
+        const valueStr =
+          ref.values.length > 0 ? ref.values.join(', ') : '(reference only)';
+        console.log(`    ${ref.file}: ${valueStr}`);
+      }
+    }
+    console.log('');
+  }
+
+  const defaultOnly = flags.filter((f) => f.coverage === 'default-only');
+  if (defaultOnly.length > 0) {
+    console.log('  DEFAULT-ONLY (no explicit test references)');
+    console.log(`  ${'-'.repeat(40)}`);
+    for (const entry of defaultOnly) {
+      console.log(`  - ${entry.flag}`);
+    }
+    console.log('');
+  }
+
+  console.log('='.repeat(80));
+}
+
+// ============================================================================
+// JSON Output
+// ============================================================================
+
+function writeJsonReport(report: CoverageReport, outputPath: string): void {
+  fs.writeFileSync(outputPath, `${JSON.stringify(report, null, 2)}\n`, 'utf-8');
+  console.log(`JSON report written to: ${outputPath}`);
+}
+
+// ============================================================================
+// Main
+// ============================================================================
+
+function main(): void {
+  const scriptDir = __dirname;
+  const repoRoot = path.resolve(scriptDir, '..', '..', '..');
+
+  const pkgPath = path.join(repoRoot, 'package.json');
+  if (!fs.existsSync(pkgPath)) {
+    console.error(`Error: Could not find package.json at ${pkgPath}`);
+    console.error(
+      'Make sure you are running this from the metamask-extension repo root.',
+    );
+    process.exit(1);
+  }
+
+  const report = generateReport(repoRoot);
+  printReport(report);
+
+  const jsonOutputDir = path.join(repoRoot, 'test', 'test-results', 'e2e');
+  if (!fs.existsSync(jsonOutputDir)) {
+    fs.mkdirSync(jsonOutputDir, { recursive: true });
+  }
+  const jsonOutputPath = path.join(
+    jsonOutputDir,
+    'feature-flag-coverage-report.json',
+  );
+  writeJsonReport(report, jsonOutputPath);
+}
+
+if (require.main === module) {
+  main();
+}
diff --git a/test/e2e/snaps/test-snap-get-locale.spec.ts b/test/e2e/snaps/test-snap-get-locale.spec.ts
index 54d5ea619b58..a6bbd953f862 100644
--- a/test/e2e/snaps/test-snap-get-locale.spec.ts
+++ b/test/e2e/snaps/test-snap-get-locale.spec.ts
@@ -2,7 +2,7 @@ import { Driver } from '../webdriver/driver';
 import { TestSnaps } from '../page-objects/pages/test-snaps';
 import HomePage from '../page-objects/pages/home/homepage';
 import SettingsPage from '../page-objects/pages/settings/settings-page';
-import GeneralSettings from '../page-objects/pages/settings/general-settings';
+import PreferencesAndDisplaySettings from '../page-objects/pages/settings/preferences-and-display-settings';
 import FixtureBuilderV2 from '../fixtures/fixture-builder-v2';
 import { login } from '../page-objects/flows/login.flow';
 import { openTestSnapClickButtonAndInstall } from '../page-objects/flows/install-test-snap.flow';
@@ -49,13 +49,15 @@ describe('Test Snap Get Locale', function () {
         );
         await homePage.headerNavbar.openSettingsPage();
 
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
-        await generalSettings.changeLanguage('Dansk');
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
+        await preferencesAndDisplaySettings.changeLanguage('Dansk');
 
-        await generalSettings.assertLoadingOverlayNotPresent();
+        await preferencesAndDisplaySettings.assertLoadingOverlayNotPresent();
         const settingsPage = new SettingsPage(driver);
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         await homePage.headerNavbar.openSnapListPage();
         await driver.waitForSelector({
diff --git a/test/e2e/tests/account/snap-account-settings.spec.ts b/test/e2e/tests/account/snap-account-settings.spec.ts
index 860ed8633552..3fd5a391f459 100644
--- a/test/e2e/tests/account/snap-account-settings.spec.ts
+++ b/test/e2e/tests/account/snap-account-settings.spec.ts
@@ -36,9 +36,7 @@ describe('Add snap account experimental settings', function (this: Suite) {
         const experimentalSettings = new ExperimentalSettings(driver);
         await experimentalSettings.checkPageIsLoaded();
         await experimentalSettings.toggleAddAccountSnap();
-        await driver.clickElement(
-          '.settings-page__header__title-container__close-button',
-        );
+        await settingsPage.clickBackButton();
         // Make sure the "Add account Snap" button is visible.
         await headerNavbar.openAccountMenu();
         await accountListPage.addMultichainWallet();
diff --git a/test/e2e/tests/account/unlock-wallet.spec.ts b/test/e2e/tests/account/unlock-wallet.spec.ts
index 9972b318b2a8..87889d12b78d 100644
--- a/test/e2e/tests/account/unlock-wallet.spec.ts
+++ b/test/e2e/tests/account/unlock-wallet.spec.ts
@@ -78,10 +78,10 @@ describe('Unlock wallet - ', function () {
         await headerNavbar.openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
         const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        await privacySettings.checkSecurityAndPasswordPageIsLoaded();
         await privacySettings.openChangePassword();
 
         const changePasswordPage = new ChangePasswordPage(driver);
@@ -95,7 +95,7 @@ describe('Unlock wallet - ', function () {
 
         await privacySettings.checkPasswordChangeSuccessToastIsDisplayed();
 
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         // Wait for the password change to be applied to the social login user
         await driver.delay(2_000);
diff --git a/test/e2e/tests/bridge/bridge-negative-cases.spec.ts b/test/e2e/tests/bridge/bridge-negative-cases.spec.ts
index c065072f8613..b91f5b02b2d2 100644
--- a/test/e2e/tests/bridge/bridge-negative-cases.spec.ts
+++ b/test/e2e/tests/bridge/bridge-negative-cases.spec.ts
@@ -161,6 +161,13 @@ describe('Bridge functionality', function (this: Suite) {
         await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkPendingBridgeTransactionActivity();
+        await activityList.checkBridgeTransactionDetails(
+          'Bridged to Linea',
+          true,
+          'pending',
+          '1',
+          'ETH',
+        );
       },
     );
   });
@@ -194,6 +201,13 @@ describe('Bridge functionality', function (this: Suite) {
 
         const activityList = new ActivityListPage(driver);
         await activityList.checkFailedTxNumberDisplayedInActivity();
+        await activityList.checkBridgeTransactionDetails(
+          'Bridged to Linea',
+          true,
+          'failed',
+          '1',
+          'ETH',
+        );
       },
     );
   });
@@ -227,6 +241,13 @@ describe('Bridge functionality', function (this: Suite) {
 
         const activityList = new ActivityListPage(driver);
         await activityList.checkFailedTxNumberDisplayedInActivity();
+        await activityList.checkBridgeTransactionDetails(
+          'Bridged to Linea',
+          true,
+          'failed',
+          '1',
+          'ETH',
+        );
       },
     );
   });
diff --git a/test/e2e/tests/bridge/bridge-positive-cases.spec.ts b/test/e2e/tests/bridge/bridge-positive-cases.spec.ts
index 9c5d054a2907..6113479879e3 100644
--- a/test/e2e/tests/bridge/bridge-positive-cases.spec.ts
+++ b/test/e2e/tests/bridge/bridge-positive-cases.spec.ts
@@ -4,11 +4,16 @@ import { login } from '../../page-objects/flows/login.flow';
 import HomePage from '../../page-objects/pages/home/homepage';
 import BridgeQuotePage from '../../page-objects/pages/bridge/quote-page';
 import NetworkManager from '../../page-objects/pages/network-manager';
+import TokenOverviewPage from '../../page-objects/pages/token-overview-page';
 import {
   BRIDGE_FEATURE_FLAGS_WITH_SSE_ENABLED,
   DEFAULT_BRIDGE_FEATURE_FLAGS,
 } from './constants';
-import { bridgeTransaction, getBridgeFixtures } from './bridge-test-utils';
+import {
+  bridgeTransaction,
+  checkQuoteRequestsAreNotMadeAfterTimestamp,
+  getBridgeFixtures,
+} from './bridge-test-utils';
 
 describe('Bridge tests', function (this: Suite) {
   this.timeout(160000); // This test is very long, so we need an unusually high timeout
@@ -92,7 +97,7 @@ describe('Bridge tests', function (this: Suite) {
         DEFAULT_BRIDGE_FEATURE_FLAGS,
         false,
       ),
-      async ({ driver }) => {
+      async ({ driver, mockedEndpoint }) => {
         await login(driver, { expectedBalance: '$225,730.11' });
         const networkManager = new NetworkManager(driver);
 
@@ -108,8 +113,14 @@ describe('Bridge tests', function (this: Suite) {
           fromChain: 'Linea',
           toChain: 'Ethereum',
         });
+        const finalQuoteRequestTimestamp = Date.now();
 
         await bridgePage.goBack();
+        await checkQuoteRequestsAreNotMadeAfterTimestamp(
+          driver,
+          finalQuoteRequestTimestamp,
+          mockedEndpoint,
+        );
 
         // check if the Linea network is selected
         await networkManager.openNetworkManager();
@@ -127,7 +138,7 @@ describe('Bridge tests', function (this: Suite) {
         BRIDGE_FEATURE_FLAGS_WITH_SSE_ENABLED,
         false,
       ),
-      async ({ driver }) => {
+      async ({ driver, mockedEndpoint }) => {
         await login(driver, { expectedBalance: '$225,730.11' });
 
         const homePage = new HomePage(driver);
@@ -148,6 +159,167 @@ describe('Bridge tests', function (this: Suite) {
           expectedTransactionsCount: 2,
           expectedDestAmount: '9.9',
         });
+        const finalQuoteRequestTimestamp = Date.now();
+        const bridgePage = new BridgeQuotePage(driver);
+        await checkQuoteRequestsAreNotMadeAfterTimestamp(
+          driver,
+          finalQuoteRequestTimestamp,
+          mockedEndpoint,
+        );
+
+        console.log('Navigating back to Swap page');
+        await homePage.startSwapFlow();
+        await bridgePage.checkAssetsAreSelected('ETH', 'mUSD');
+        console.log('Checked that assets have been reset to defaults');
+      },
+    );
+  });
+
+  it('Preserves bridge state when navigating from the source asset page', async function () {
+    await withFixtures(
+      getBridgeFixtures(
+        this.test?.fullTitle(),
+        DEFAULT_BRIDGE_FEATURE_FLAGS,
+        false,
+      ),
+      async ({ driver }) => {
+        await login(driver, { expectedBalance: '$225,730.11' });
+
+        // Navigate to Bridge page
+        const homePage = new HomePage(driver);
+        await homePage.startSwapFlow();
+        const bridgePage = new BridgeQuotePage(driver);
+
+        console.log('Checking that source asset is selected');
+        await bridgePage.goToAssetPage(
+          'DAI',
+          '0x1',
+          '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+        );
+
+        const tokenOverviewPage = new TokenOverviewPage(driver);
+        await tokenOverviewPage.clickSwap();
+        console.log('Clicked Swap button from source asset page');
+        await bridgePage.checkAssetsAreSelected('DAI', 'mUSD');
+      },
+    );
+  });
+
+  it('Preserves bridge state when navigating from the dest asset page', async function () {
+    await withFixtures(
+      getBridgeFixtures(
+        this.test?.fullTitle(),
+        DEFAULT_BRIDGE_FEATURE_FLAGS,
+        false,
+      ),
+      async ({ driver }) => {
+        await login(driver, { expectedBalance: '$225,730.11' });
+
+        // Navigate to Bridge page
+        const homePage = new HomePage(driver);
+        await homePage.startSwapFlow();
+        const bridgePage = new BridgeQuotePage(driver);
+
+        await (await bridgePage.searchForAsset('DAI')).click();
+        console.log('Selected source asset DAI');
+
+        const tokenOverviewPage = new TokenOverviewPage(driver);
+        console.log('Checking that dest asset is selected');
+        await bridgePage.goToAssetPage(
+          'USDC',
+          '0xe708',
+          '0x176211869cA2b568f2A7D4EE941E073a821EE1ff',
+          bridgePage.destinationAssetPickerButton,
+        );
+        await tokenOverviewPage.clickSwap();
+        console.log('Clicked Swap button from dest asset page');
+        await bridgePage.checkAssetsAreSelected('DAI', 'USDC');
+      },
+    );
+  });
+
+  it('Preserves bridge state when navigating back from the asset page', async function () {
+    await withFixtures(
+      getBridgeFixtures(
+        this.test?.fullTitle(),
+        DEFAULT_BRIDGE_FEATURE_FLAGS,
+        false,
+      ),
+      async ({ driver }) => {
+        await login(driver, { expectedBalance: '$225,730.11' });
+
+        // Navigate to Bridge page
+        const homePage = new HomePage(driver);
+        await homePage.startSwapFlow();
+        const bridgePage = new BridgeQuotePage(driver);
+
+        const tokenOverviewPage = new TokenOverviewPage(driver);
+
+        const srcAssetElement = await bridgePage.searchForAsset('mUSD');
+        await srcAssetElement.click();
+        console.log('Selected source asset mUSD');
+
+        console.log('Checking that asset picker is visible');
+        await bridgePage.goToAssetPage(
+          'USDC',
+          '0xe708',
+          '0x176211869cA2b568f2A7D4EE941E073a821EE1ff',
+          bridgePage.destinationAssetPickerButton,
+        );
+        await tokenOverviewPage.clickBack();
+        console.log('Navigated back to Swap page from asset page');
+
+        await bridgePage.checkAssetPickerModalIsReopened();
+        await bridgePage.checkAssetsAreSelected('mUSD', 'ETH');
+      },
+    );
+  });
+
+  it('Resets bridge state when reopening the page', async function () {
+    await withFixtures(
+      getBridgeFixtures(
+        this.test?.fullTitle(),
+        DEFAULT_BRIDGE_FEATURE_FLAGS,
+        false,
+      ),
+      async ({ driver }) => {
+        await login(driver, { expectedBalance: '$225,730.11' });
+
+        // Navigate to Bridge page
+        const homePage = new HomePage(driver);
+        await homePage.startSwapFlow();
+        const bridgePage = new BridgeQuotePage(driver);
+
+        const tokenOverviewPage = new TokenOverviewPage(driver);
+
+        await (await bridgePage.searchForAsset('DAI')).click();
+        console.log('Selected source asset DAI');
+
+        await (
+          await bridgePage.searchForAsset(
+            'USDC',
+            bridgePage.destinationAssetPickerButton,
+          )
+        ).click();
+        console.log('Selected dest asset USDC');
+
+        await bridgePage.goToAssetPage(
+          'DAI',
+          '0x1',
+          '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+          bridgePage.destinationAssetPickerButton,
+        );
+        await tokenOverviewPage.clickBack();
+
+        await bridgePage.checkAssetPickerModalIsReopened();
+        await bridgePage.checkAssetsAreSelected('DAI', 'USDC');
+
+        console.log(
+          'Checking that selected assets are reset after reopening Swap page',
+        );
+        await bridgePage.goBack();
+        await homePage.startSwapFlow();
+        await bridgePage.checkAssetsAreSelected('ETH', 'mUSD');
       },
     );
   });
diff --git a/test/e2e/tests/bridge/bridge-test-utils.ts b/test/e2e/tests/bridge/bridge-test-utils.ts
index b5ecb6a069b0..eab7d6aba0e8 100644
--- a/test/e2e/tests/bridge/bridge-test-utils.ts
+++ b/test/e2e/tests/bridge/bridge-test-utils.ts
@@ -1,6 +1,7 @@
 import { ReadableStream as ReadableStreamWeb } from 'stream/web';
+import { strict as assert } from 'assert';
 import { Readable } from 'stream';
-import { Mockttp } from 'mockttp';
+import { MockedEndpoint, Mockttp } from 'mockttp';
 import { type FeatureFlagResponse } from '@metamask/bridge-controller';
 
 import { emptyHtmlPage } from '../../mock-e2e';
@@ -15,6 +16,7 @@ import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import HomePage from '../../page-objects/pages/home/homepage';
 import { MOCK_META_METRICS_ID } from '../../constants';
+import { getEventPayloads } from '../../helpers';
 import { mockSegment } from '../metrics/mocks/segment';
 import {
   ETH_CONVERSION_RATE_USD,
@@ -36,6 +38,8 @@ import {
   MOCK_BRIDGE_ETH_TO_WETH_LINEA,
   MOCK_SWAP_API_AGGREGATOR_LINEA,
   SSE_RESPONSE_HEADER,
+  EXPECTED_INPUT_CHANGES,
+  BRIDGE_REFRESH_RATE,
 } from './constants';
 import MOCK_SWAP_QUOTES_ETH_MUSD from './mocks/swap-quotes-eth-musd.json';
 
@@ -97,11 +101,13 @@ export class BridgePage {
  * @param testParams.expectedSwapTokens - The expected swap tokens shown in the activity list
  * @param testParams.expectedDestAmount - The expected quoted destination amounts in the quote page
  * @param testParams.submitDelay - The delay to wait before submitting the transaction, must be less than the refresh interval of the stream
+ * @param testParams.expectedStatus - The expected state of the transaction
  */
 export const bridgeTransaction = async ({
   driver,
   quote,
   expectedTransactionsCount = 1,
+  expectedStatus = 'success',
   expectedWalletBalance,
   expectedSwapTokens,
   expectedDestAmount,
@@ -110,6 +116,7 @@ export const bridgeTransaction = async ({
   driver: Driver;
   quote: BridgeQuote;
   expectedTransactionsCount: number;
+  expectedStatus?: 'success' | 'failed' | 'pending';
   expectedWalletBalance?: string;
   expectedSwapTokens?: Pick<BridgeQuote, 'tokenFrom' | 'tokenTo'>;
   expectedDestAmount: string;
@@ -120,6 +127,8 @@ export const bridgeTransaction = async ({
   await homePage.startSwapFlow();
 
   const bridgePage = new BridgeQuotePage(driver);
+
+  await bridgePage.checkAssetsAreSelected('ETH', 'mUSD');
   await bridgePage.enterBridgeQuote(quote);
   await bridgePage.waitForQuote();
   await bridgePage.checkExpectedNetworkFeeIsDisplayed();
@@ -141,23 +150,29 @@ export const bridgeTransaction = async ({
       ? quote.fromChain !== quote.toChain
       : false;
 
+  let action = '';
+  const expectedSrcToken = quote.tokenFrom ?? expectedSwapTokens?.tokenFrom;
+  const expectedDestToken = quote.tokenTo ?? expectedSwapTokens?.tokenTo;
+
   if (quote.unapproved) {
+    action = isBridge
+      ? `Bridged to ${quote.toChain}`
+      : `Swapped ${expectedSrcToken} to ${expectedDestToken}`;
     await activityList.checkTxAction({
-      action: isBridge
-        ? `Bridged to ${quote.toChain}`
-        : `Swapped ${quote.tokenFrom} to ${quote.tokenTo}`,
+      action,
       confirmedTx: expectedTransactionsCount,
     });
     await activityList.checkTxAction({
-      action: `Approve ${quote.tokenFrom} for ${isBridge ? 'bridge' : 'swap'}`,
+      action: `Approve ${expectedSrcToken} for ${isBridge ? 'bridge' : 'swap'}`,
       confirmedTx: expectedTransactionsCount,
       txIndex: 2,
     });
   } else {
+    action = isBridge
+      ? `Bridged to ${quote.toChain}`
+      : `Swap ${expectedSrcToken} to ${expectedDestToken}`;
     await activityList.checkTxAction({
-      action: isBridge
-        ? `Bridged to ${quote.toChain}`
-        : `Swap ${quote.tokenFrom ?? expectedSwapTokens?.tokenFrom} to ${quote.tokenTo ?? expectedSwapTokens?.tokenTo}`,
+      action,
       confirmedTx: expectedTransactionsCount,
     });
   }
@@ -166,6 +181,16 @@ export const bridgeTransaction = async ({
     `-${quote.amount} ${quote.tokenFrom ?? expectedSwapTokens?.tokenFrom}`,
   );
 
+  await activityList.checkBridgeTransactionDetails(
+    action,
+    isBridge,
+    expectedStatus,
+    quote.amount,
+    expectedSrcToken,
+    expectedDestAmount,
+    expectedDestToken,
+  );
+
   // Check the wallet ETH balance is correct
   const accountListPage = new AccountListPage(driver);
   if (expectedWalletBalance) {
@@ -292,6 +317,19 @@ const toBridgeTokenResponse = (
   };
 };
 
+async function mockHistoricalPrices(mockServer: Mockttp) {
+  return mockServer.forGet(/historical-prices/u).thenCallback(() => ({
+    statusCode: 200,
+    json: {
+      prices: [
+        { timestamp: 1717566000000, price: 1 },
+        { timestamp: 1717566322300, price: 2 },
+        { timestamp: 1717566611338, price: 3 },
+      ],
+    },
+  }));
+}
+
 async function mockGetPopularTokens(mockServer: Mockttp) {
   return await mockServer.forPost(/getTokens\/popular/u).thenCallback(() => ({
     statusCode: 200,
@@ -976,6 +1014,7 @@ export const getBridgeFixtures = (
         await mockSwapTokensLinea(mockServer),
         await mockSwapTokensArbitrum(mockServer),
         await mockSwapAggregatorMetadataArbitrum(mockServer),
+        await mockHistoricalPrices(mockServer),
       ];
 
       standardMocks.push(...(await mockSearchTokens(mockServer)));
@@ -1281,3 +1320,82 @@ export const getBridgeL2Fixtures = (
     title,
   };
 };
+
+export const checkInputChangedEvents = async (
+  type: keyof typeof EXPECTED_INPUT_CHANGES,
+  driver: Driver,
+  mockedEndpoints: MockedEndpoint[],
+  startIndex: number = 0,
+): Promise<number> => {
+  const expectedInputChanges = EXPECTED_INPUT_CHANGES[type];
+
+  const receivedInputChanges = (await getEventPayloads(driver, mockedEndpoints))
+    .filter((e) => e?.event === EventTypes.SwapBridgeInputChanged)
+    .slice(startIndex)
+    .map((event) => ({
+      [event.properties.input]: event.properties.input_value,
+    }));
+  assert.equal(
+    receivedInputChanges.length,
+    expectedInputChanges.length,
+    `Should have ${expectedInputChanges.length} input change events, but got ${receivedInputChanges.length}`,
+  );
+  expectedInputChanges
+    .flatMap(Object.entries)
+    .forEach(([expectedKey, expectedValue], index) => {
+      const receivedInputChange = receivedInputChanges.find(
+        (event: { [key: string]: string }) =>
+          event[expectedKey] === expectedValue,
+      );
+      assert.equal(
+        Boolean(receivedInputChange),
+        true,
+        `Expected input change ${expectedKey} with value ${expectedValue} not found at index ${index}`,
+      );
+    });
+
+  return expectedInputChanges.length;
+};
+
+export const checkQuoteRequestsAreNotMadeAfterTimestamp = async (
+  driver: Driver,
+  timestamp: number,
+  mockedEndpoints: ({
+    rule: {
+      matchers: { type: string; regexSource: string }[];
+      requestCount: number;
+    };
+  } & MockedEndpoint)[],
+) => {
+  await driver.delay(2 * BRIDGE_REFRESH_RATE + 1000);
+
+  // Find all getQuote mocked endpoints
+  const getQuoteMocks = mockedEndpoints.filter(
+    ({ rule: { matchers, requestCount } }) =>
+      matchers.some(
+        (matcher) =>
+          matcher.type === 'regex-path' &&
+          matcher.regexSource.includes('getQuote') &&
+          requestCount > 0,
+      ),
+  );
+
+  // Filter requests made after the timestamp
+  for (const mock of getQuoteMocks) {
+    const seenRequests = await mock.getSeenRequests();
+    assert.equal(
+      seenRequests.length > 0,
+      true,
+      'At least one request should be made to getQuote',
+    );
+
+    const seenRequestsAfterTimestamp = seenRequests.filter(
+      (request) => request.timingEvents.startTime > timestamp,
+    );
+    assert.equal(
+      seenRequestsAfterTimestamp.length,
+      0,
+      'No requests should be made to getQuote after timestamp',
+    );
+  }
+};
diff --git a/test/e2e/tests/bridge/constants.ts b/test/e2e/tests/bridge/constants.ts
index 50960c34a442..79bc38b88f90 100644
--- a/test/e2e/tests/bridge/constants.ts
+++ b/test/e2e/tests/bridge/constants.ts
@@ -1,14 +1,16 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {
   getNativeAssetForChainId,
   type FeatureFlagResponse,
 } from '@metamask/bridge-controller';
 
 export const SSE_RESPONSE_HEADER = { 'Content-Type': 'text/event-stream' };
+export const BRIDGE_REFRESH_RATE = 5000;
 
 export const DEFAULT_BRIDGE_FEATURE_FLAGS: FeatureFlagResponse & {
   minimumVersion: string;
 } = {
-  refreshRate: 30000,
+  refreshRate: BRIDGE_REFRESH_RATE,
   minimumVersion: '0.0.0',
   maxRefreshCount: 5,
   support: true,
@@ -292,6 +294,15 @@ export const MOCK_TOKENS_ETHEREUM = [
     address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
     name: 'Wrapped Ether',
   },
+  {
+    symbol: 'mUSD',
+    decimals: 6,
+    aggregators: [],
+    occurrences: 1,
+    iconUrl: '',
+    address: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
+    name: 'MetaMask USD',
+  },
   getNativeAssetForChainId(1),
 ];
 
@@ -2619,3 +2630,68 @@ export const MOCK_SWAP_API_AGGREGATOR_LINEA = {
       'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAAAXNSR0IArs4c6QAAAKZlWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgExAAIAAAAhAAAAWodpAAQAAAABAAAAfAAAAAAAAAJYAAAAAQAAAlgAAAABQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkAAAADoAEAAwAAAAEAAQAAoAIABAAAAAEAAAEsoAMABAAAAAEAAAEsAAAAAG2e6m8AAAAJcEhZcwAAXEYAAFxGARSUQ0EAAAR4aVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA2LjAuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgICAgICAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgICAgICAgICAgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyI+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjYwMDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NjAwPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8eG1wTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD54bXAuaWlkOjIxMkFDQjgxODc1NzExRUNBRTlFQTVEMzBBREVBMDAzPC9zdFJlZjppbnN0YW5jZUlEPgogICAgICAgICAgICA8c3RSZWY6ZG9jdW1lbnRJRD54bXAuZGlkOjIxMkFDQjgyODc1NzExRUNBRTlFQTVEMzBBREVBMDAzPC9zdFJlZjpkb2N1bWVudElEPgogICAgICAgICA8L3htcE1NOkRlcml2ZWRGcm9tPgogICAgICAgICA8eG1wTU06RG9jdW1lbnRJRD54bXAuZGlkOjIxMkFDQjg0ODc1NzExRUNBRTlFQTVEMzBBREVBMDAzPC94bXBNTTpEb2N1bWVudElEPgogICAgICAgICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOjIxMkFDQjgzODc1NzExRUNBRTlFQTVEMzBBREVBMDAzPC94bXBNTTpJbnN0YW5jZUlEPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIFBob3Rvc2hvcCAyMi4wIChNYWNpbnRvc2gpPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgowisMUAABAAElEQVR4Ae2dCbx91fj/t0TGSggp7jdSSQMVpVH9mkSlJFOEBnMD+b1+FH6EMhRREf9QplIqTZRS0qiiWfM3zRL9pEQ4/8973f3ZrXvuud97zrl7n7P3Oet5vZ6z1t5n7zU861mf/aw5yxIlCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAnUSQKPqVNiUlrqJ4FWq4WOWE/a3bkmuJUHULiPecxj7J9r2On9EZSAFXAEs5ay1I0EIkAyMFkn/qP3/zNoAMnTs5DihiEArOBBpyekIP3URgJWztokKCWkOglEYOByB5AAphlJ7yysP58ifqp4cfFi4kVz98lynyh+Uu7y7GPFBhvC/rf4X+K/ix/K3Qfl/p/4r7l7v9wHxH9Tenh2RlJ62sFs4KA6Y+LSH5VLwIpbeUQpgsFKoAM4/buTdZI/9yyl7tniCfGy4ueJlxEvJV5CDEABVk8QV0EPK1AADP6z+E7xbeI/iG8WzxffLb5nAXkAKCGssQRiQRSj95MAa0TKNAIoLBAqLJbNFNIzgM8LxSuKVxKvIF5ODFgBSN1Q0TzTw/j7IfQu5m7CAMzuEt8g/r34avG14huVV0BuCimvtvSw8hKATZFOcy8SYDW37DJVSjePWu0Apf+whl4kXl28pvilYsDp6eJOFCwT/UEFh9oBJdaV2D/5dH+/MeDZj2smVOdxpjjv0zOA2G/FvxFfKr5e8sBqKygHMMIAvJzH4v/kaYYEZlKCZqR+zFKpSkd5UYFxpzTx9N8iureyeF3xeuKXiSfE7QQYxNYXYcXc/nwdrg1gdp0mrCjS3k7zdeMy8bni88RXCKT+ITdQLkfeJbxkfU2KpRG/nQq7EQkfl0RGILWQKt0jcb713zxdbyDeRPxK8YS4ndyJTVkb7NqfafJ1AB1lABei47+d5uvG+eIzxOdIjrfILUhyfJwuUtOxkEh9PQmwalo2qkShKaTKZcAJKdV9mnZbircQ09zDsjJRaXk+BqdxK2NkAANAuABYLAMsLZqNp4lPlXyxxAqSfHk+NRsLidTLExdkvVI2hqkxSCnrUyqM7tMHtY34NeJVxDEZ0Gw9pTKNpTMJWgYw/mm3wK7QvZPFJwi86AMLNFNZ+P/kDkcCSbmHI/cpsapyhL6Y2JrSPUbwtssZqyqmdisq/i/5FywBg5etr/jp3+niWPFxKgtGIgOpLAC5aQMb+d/JGaAEEmANUNhxVKoEyB6gKqwp3WNS5lbit4k3EmM1QVQuQCo0E+WmcpMQSiCDF83HuOnI9VniI8U/FXgxpSIelZ0y4MF/iQYjgaT4g5FzEYtACdB5rCpB0YGue6vp3jvFO4iXFJt4JoGUpVGtG4MXnfCmP8pztPgIlRkWWCCVGc8AXIBbogFJIAHWgATdDlT59esU/XvFG0XJcJ9Ue19L9EjyDkACncoBq+tQ8fEGqgRcAyiJKIoEWJEwqvDmwMSUhFABdL244nmHeDfx8lGcWFM0EbGoEtVHAlhQzFuLra7rdP0N8bdVrvfLpbnIB6Zo3nMvUfkSSIBVvkxDiDlQFU0/XbMu7z1igOqZ4aHJfim8odM9v5ecekqAJqMn3Nr6vVf3AK7DBFysfwS4UlMRQVRECbBKFmwHoFpaUewl3kXMrgeQ+6YAqkTNkwDAheVlq+tv8n9TfKCA63a5CbgQQgWUAKskoQqokOXCUljACIV9jpy9xVhUbL8CpWbfpBxG5be9ucj2OVhcX5Ae3EUmc4vrX7rGQks0RwkkwJqjAHldSglQuY+KqQkfEu8hfqoYAqhoRiR5I43RI8CI8rfF9YD8XxZ/SXrhKRGFjuh+oj4lkCpQn4LjNQFVaNJJKUPfhq4/oNv7iD01IQEVghofagcupkTsJ/34KiJo15fxEUt5OU2A1YcspXjILW7+Mdnzc+IX58Glpl8uiDF12puK10gO/yPg+inykP5giaVmIsLokRJg9SgwKVth2svP8pkvilmMDCWgmpRD+p2UQDtwnaLbHxZwhWU/sS4lgXUngQRY3cmJr2KYcS5l+5f8j9drnxT/t5j7Hu5Oo34SRqJpEoj1AxA7QPxJ6dI/AS350/ytaSLrfCMBVme5TLkrpXqclAvrCeB6tRz6JJblWkRnK0qXKElgNgnEunKzHv6A9OpUXop1bLZAxvn/BFgLKH0pUWxVLaFHvyJ+a/5K6lBfgOzSXzNKoL1j/nt6cncB15+lb8namlFsk38kwJpBQPEXT/7t9dih4meIY/N+hrfT7SSBWSUQ69Gf9PR7BVo/5q1Y92YNZcweSIDVVuBSFmQSRgDlZ2b6YeLYqvJcm7Y302WSQF8SwFK3TmFtvUfA9TdAS/40ktgm0gRYkUCkJKz9C18++TfRX98WP1dM3wOySp3qEkKi0iWAztFUpEl4h/gd0sMz5GJtFTrJ9bgTfTSJJAG+aBFY7a9bp4sBK76AKFICKwkhUSUSQLfQMXQNnTtd+ogOZugkuok/UVoqAlDFTcDnSyl+JF5LzPAzX70EVBJCooFJAGsLncSYuFD8RoHWrTlojX0TcawtLClBACMpxCPybyPluFoMWP1TnJqAEkKigUsAnUT30EF08Wp0Ex2VPzQRcceVxhaw+GJhbovlDeb38VKCJ4tRDCaGojSJkgSGIQF0Dx1EF9HJ49FRdBWdRXd1byxpLCslBa6Cx6paVKV+rJgO9tgUH0tlSJmupQTirgn6VbeT7oZRRHS4limuMFFjB1gRWHGsO+fRPU9MwdPpOXbyUJ4T1V8C9KXa8r9V/tcIrK6yLtc/+eWlcGyahCpc2n6eX8XuCpeJDVaY2AmsytOrFFK5EkA33URkYOi30uWt8lbCwuh2udHVN7SxACwVKIdA0P5n4fKeKo4TxVhUzK8a2/4A5T1RsySArqKz6O6J0uW90Gl0Gx1vVlb6S+3II7MKsph4Jz+Llt8vxsSmbyBNWZAQEjVOAvS3AlDU368JsNg4ciwmmY40YAmg4r2rfqIyfZ2YL5SHjuVNlCTQSAnw0QW4sLY4J3FbchHrPNejRiMLWC44uYuo0BhdWV+cOtdL1mDJt+sQVam6fjY92JUEEL67Nc6Vf1PJ+GHrflchNOyhkdQgFZinLSyu8jhbvKqYiXh0XCbqUgIGI7t+zcBj1/e7dQmvPUzedXh2uw0vPVfo9pWSxQaS318k31AHRk02IwdYLii5z1Zh/Vr8AnECqwVorsHDLoDRDWj85z//yR555JHA//rXvzKYew5noYUWyh772Mdmj3vc47KFF164cBeQlOIvwjF1mx4/P6audfxm5X8dyexulcPIgdZIAZYLSO5zVWgXiJcRuyDlTYQEABQYmgkM/v3vf2cPP/xw9sADD2T33XdfcP/4xz9m999/f/bXv/41+8tf/pL96U9/yu6+++7sz3/+c7i+9957s//7v/8LDFg94xnPCPz0pz89W3zxxbMll1wye9aznpUtscQS2WKLLZYtuuii2TOf+czsaU97WvDz3BOe8IRskUVoxU8np3umNE9/Y+zuWNdvU87XlpzukMxGCrRGBrBcMHKfp8Ji0SgHmdJnNfbTFlzRJYsMIGkngAkAuuOOO7Lbb789u/nmm7Obbrop++1vf5tdcAG4PxiamJjI1lxzzezFL35xNm/evOz5z39+tvTSSwdQA9wAqphshSUAi6VS6Pydugto/cF1Y8pTDb2YqgENzYQLRC6W1cXipcRjDVYLAimsoLvuuiu7/vrrsyuvvDK7+OKLs5/+NJxANU0DALjnPve5oTlnwCBsmn///Oc/A+PHIsN1vAYR3qc5SNPw8Y9/fGBfExnPAzy25KYlQDdWWmmlbOONN85WW221bMUVV8wANqwxmpoxEY7jje+Pod+6D2i9XDIZGUur8YAlhQ9TF+TSZ3WRGAvLBSbv+FA7WDjnAAuW0zXXXJNdeOGF2SmnnJL97ne/89/BfcpTnhKaawAMz//jH//I/v73vxegBBgQfhVkUAPQaBLC+AG2v/3tb9mdd1LvptKOO+6YbbDBBgHEll122dCsjJ9I4FXUgT9ILq8QaNGnVUzziWXVJH+jAcsFIJfRwEvEdLCPHVgBJDAV3/Tggw9mN954Y3bJJZdkP/vZz7Jjj2WN96P0vOc9L1godJo/9NBDod8Jf0xYKxBhV00zxcX9pz71qRmASt8W1/SbkWYTFtfb3/72bN111w3W2HOeQ2/AJFk2vOc4/N8YuK4LNymvayj/90sejQatxgKWBB9msMulhxbLaqymLrgixiCFVXTDDTdk5513XvbDH/4wO+ecc4o6SWc3FZ/+KjrRsZ6aSuSZjnv6tbCk5s+fPyUrH/nIR7JNN900W2WVVUL/l/8cU6vLHfGXSw5YWv9w3bFcmuQ2ErAkcNYGhnFv+amV64tdME2Sf89p7QRUNPfoHD/66KOz4447rgiTphJEnxUje7EFhbVBWE0n8vHkJz85jEI+8YlPDAMHsfW1//77Z5tssknoyKepCXWSYdPlMEv6XTfOlbyoK8igqEOzvFurvxsHWBJ0SLMEL2+Lds52YhdIrYRbZmKU11DRbFFhTdFhfuKJJ2b77bdfERXNIyox0w8Y+TNxjzBGkeK80ffFVAnAiyax6bWvfW1oNq633npheoXvY3VZpr43oq7ryE8kr+2kC0U9GtH81iNbEvRjSYncg8UQx32PLKlCtTQCV+RPQNRSp3nrda97HegTWHOcWi984QtbaiYV9/zfOLvqtG9pakRLUySmyOWggw5qaYS0kCmeWMZT/hitC9eVg6UX1KFQl/AnqkACEnAYx5b7oVyP2DX0P7l/pJx2oNKkzNYPfvCDlob4i8oHSGmeUktWRXFPX8/CryJIfskAmQDmyy233BRZfexjH2tdccUVU/RmxIGLukKdgT5EFZU7dW5IBfV2LIO0YOVuI4YwO0YOrDoB1ZFHHjkFeKh4mkVe3EsgNTswW0YaaQwWF0BPfYX32muv1uWXXx6Uip/2Mij+GA0PdcYmOwevJNBCCGWSBGzLamX5/YWw0EdDjdCiqOmnjvKWRvqKSiV5hmbfk570pHDPFZD7ifuTAaAVNxc1uti69tprC32iPACvESTXHeoSW4Un0EIIZZAE6j6rReW/NVceg1Z+2WyHSuGKoUmbLc2bar30pS8tgAiLykAlmRb3k79/WcSAr5n8rRe84AWFXDWy2NLIa6FU8YekuNl8j+vQfGXlKdRVualPC0H0SxIgQ4FhNEMup+FC7jicvGrwb3vTQ7PPW29605uKigNQabQrXMcVTPIsnkn+uckilusyyywTOukt0+9///stzbQvNGwEgct16efUUWW0qG9cJ+pRAhKgm4IH5FpjARdK1FRPrPz33HNP63Of+1wBQi960YtamuSZgGpIwKypIS3tJhHkv/7667c0x61Qs7jcipvN9jCRFNqf6ik3dcL3iFPhcQtO7rZiiAMkRqJDwUqPhUXzDz2BGfV79rOfXVz7fnLnZkX1Ij9bXIy88uHwu//7v//b4sNichn6usEudYq6BaVOeBV4zyTBud9qQv4HkaTIHYWTVw38jZX8tttua+2+++5FhdCs9MLvSiPBFfeSf7CycBloV4gwHcLyP/1090xMHSRpoDrGSTZg0f59PhVWburPQhCzkQQV+qx4Tv4LxVDjm4IxWMVW1fLLL9/SkpEATK4kZD1xvWQQjybus88+LW1eGBQzHjAJN5r74zpWbICmrBR1kfqYqIMEJCT3W30+L3u3sRupCnHHupbKtPbdd98ARlq4O6WDV6JIIFVTGfhDoh0jWiussEIoJ/zaqqfQyfiDVNxsnsd1LfVndcCmabdUvgarTfKyphnY2H6rWIkZAbSy4yarqrkAHTffv/GNb7SYigJpA8PgNviHuuaul02ooLpOnfDTkGpSMGEzJwnoKWJPgmmsBsRgdcwxxxTWk5XdX22ynrg5MnC5MYrIIAllt9NOO7W0g6vUdrJfC6u6weQ6Rx30/KxHN1pThhNJAhIOB0LiHpUXttvU+WVzHIMVc3g+8YlPBKUGqLSLQPBb6clu4mbLQFs2F2WoPfALJW04aLnuHZXXyVA38SeSBFTKbgq+Pi9xz8ItFKApHoMVM6W32GKLoMyxUo8CWJEHM8XXLfudUZABeXY+mLdlGWi7n0JVrQvFjWZ5XAdfr7wVdRT/MGnoowAqw7CRmFy2Ob5OvKSYI7gbNayq9CvJWdiLSgtpw17jXGsuTzjsQcpNoXOrETRTernPXusxc8AEzL5S8d5S5FeVNuwKisshFTHLCpkmi5ninfZgTW44veyAyo6ut956a3bwwQdn73vf+4IsyGMsk5oku5tkuA7+UQ+voHxyOOvQN/2rA2D5EIkjJZgdxd6Huhuh1uIZKiaKC7Et8YYbbhj82ospKLCVOtxs0A8VjW2IvZ86SacCsqOnJlH2nRPOKyRMQA5iJ1QOm+DknHhX1L4jGPCLLl9AXMupMi2gzvbee+/sk5/8ZKY1oEFmDQUt18WjlMe3Sc+Hvh/8UAHLApC7hXTsVLFRfcAq1390MVj9+Mc/zt7whjdkHIJAxeOgUStz/zFU92Z72jjcFCuBXTshDk4FSGYijt9aaqmlwmGpvAcI8S4VF4sKGXAYho/w4mix9tN62sNW8yoAmUGMQ1pN7en1/bq5HEUGaKELhx12WNh/HnkYoOuW3lnS4zr5asn/NNfZWd6p7O+hAZYyrvyHbY7pv7pG/EKxhVNZhssMOAarI444InvXu96VaeQo7CvehEMeOIWGE5kBG5pq7Yc5ICu2Fl555ZXDwaacT6ilQ2EPdcCNbYgBJzcJcQGVmKiobg7icggG+8sDhAC6ZvyHI8iuuuqqsCd9/C5+DlIlHoCPbZ/j/drbn63DNflHLzQhOLvuuuvCST6cWMQhIA0FLddJ9pt+sfJH35acsFHkwEU+VbsGGL0yHY7QlvtZRfs/YpufA0xF/1GhlCgndOihh4Y+C82vCvuIU/nrTFiAHNyABQV4mDioVAMF2aqrrhqaNjzHMfI+vMHPVeFyFiKARJo4dRoA++Uvf5mdeeaZU6LTNjDhrESstbrKGb1AP2gecooRHzHyAvg2FLRcNz+nvH3UdXdKwYzyhTIcOi/kriD2RLXGTF6Jh6zZH1xl1dLx6sVIEdd14PwrGNLCDqXs+RTvVEoa3/3ud4eNAnWgRYtNA2ciVbSwwaBdZNDOM73b/pzDsBvLMw5DVlXYe52RNzbXi2WqPqEwD0qgWtyP8xs/Owy/0+IlPbJiW7JgQ/YEtHE2m+B33aSuriB5AsiNGhQjzX2TMyv3ZDHkIdTJqxr/xpWrzmClwmmpudZij6d4czru77HHHq1TTz21xQJsQKOdYiCJ89v+XNnXxBXH3R6+rK+WBjVa6swuQIr86FDYsHOo9w7jXh3YoDURTXvQKGLIVgNBy3X0ZMl2fABLpeUJolvnCtmYz01ceQ855JBQKepkWbmCqC8pVOAll1yyqLjbbLNNS4MCrT/84Q/F7qYGhAWBhJ8ZhhsDWHv8bPVy2mmntXbbbbcij+QfcPburJbHMMHLabClRZnccccdITsNBC3X1a1z0BrtCaUqpdDpI3ch8TWh1B7diye/rKcTg9X/+3//r1Zg5UrBHk5U2NjS+PjHP9669NJLW+rsniJYQCrO05Q/a3phAIvTTT5+//vft77yla8UwAVAsVsrzTD8ls+wgMvx29JSH2ELaxEi/Q0iAxZ110vphtYPDmhWSsqkZ7TvnheSlwDUvsxcSbwu0AuZrYwS3JQKM4hrx01/Dkt/XEGJ+2tf+1rrlltumSJXW1JTbjb0wuAVJx+ri4M7Yqu3LttMu6y8lnSzzTYr+gwbBlqus7sDFpL/aC6OVsaMyIvJ760bG/F5sUL98pe/DKDEolf6hwYBSjPF4QrAyS+aC1Wk5Zvf/GaxEJfK7IptwOXeqBHlE+ePw2Z/8pOftLwkirJyk2wmeQ7ivsvMO5nSnNUJ3qE44vTXvHxcZ6nDi0lugFao2/hHhpQpW1f75QVipM4v6+kYrFjYqsJoMSoVN7m4N0i20mu6wZSdMGkS3XnnnYUQDVTFjTHwtOcZ4OLwWZcPTTKPKlqO/m9QruO1hf6Zz3ymKJkGgZbr7n6S2+hZWSoRW1fPkf+BvIQ8VFoUWN08BitG06zQ7dMCfL9q14pOPN7WBP+HP/zh1o033liIrt3aKP4YI087cN19992tAw88sChDdnmlvw/5xXKtugwdvuN00/WooyY3KGkQYLnuUpeXUr5Gy8pSpmxdHZjXGyN0bauRwYotYjbffPOg3FobWCi9lW8QrhWc/cXdcbvGGmu0fv3rXxfya6+kxR9j7GmXydVXX93acccdQxlydD3nEVJ+lu8gytJxOE43D88+++xQUta7BhSb6/CBytPoWFkSvK2rZeR/KC8II3QtyyX+0nlLYzpvKRcrmhVvUG5sVTGlQjPUC9k1SMmLNA/SE1ud7A5K/5bLDWvL/mGULVst+0gxW8oNKU/XYer0MpLhaFhZyoznXR2UK6mReZA621NcVpijjz46KLM7bwep0I6L/jJ/hdddd90WWy2bnE5fJ3fBEojlxQTOnXfeOZQvVqub+pa7QWwQrvvV1llnneJDFH80F5yrof7runxQDljNnpclUdq6Wkp+H6FrZB6qpGeK3ErtTnbPEh+kIjsuziik6UKlOeCAA1ra9SAkG2VuiELPJOah3UduLmMmbnK6s0HJzW3L3/erdB2XLXh2qDU1oIxdl6nbze/LUibcd+WhECOyy6RWrhX5vvvuK5az+MtbpdLGYVuBDZT8d8YZZxRychqLG8nTlwRiOWK1un8ybiLG5VKl32XukcOTTjop5ClOY1+ZHMxLrtOfkYya25clWdm6epr89+ay8xyOwYiyz1g++tGPhq+uJ/lZoapU2jhsKy7HpLtfI1lVfRbmAl6LrS0+UtolNJQ7oDXoeXbomLb7aXk5lcu9AaDlOk0df1oOWqHu428MKfG2rvbMdcZIvAAVGt5fVgzWp0nIxaTDQYOVv/B77bVXi3lEUAPXnA2vIPuI2fLFZYUA5U/zkA5x/IPUAU8C1uZ/TZpU6rq9JwClIgh1H38jSAn2msGF5b8+1yEjcX5ZH8dg5flW2tQufO0Gqah8XT0SyCRQ91+4MtVHWqOZEusAuTvhhBMCUKEH7hIYhC44Dn+0vv3tbwdhx2kLN+r347pNXfcgW3PWGEaJ3j6XrbemqJ2oDQy473//+4Oisl2JvgwDY77k7kNhraKpAYrqpI6Eiw5YH84777yi/D2KZ0CpUjcchwcAmDsGNUAXXMe3x6pSkpszYqjEuv/qTIQtcmYmr2r0a0Vgfyjk7P4jK06VyknYLFh2hfjZz35WSMYVp7iRPAORAHK3TnikmHJyU21QemGd2G677ZrSNHQdD1vEqrCa0Y+lhHo30dVyDWPo08Of+a16OAYFlm6glHS00jSrGqQcfgxW2go4CIU0OV31kNJ4psKgdc011xT6MCjQMih6/h3zASGnqaYlEtfz1aTjWFml70paBQq67fpOEi1ig3PfCzfq9vOtb30rJElNwUyr5weSPPZU5wAI9ibXLhDZRhttFI6DkrIWe8UPJCEpko4S4FguAUTGCTgcJgFpcXk4EUkVseM7Zd10+Oxtrz60bIcddgiHdZAmfczKiqbscKjjPszAdb/W9R5EDQAot/ZbyPhrxeZ2EnSx84G/btyrirHk3Gf1i1/8QuKa/HomyyqIolY/HvSILS3WdFalG+3hWk/22WefWsllhsS4870ZW88oEx4heHueIbdrZ8jfcG4bGNiLaPvttw/Kp2OYKldCg6FnNZ9yyilBAAbP4UgjxTqbBFw+l112WdARAEsW8sD15eKLL26CvrjOv13gW+/Od0nTFlatO9utgO5od1+BAaX9K1fGtcP2usTvfve7QfkATwPobBUn/T88CVhnzj333ABUbAjI3vll6MZsYXgyaUM64A1Y9e58lyq5s73WR3cZHJiU6RHBqr+WBivPr9l///2Lmuf0FDeSp7YSMGjpYNQAVC5Pl+9swNPP/w7bH1U+spDTUkNheYCN5mF9jwRT4twc3DcXome/1kqmLmgvenXzrB9l6uYdK5zn1bzzne9sscUJlMCqVqoxa2Li8vIRb4MALfTMs+5f+tKXNmFHB9f9fZX2+jULVdLFaID83v/kX7NqwIAfsMJxYgly5PAGnWpc+dKLZz7zmUUz4t57J5dVGjgHLIIU3RwlYB3io8PHBz0a1ERjf1yx8KAa65Dr/uUAFqTkFhgxeae/39Dn1N+rU95y39WauruqmIIsK+wpEc3lQkILr598cjgLMtPi5kzHXyHMuQQ747uyrsIUBR/1rhOMwzC1FC1jiDpR8yRAmQq0ssc97nHZ5z73uZABnfWYaY/9SjNDvEyBgf77v/870yndQYeq0t05ZgblplKtovS9PA+rFIUvJRAlyOFskyeudnOvKFhAQhZOpi9jAJLbb7+9sjlPKBhxqskQ5tDoENNs5ZVXDsquztpcTMlpogTQIz466gzPfvOb34QsaN+y4FLuVRC6pO26M1lZGfOzNB0mRMP9GhJC8JysrfP0GSOGm1wJrCgh+S8XQzYJJ69q8Gvz+cgjj6SEi4XG+Ktiz6Fh5wWTmxS+Tm5zJeCy9MG6VfdnCQxbiy66aNDXl7zkJcW5hk5HzSRpDCi9WTgnxJOQPDr4skhgHimIbg3P6wL985//XEzYpO+qKqAi3PhQU5b+QAbN4UkixVymBKxXzOfTbPSgT+wSW6VeEbb7stS1EbJTU72KMeBlSjctjjk3Lcow02xhvZpEiWrZHCRhOmUm017ewaym76oKcpNAi1dD8GeddVamSamhCZH6raqQ+PDCpKwFWpmODMs+/elPh4RQxjT5rQdVpO5Pf/pTCPbrX/966IMlToFBFVHNJcy4WWhsMFb0HW4ZgPXvPPYtcnfOieo7Nx1epCApUADq8MMPD0/85S9/qUyhiE9Nwez666/PtHNp9qpXvSrEmfqtOhTOCNxCtwAt+pa+973vhfWG2t66MgABCNFf7Z2WMXik7Z2DFGsIWKTLWGDAMlb0XfJzAiwJaSEJUE5rnlKwep6KOYXZd05meNEFefnll4cCRrH4Qvn+DK/1fZvRI223G97XlrvBRaETja4EbE1tu+22mc6wDB8rTWWpJMPW27///e8hfO3kEFyAs4bkRNFdNC/HCt/rK7lzelkx+v0N5F9EXLvmoAtSu0gGAT300EPBLfvHSjsxMRFGczRXJtN2JOHr6zSUHWcKb6oEqMzd8NS35n5F2fNR0pFs2X777RcCVOd4cK0Xc49lagh33HFHpoNgsy9/+cth1JB/a/hhxMICE8AGMAIyZkxe9fg7p5cVlxvOm/YY70AedwEyT0bLYcIcKE0araQ5SEVhK5Abbrgh23LLLQOTyaoUdiACrFkkBiPK1ex7ljXyno15lvccBm4cTj/Z9kdp9dVXzz7+8Y8HEGG7IsKtijy/j+2JGkDGiDkJpG/AUkFILx7DeqEnSFhr5wLrO7wqBa7tbkPw7D/1yCOPVKZEnjxI3xXKREWg8iTqTwJUdoMKfgMR4GD2Pf5nLzPmKulU7DCxksmVZp3pmGFdM38K4j2HgRuHE8fZS8p5D2KeH0S/qbYSqkQHSC9zCiH2cyN/5AM51IyMCWsrbU9QusGMvivFXPZdJiGU/sriCTGS6jsherdUouAoQNr6P/jBD0LYHl0pNaI8MJp/WFfvec97srXWWivcJf5EvUmAcoMNILgmwAYwotOZWd/0FdI00nSVUHnZYI/7/E+583HiffoVtRYv05SDMCCCSx8TFhBWMWXHx0xTUTqO8BmInBa7TpddyptnGXQ59NBDs/e+970ZHfBM9CybkBGyIPyLLroou/LKK7NXvvKVhezKjm8O4VGAYMOEGKxgpq2xQ97eqAzAemUeJW3V2hzvY6UHRBhNmTdvXnbLLbcEBea/sgjlJTyb57vttlsAShQ3AVZ3UkZ+MPJCngYErCXNYQsV/ve//32olMzwZmpKP8TAy0zEzqI6Kj5bZZVVMu2MkE1MTITpKIsttti0cowBzGl1uL6mAx7AAkS17XamtYchj36uLBdQhpALgOX4ywq/hHAALBIJNoAVQwMsD32tq0RAJKw25IJj7hVkkLJbVkIJjy/0zTffnO25557ZqquylFKfkGRdzSpiZEc5mbmmggNO2qwu06Ec2a9+9atp4WAhYQ1BVFgsL+0MGvy4AAphwZDDZ2oJc6awuGiq4UJYKtdee23gcCP/WWmllbJNNtkkW2ONNcJWyUsvvXSwyNrLth3AuGbuHU21nXfeuTIri2QiL/KlI+6zd7/73WG5kOUa56Usf59hGxvAiq+IjR09J6svC0uJlg6Etii9/2vksdam/WOh8oU+6qijQvK0/1XPwpntBSoCcfEFhd72trcFF4VtV+rwR/opJOAy4gaVTrt5BoA65JBDimfwMBKG9Qoo0SdEmd5zzz3B8pryYH5BmcxExNmJKCtG9dhnn7IEALCIdMRW4PidXXfdNVgygBlNP5qU7WXteLbYYnJqIn1NPGNgi8Obqx+AZk6WTooOFujGG28cdHJBcug1TvIDk4c+wzU2rKFw6Md6WK6cx3QukF4TONvziszLcVaW3xRPxfe9obhS7hCvj2nykfPKFwIqlb0UY5dddimW3kgxh5LvpkRq+bBP+t577z2lPFgrp36ZsIQqXt5Udrl1E56mKYQj2EiPmohT0un3OcuSvdXQNZZ+tdPBBx8c3iMMv1O2u8wyy4Swy9r3nfKhDrkexXlimZn3c4vvz+KPKwT9WADgnJfpEE5XpMiCZSb3bXlCvS1qfjlcxxXisMMOCwWp/qvKlMXrus4555yQ6U6FPFxp1C92y8ib4LFtNKdeA/7tx6zlX+HKyk8K3zHs9nhlXbSe9KQntdj7H/DpBECA2kc+8pGWduZoqRO8JYuwNX/+/BA+4CdLsZK910iX8+H91lwHuin9GKA6vUeY6PfHPvax8CFht16o07MLiM8YEZoheq6v1l1fL0Wo9orIXwuvBBHMVpoP2k42pImhbSlgMGvLTCTTGOjU32CDDTLm30DEk6g7CbgfimYNTRqoXX6U5zCoPV5VzjDyyNQImqQQE0XRAZqsPM+gzuc///kiudodNHvNa16Trb322tkFF1wQmpvt4RYPz8FDmljBgS7CNFOJZyZZxmlwMy9+lrrDaCtNYvqADzjggCJ1L3vZy6Y1gYs/u/OAGUd29+j0p/oFLK8JemkeZG1qqQuKva5OOumkcI6c56tMz/7c7rAHEkPojAzS/4FSowCJupMA8oLs4o8rE9d1ova0MXXCS2RIJ/1fgAVAxpwwNRMD8x+d/dyrijxayGAFAElaLVfAyEz8MThxzRwuJlQDuFdccUU4J9ObXPI/pPMPMlmLRZiTd3v6NUYYM4whPQXSM2BJEMpvWD/4NMW0XB5b7WopXwcIIOFrUQUxugStu64HSquIJYXZBAkAAgAS88IgOu6ZEoH+AQZ04ldFxE0rAqJVwRpWRkHbCXB98MEHw/w1posAQOpHzM4+++wwKhs/75FYnidsBkawvOZAxojlhCFPU5r/YizpJczpuZr9bSIGHV8gfoYYm93oKe9wyRbOhRdeGBISfwHLTBmjVyin+iwydXqGoB13mfGksJohASyamNRPV8y4j+9X5cdKwrI7/fTTw5wsLD2sfybV8sEGNNnZ4bTTTuuYBKbm8D7Nc0CK5wE1CL1m4u0cCYxASGAG2HGJ2Fgib3fUD2AZnFbKowC8+gmnuxT28BRKw9eGKQzHH398eNM7J/QQTFePUrgQq/Oh1BwMYkg/kQTaQSz6q1Qv8QA0ME1PT6eYKRLAiX436gpWE/UFC2omKjEfxgqwA8AylswU9bT7cwGaMDw5LcQh3jBgYflcd911YZ4Ms6IpmLKETliAlTuJ2acd4n6iJIFhS4CmJxY//WlYRnxI6d8CzGht0GzFeuJ6iNQ3dvQDWJ6lusIQM7zAqAEryO34ssCKMAmLznZGZphdjOkNJcAKYkg/NZDAbbfdNmMqyvx4zxjJ7H8YO4wls7+RP+GOsK5eUGVVfh/DJDDMiRfmL9XGtHAfEgtBoao6Ot0cdGe7R2NyeSQnSaC2Eijz491HJo0VL2zDkq6D6gmwFKojfJb8z85j8b2uI63iQRcElo873PGXTaw/8zwcFsxCyboqW8opvBGVgLEC7ABDIN+bvJrlt1/AWkrhLiau1QgheWVkhEWzTOjzUC/3y6KnP/3pYfSHRa0M/SZKEkgS6FoCgBOYAXaAIdBAAOv5k3GFVdc9RZi/V7pjC8vzYACWKjoW3RxkKw/m2hBvsrBKL84U4GhKAKxwv9VEnsWe8KNfC2teHpkjzy+H77AdMlQViDhcHWQZ4jFQhov0kySQJDCbBIwZE/mDlQKWE/M8e+riGkjYlwqqYhkEFpVHYNitEnK84SL9JAkkCXQrgb4wpFcL6z95aiandvfY/uw2J70+52YZTUDPj6oCsLwn/Fve8pYwtYF0JsDqtbTS82MuAVtUxhBjSldi6Rew+uow6ypFc3iIiXEs/oTwlw0m3l2AVfiMFqbm4BwKK706rhIwYBlDqgEsVU7V/7DomcmmS+TSduS1ED6jguzbTcd4FXOwaBJCbOUBJcAKYhj4Dx+iMj9GZYc3cIE0K0JjxhKqPwvnmOJ7s+akl5nuBMqQJKsgGZasDQEcKJ23QeZEFEYLywQUJqWyoBVy/1VtBDBmCeHDwVo41s3hsqKBe1i96AHlxGReM+Lhf9iTi71chQ+bl6zgL1NnxqxYes0uGAKWsHe5sWXWMHoBLAf2VHkMWF0jo1+u0vV2LyhwmbPPqQRUBh8TxpQJiPuJqpcAOwWwVYs3ygNgyt4yiD3dWRQMoNEXii7xAUwAVnr5utKAIWBJT4ct9AJYjmhxRfKE0rNRQoAs6oQAkrIVjcWkKPFqq60WzrArIbkpiBkkwFpN+gv58LCbANYyh0/ExBpONqpjYzn8vMOWP3QH8HGJT8dBFwAhwsKKYgUEo71s7MieUGy0d+mll4byjeNg8jHh8vFjEIcuB7ZeMVWhZw57DFwwBCxh4aOxZdZs9wJYDszWFc3DWpGbhGUnCoUHsCB2Z7C/7HjGNTwqPlYro7AACztssI+TiTWb6623Xrb88suHE2Jo8gNSgJMn8vrZXl3iw2JjhQQAxq6b119/fXbJJZeELYq4H5MONAlWGMDFB4x3y7Tm47hG2A92AFJsAtoT9QJYRsEYsHodZewpcd0+7KYZm5hBZVtXhGmQQmH5ehOH4+X/RP1LQIcohOko3ruMPfLZ0wlrliOsOONvQRvIubztdpMSlx1WHNYcTN+k9+bHoqILgInIABjHkP3whz8M50/G4U9MTIS+MXSP5xN4xdLp6AdHGBnENZYYWzq+EN/sBbD83qK5pzYWlpXPe7d7f2snuAyXDluIvpRE5UjAgxjsI/7GN74x23LLLTMOOeC8P7YWbqcYDFzmuLG//Z3ZrmOQs5/w+EDRxIRpenLmJNsJAWAc9Mrx8ByUSpPShLVHPxjpxALDSsSCMxGu4/C9urpxWkkzgO5BjhLyYOygD6sn6gew6NmHHOnk1ZB/UX4DVhVTGvgSQ3ztIQrNFSXcSD9dS8Byw2o68MADs9e+9rXBuqFCmJCvKwbPwx7h8zNluE4LYcX+TvHTnwVj+QGwOgcwABb7op977rnZN7/5zeymm24qksWzNF2x1rDA6IerQjeLCEv00A/IQAQfaACYpjKEFRnLqc8ojR3Tv0qzBNgPYPUcySxpKOVvhOr+hvirVkrgCsSAhQImmpsErPA77LBD6CB3aLag+N/s/wbtdoo/BjHAk343mGbkm9/85uxTn/pUqNjsna5z/LKjjz56Sl+c++nIJ/2t1tdB522m+OhDBKDQddIGOMHQpptumr3hDW/I1l9//aJ57nKcKbwu7veMJf0A1uRm5l2kZhCPoEQIDpcOUMhNjTLjJ3wotgLKDH8cw+IrbhCgDKuwoMqUazuIOe3EQZcB2w3BNCHf9a53ZV/4wheCxcUoJAB24oknhhNrnCbyX0X3hcOfySVemnj0HeJH7liAjLLHA1eA8CabbJKtueaa2bx588LzM4XZ5/2esaQfwJocLuszhVW9hvIYqAwuZcblMCngROVJoB0Eeg3Z5cJ7sX9B4RAnZHdBzy7ov/a0Ez/MfT5s7K0Ob7jhhtl73vOesPEji/OvuuqqAGDHHXdceK6KZiJpIC1YTTTtsJpg4gKU6F+LR2LJ51ZbbZWts846oR/xRS96UTjTM9Z356/ED0vPWNIPYNW2xrpJsSAl6/c/g2FcgP2Gld7rXQKuLH7TlSYGndjv57pxY70hjH7Did8lvRAu95n0ymAC/KpXvSrbeuutMwALy4z/6OfyO92kebZnCIuBC8Aptpr83sYbbxyasuyay0gsI6RLLrlkSIufwbVsnLd+ZROHGfl7xpJ+AKufd6I0NtNrZXJfVjNz0ZxUI2/LHHByhYlzQGWiI5sJoTB+d2zzgXFl433KjSYQfTS4jOjR6R8v12kP29ed4vZ/M7mu2HadH1zi9DQZgMr+mcLq5z55Qxb0EzLyChgtvfTSYRAAP3LoNBLrdBInafeHoZ80dPFOz1jS8wtdJGJoj1jBq0iAw664AKtIeiPCjCtKO0DxH7PMGQXm/DyYk5GYAc8I3fnnn99zHukoX2WVVYLFw4RUpi8wJYFBFZpQ7eUcp69fAOM961G723MGZnmB0WwAi740+qFmok75MsjO9E6J97uef+U4RwqwnKkqXStalXGMU9iuMAYp5x1wYsb7tddeG2adc6Ix8586ERYLUwhoWtF35LBc8RwHHdxYYoAfS3HgdmInWZpsWCXsykEflJtKDo93HCZ+7sf/ca9b6ve9bsO3lYnF6bhiF7+vuw1zmM/1A1g97V8zyMxVKXh/cd2XNch8jXJcrjDIlUmZbA/EnCbmZ7UTTRoAiXfoPPayGkCIDuRuyoZ36YekSUSzED9hAkA0z+gQh2OiM5rhfJZlveAFLwiWGO/G+mYA8z27cTix30AC2PJuVWS9JT329xuX8zjXcKL4J7c/iW7M5u0HsB6dujtb6AP+fzYlmUtyXEjDGIaeS7rr/u7dd98djmU76aSTsiOOOGJKcicmJpe9sFiZeUG33377lP/7uaDSAXYwllY7AUTu3+FZ4v3pT38a2M9uvvnmYeSPjRwZTWMqA9ZdrH+u3L5n12EYXHmPtJRNxA/NdZDI+UD/yUN7PuaY7oEAVs+RzDFTC3w9FiBfKyi+t8CXe/gzAVYPwprlUawL5HnyySeHWe5+nIrP/CD6XgATmoSueDxDucbXfq8sl/CZy+f5fIRLhzjNTS9NYckNx8jBJkb8WP9IvxgWGIuzbQn6GVd8XPQUaw4CILEQy6RY/3vt0Hc6SU87SLGlD5NisTbpsOfZOK4+8tCz8dOPhTUp6T5SV+UrCM6FY3ApMz4XTLKwypOq1+ExMRFwYuIiFheEvKkQMbVfx/+V4e8UPtYP4OI5S6SLGeuMwjHyCIAxIRQ2sWxnQ829olN/QlYiAMaz1iGeMyiiswB4p7gdXj+uw8OCm4n8jN12gCJdgBT9iL/85S+zz372syGoTpbpTHHMcr9nLOkHsCank8+SkkH/jbBRIsiWVplpcJ9DiYVVZvIaGZYrE7s0eC8zZ8SVyNfDctvTwTXp9c4SpIvJmTB6Rz5+9KMfBXaa3/72t4cJmSuttFIxmdT6BJDZ7+fn6gKMbnK6LpDuOB6DE3HFQEoTmL5ERl/PPvvs7PDDD5+SHLb5iZ+f8mfvFz1jST+A9egOZr0nsLI3KBi+ZNBc2+2dEmnLii8OVGKhdYpuLO4ZDJouy3hyJhYTUyNoQqKTTL347ne/G9iFCoAxFwwC4CwH/z9XFzDyelp/FAxccdj0DWI50jfIom2WEB1//PFTttBhigdNdfSfBdDe1TcOZw7+nrGkH8Dy1o89z6GYQ8YW+CoFjtIjWMhNwwW+1OOf/mIlC6tHwY3Z4zQh40XD9GWhl/RVASSAGwAGeXJnmSKiHmC12WLl4+0+QdLFdBEsKI7DY5PCM844Y1r087RukHBotvIO+4EBwFBJHxdjx0AA6695Dh1pfjk8x4DF1wBCMcomW1h8MQEvvliOt+y4UnjNlUC7tQSAuV/OuaIlQMUHVHDb3/Fz/biERZ8bLiCz1157heYdoNOJAE3mmRmgaOp6Kxk/z39wieTAJnfc7CHgXiws94B6LJhIuefIe4i2mkcNWGWHTmF5JOfKK68M/k7LGsqON4U3mhLwvm3krkywsrQIE51lB4YTTjgh3GZ/eqZrYPHRXATUaBLCAFScDt6Nrx1uSW6MGcYSY8usUfQCWA7MkRiwfH/oLl8KqAphexiaSY2Y2Amwhl7cKQELkIDrACOatA4ALzrUY7LV5Gf9X/u175fo2siZmqAuIuil7WQU5FiecieOdJHQbh7hKwIxGlJms5ACxLRnmQbkEaIBFGyIL/0kCfQrAXSVjnJ3wsfhoL9D1GEwBCyBjC2TVwv47QWwHAztTltZXUfkl6t03SSkgNrnvcw1XvqtMKchjxTONcz0fpLAGErAmAGG9NyH1QtgOSJGCQ1YtZC3TVtmJE9MTIShWoNLmQn014gRlkRJAkkCc5IAGOIZB8aWWQPsGrAECqqvLTmPYTq9D43rOqJZU1LCA8w5efnLXx5Cwm+AKSHoEAQdlBCLY8tudoaA00+SwOhLwJjxZ7AkxxTfmzX3XQNWHpKfvzO/7jqiWVMyhweU8QBOzL968YtfHELyhLk5BDvtVe/cyDoyz8cqGxSnRZpuJAmMlgSMGcYQY0pXuezpYYXo5zleGnLkk1dD/DVwMOkNKnvyKKDI1Aa2uKVJyCZykOMNF+knSSBJYDYJGDOMIcaU2d4L//f0cBTiHyJ/rbz0YUGdliKEP/r8MTDRmQ/NtJlcn8Gn15IExk0CfWFIr4BldJyfS7fX9ysvFDZ5g5h3glVUNnk+FssaoDKnT5Sd1hRekkANJWDMmJ+nzZjSVVL9clcP6yEHPj9/gfd9L781HMfgxMJTNlZj6oGnOZSZIvdjHXnkkcWWI7a+yownhdW7BNCBmNtDWNB/7c+m60okAFYYc+bnMfSEH36529Q5cDpwGJbEhPG9bsOo5DkDFiC14YYbhji83UyZETLLnWOR6MPy9IYEWGVKeOawXMbtT2Dl0lSn35IVCKyhYxkK01yY6Q0zqRjdQCcYkKHLYKbw2sNP16VJAKwAM8AOd7r3hB+9Ls1x4PcoQnZaW0zse/IOlzzVYNVVVw0JKbvj3bnzzg2/+c1vwjSKpPiWTLUuHwZ2PQB0ACb3U1LuNNVZo+c1nwtKCTsYPOc5zyl2BSVcdibgY0RXQqLKJGCsADv+mMfie11F2hNgqWKqbFsLyf2PXGZPLi/uKcKuUjXHhzgcsioCnLwm65hjjsl22mmnsraLrSrJjQkX2QIeJsCJjfGwiLCiACX2bgJc4gXEfh6XA0GxpngPUPMEYt6h3NguhdOXZ9ofnp0UvJUKy7EAMXcDED5phOJ0hhvppxsJuHBvzDEkYEk3L/qZngArf4lmJCfn/F68ZX6vFo6VaWJiIqSHfX/4CtsiKiORKCpzsIjjV7/6VdgriD4z7jv+MuIZxzBo1tFsozmHLNlUDqCJiWO41lhjjTDfDiuJvabotwTUeBeQAtzMLhOsMPSAcjIIsb0xTXv6O9l+hf3K2Qq4HQw5s5AN9wBMLDDeA8wS9S0BsAMylkxedfHbD2A52CvtqYtr5aTPYuedd86+9a1vhb1+vJlZWemMv67nnHNO6OR33GXFMU7hADYc3gCQ3HPPPcXicmSwyy67ZOz5zuk0AEe8m2e/MgLYODQ1JsoUcMQCA8Cwwjhy7Mwzzwwb3cXPkgYsOHZBwGoreRfOOKpR9feNHf0Als26q3NpTh5VUxPR8iXFqmLvaQAL875swCKrKDX0xS9+MWPLW5ohycoKIun6BysIuvpqq1KWbb/99tmmm26a0Q/JJF0+Pu6rigNG1vGHg/96+WjE7/IejBVFkxJ+xStekb3pTW8KYIT+YO1hgfGBOu200wKwOT0AKaCL1QV4eRWE/2+ya5l6t4c59gsbK1zgxpKuRdQPYPkg1ZsUy5/EzxAT8WTjXp46kDveETQVAyArk2geMFrISOFll12WbbzxxgmwehSwO7ixhjfbbLNw2rIPS42DisHJ4GI3fq4Xvyti/E4cD/fRG6wxmLImjR/84AeDFXjDDTeEk6N/8YtfBCssDofuApq33jO9m4GA+P06+flY0ESnb48ulosvvnjah6LL9BojwAywAyq3Uk6GOf1XBRvASe75YohFjLUgAVNIhzpKWzpmCSG1ZGWxajv4uS6L1X8Swtp1111b6h+pRf6bkAiX0QUXXNBSs6ulj8qUZCNL2M9N+XPAF6RhQelRM7Yl8GrpINjWvvvu21J/5jT9UqWfdq8sHawiHIFtS/2DLYF0S03nKWl///vf3xIQh1LosXxcyOcrzYBeXwZOXy8psoUFACTgEMX9XjE7OPRjrem18knpCib+Zz7zmWyfffYJG+/ddpuXLpUbH1/T+fPnh2YNC69ViOHLXG4soxeay8g5Q27QXC0nh1eVS7phqFNaaRKiazRzL7rooowdapn+gqUi4KsqWbOGS1ohpz1+AQuSrhM39+i/i2nbbbfNttpqq2yttdYKfY1Yj32QMeJQpeV9SkfAkF7D6SvmKJKL5AewakUUCgVEPxZE/0JVZAXgOHMAy4pRVXyjEi5yQnawR/SakDfSHZex80Da3YTk/EH4DW94Q/a9730v23HHHUO/WPvhDoPKL+kFZJjiAShRH3CZj8aIJwertA8c7LHHHtm6664bDoOlT89gVkKawYy+qV8L67ESAm2glRXzFXnsfHb6Cq/v1M/wIkpEITE87X3emdPTPkQ+w+td37YiMGJEXJxeTOEmK6trEY7cg+ge5Y9FRR/WNttsE47SQkfi+VxlZxxAIQ5AEyCCTaSHtDAC24lWWGGF0D/HaOzyyy+fTajVwGAH+m2aowUcY8OqCvcKySlgiMPv1u3XwnJnGWcHzRdPiONE6XJ4ZEHTUfjxj388+9SnPhWGw8tuFqKcDG0z8xrA4rjyD3zgA1MKenhSSDEPQwLonvWPeXqc+8eUjJmO2SojjYATg0AzAVIcx+abbx5GYJlGwkACI5x81D33LX42BimAcA5kbJivMHzemDGkp2AfhdCeXgttYVtZP9arrxe7jdpjSNU8jrARMn0I66+/fjGiV0VsKCjTGjhFF1BkpMvxVxFfCrO+ErB1j0Xz2te+NjvrrLPCmkbma/Ff2QRY8dEEFF/1qleFibPoInPFmKYBGMH0UXGfe3AnigHKoNvpuT7uGRuOVbjb92td9RHvo68o0mBzyt1dDP1z0qnHr4QfEiIQaem0GzSlJbM5uPjL5nnz5oUwDzrooBCv46+HNFIqBiUBRhShU045JeiDgKR0XYt1V5ZSCF9HzId420dcw80OP+jngkY/O7wyl1vGht2VdoD70fYqNwZBijRMApO7Zp4TEGISJfIbw3YMGl/+8pdDoaptXony6KsRpk3IvA7ha5JhyLqVd9hySPEPRgLWN6bUrLzyykEX1NSqZEoNOqfO8xZTEFTfW2oOhkyShhiMDEq4/m8w0ihiiXFhTbBJ/3gCac9QNZeGqdugTLOfaYNSNwAAIV1JREFUL6Z5ifBqQxJMSMtGG21UpIlmYsnmbjD1iYuOVogZ9tAc2/0hjPTTHAlY3xgx5oRw+oiY9e77ZeaEMGnqMTH605/+dPBzD92G0b129n9lpqOLsKiEYMOtYi/JMXZ08XqJj0hAtrJ+ID/0yKRTj19/8bRkovWWt7wlfInUER9ciaFUV8oQwrOJrhnBQQjJyqqHLlSdCpez+jCDHmgvrpYAo1Qda9dZ65p2v62zrhkTfgD0KKF9W1e8PxcLi/fdaX86F3UjvigCrTDEy7owiI7HKkgFEYL10DWjk0yj4Cvn/6qIN4VZDwlQztDXv/714NLJje5VQeg1neqsb2TaBDtYQNyvMRkjhpdIVcRQSnLniR8WQ7Xsx9KR3S0VcvjiaQuSyvoVpDAtd7RqG+UgEH99w0X6GTkJuKP717/+ddCv5ZZbLri2utGJspllM4SpqTR11jFjwT+UyHlKLx/vuRpJBNM/KQEBMeXWbl2h0hTITUN9/UIhL7vssqUrkCQYwkRJYXfAs84MSqAVxDByP9YtOtq10iHogKz4yvQLPfNotyaKtvgQQ05HzQRcyvrBGJ3KQDu3SU/NA67GDo5T3aNfhRje2GKLLYLLcoSqiLjMxEHTkG1HUtOwKonXI9zDDz88u+aaazJ9DIsdaatKGZM9oS984QthjhdNz5o2B40FxgZjRVWimT1cVU53vK8uPxQPY07eqcGvv0Cf/exnw9dPey1V9hV0U8BNw+985ztBAsnKqoEilJgENwU1oz3oUtVNQfRKE0VbdOirZrbo4IdqqlcxDqwOkiiptQCsohNNCboSAYpsCk5e1eDXhXrdddeFwmYyKaM4BhfkWSY73Hn5hNLf/va3QQpORw1EkpIwBwm4HLXFcqE3WqJV+MvUpTgs69OBBx4YUu8P8RyyUtWrxgBPZQCwCqxQnvqiOTcJqZgiz1w9KU+FTcG+ElXFS26SsYSBZpqX0CjtVUQXmoUE7N0nt95667D1L+nAhE/UXAmgM5Qjc6DQJYjdUdniuSpSPQtxegE/W75AVelvCfmwkgdMACPyj3gJQc8xCCXGzcLaznpXGgvT2VaWm4W2hij/KthfRTY/85e5xl9GRJVoARJw2R122GFBX7TDQXAHpUdf+tKXQuqcjgUkdVh/xc3BOc9unyM8TX9dUilMPfl/l0vJJuGwhNYxXheyNvcLSjZR0XIdA5+V2Er9jW98I6TL6eiYyHSzthLwB+f0008fKFihR56WU/O+K8rOdf9yo4XuFRjhe0N1laCwVY3cfcWQFzxOXtXk1wqnzdSCwnmbYwNMFa5By53wP/vZz4I0nJaaiCYlYxYJuJP9qquuCrrzrGc9q5hiUIXexGF6Vrs/eDXXHdf9fZUHmq39bmPF69WQEuVm4YryTy5Zr9kkUuujC9smvZVBkgmKWJXLCI/nZ3k5hSuB05bcekrA5eSlN+hIVcu8Yv3jY8dEZ+4xSKRjyIKAamyh0xyEwIAVlG4Aq7TRwTl3upMgSIIlgZzkeq0uz+aeaHibWE/G3/FXaQz3OVKKBcsscWATPt/v+FIJN9m3yJ2mHAbKpm7D3uu7hGyNfBACh1BO7Gn1xje+MeRXo8xh08aqdUZ1KuyvRqTHHnts2AmU9FQd7xwK1XX+bKXx9zkm+N4cgp18tTTAylPi8I6cc8oqDIDCptDZBlb7CIWYmIyHclRJxMsmf5xWDLEdbRWnU1eZh3ELGz1hRJARwN122y0777zzwuRQRpkpz6p1hl1zNUgUNgP0xGfibQAZA4wJ9UsyaEqq5C4mntyg59HmoW7Vh6SIITHaWra1ww47BJN7kP1Z3lSQkUodAhDS4mZHfaQ03ilx1wFHeb3tbW8LOlL15FCqDyxQmhKfTt4JheE01bRk3BX0R6VvsRwL6gtYeQLd+X5wLlR3wNVOxi587V0UlMPTD6wsVp6yXYfv+FZcccUEWjXTDn88AKuddtop6IcHTVx+ZetFe3jWj/322y9Ixx/ZmokqTo7r+sHKC4ZL/TrbSVhMSqQ731fLcxLPyYgzVwu/leDggw8OSulV8MpTuK7KtdJP5NMqOLiSkUvIQBou0s/AJWCw0qTf1pvf/OagB56W4nKrSi8Ilzjc0c61dxOtuV7E9Xw1pRvAKq2znfAqIyXUTcOzcm3zJl4DV77ZIjRgoZw+tVd9W5WClQQfwrfy62iwIj6GzCGU02mbLQ/p//IkYLC6++67W1tuuWUol0FaVtYJHb0V4ma+F1RzsCKJruNnAiy6rndTMEY/JdbNQk7IgJyZyaua/VoZdFJvUJJB9VNQrlZQnbRTgNb553unntpuG1KzEpx7cvg4WA/YEsjlYYvb5USZVc22uj/84Q8XGWvAx8t1fHuwQAmvf3OQhEJKbBjGINHi68WQO+Qmr2r2a4XwgRXD+Kpqj+6WdqoMFeK4444rJOSKVNxInlIlEMv3ggsuKADJwDFIsNIRXEX8d911V8hnnL5SM15eYK7b1HUbK40YypxErEnQ8jFge+ZycYdceWIqMSQDFp2sG264YVAaAISsDIJdKVjx74ry+c9/vvXwww+HXLqpUmKWU1CSQAwGxxxzTChrzY1recTY5VK1Djge95WdffbZoXzi9NW4wFy395ScMFi8GQKXzSAl2v1YT5P/3lzYRuL8sl6OlUMbsQXFpVnAMUpWJkl+IOBFhXEfhvaib91+++1BUICqgbVekmteapCjy5v+S+26EMqW3Wg5mouyHlS5Ox5b9QcccEBR3g2QrOs0dTwcmCC3Of1XMZwq4bayPpsL3kicX9bPsRLTJENpmXIwSOUlLrMVmOtzzjmnEJbTWNxInp4kEMvv6quvbq299tpB5v5IWP6DdJdaaqmQhv/6r/9qYeVDDfk4uU5/VvJqpnVFwiHJ3FbWUvJPlkJN1xeiIFCsJB/72MeCEg2yEx6xwf7quvOXe9oSt4U14HTGFS/cTD8LlEBsVWmZVOv73/9+kDWy9T7/lrvLYRAuB6J6XWLDzgBgKgNE3V5KsirqPP5GkjLiTrjJLRJruosDUjcZCACHddZZJyg186RUAANlVx464m1trb766i2feUh6SWsMss5DcqdKwGXKXUDBM9eZUuK+Sst7UOXs+NxvdcYZZ4REx2mdmovaXdm6OhBwUuqaMzJIgjuRMmEra2n5H8xFbmTOL+vnWGluvvnmAFJPfOITi74N5XOgwOX4PMTO9f7779/64x9ZATFJTq+vkztdLjS1vvvd7xZl548A8jR4WNZVu47PJ+2wcwjUoI+P6zB1emnJq/nWFZmAlCH3ZTXGykJ5DAI+bw7AsKKRrUGy4+UIqXg7HB2LXowkxmnGP85E2cWVX4uWi9Ff+otsMVuuwyhLA+aee+7Z8ihwnOaal1+7ddW8kUEVekeS4G1l0Zf1QF4QRuhal4tB68c//nEAqGF2wseVy30uEnjrda97XevCCy+cUkGd7loLt4LEtQPVtdde29pjjz2Kjwv9kYzCIrdYnlwPgh2nVzfQyf7Xv/41SKJBZea6S10ejb4rFf4UUsZsZU2u5GxAXxZaFH/xDjrooKGDloRaVDQmGforzf33ve99LU7nidPcXoHJ06gR+W2v7PRTfepTnypACKDy8VgGDWQ2DLZ1R9yestKe/pqXka2r/ZSHogWFf2RIBWArq/Zbz7QriwEA96Mf/WgtQEuKUQAXe33HzcQPfOADLbYj0QGuRVaoEA2rFEXaZ/J0yhNz6GKgwpLxlIFhAxVlxjpVRgXxcxgK5ObgTPms2X3Pu6IDdXEASm6o2/hHipQxW1m754XwaI3Kb9TVcWXXjqGtd77znUHhbN0MsyLEcVMxY+Bi0unPf/7zlnbKnCLWThV9ygM1vuhkTT300EMtltTQF6QKE5jpIOw1ZvnY9f/DcBnt9Qx6j/Rar2os8vakuc7uDjjpz9HpuyJDMSlzXmO4kPzX5JLwCRv5ZX0dKxfTHeg3Ut5aw5ijRbztHFfIduACWDm8QFsyT/uaG7xsRdZN+gYoyz5On3Zrbf3oRz9qbb755oU8sKjcP4SMYrm0y2yQ14CVN21s2LKbWOSuq9Rdt5iatWZQhd4TKaOel7V1LgkLIRZMbf2uONrquLXZZpuFilIHS0uFUFRa+2kqxlMhuP+Od7yjpW2hW/Pnz5/WRIzBYVgANlsa2PaF+UrsZOB84jII4aZffL8OfsDKIPqLX/wi6Lb1qLaK3jlhrqtbS65YV82fd0VGZiNl1Jv8nZzLxVtTdBZTze66z+G+++5rbbrppqHi1MXSkuxDemLLggXVVOh41jzP7brrrq2jjz66xUial4O0izoGECpZWUDWbbgs/mYu3EknndTae++9p4CUAZmpHp3y7XvDdBdddNHipCRPDC1Lhu1lVfG16+jJkidgNZTN+YZizpFZVSg67zgG6Gox5iVKN5T0KN6eSUoXDifgJBVZLdmJJ54YDpXgwADljQLtOcyqXojTwwEY2s0ye+CBBzJNPC2i1A4VmcA3W3XVVTNZZZnO3MtkGYQ8Fg+1echjL/kkHfCCSMCZ6SirTCCVaevqTGsoi4NCeG+RRRbJOLGG04e0E2c4Lj7O34LCHtR/To8ANeT33nvvzc4888xso402CvKaTQaDSmcP8bhucvz8Sko/p+GEOtxDGKU8umDtKSWKzoEow49TxkFtFk3+j/gRcaM68AxamkeTffCDH8w0izrTzOVMI1WdM12zuwYlKr8OwpiSulVWWSVbd911s5VXXjlTcyYcNbX44otnshgyTacIx15xRFmvhMxkqQXAQW4Ap4b2M06hQW4a3cx+9atfTQlWS2dCvKRTTcLw/pQHanRhsFLzNNN+VgGgyM96663XVLBCuq6bn1P+Puq6OwyxDxOwlPfHKO9hlIEa/kIx55f1XguGIbk8ToMWlWnffffNvvSlLzUKtMgGwIM1BWsJUqZRtwAincT6kpe8JFOfXQaIqImZYUXogNhg+WD94OdYLJVrsH50KlGmZl3GmYwarAjAhGV3yy23ZBop6xRFsO60xUvGu1hcABvv150MVtrPLFMfYUjupZdemr3sZS8Lx8ohlwaS6+RNSvuKyiNGRqi7w8jL0ACLzCrjCyvndORtoctTxRYOfzeGDFpYDgceeGD2kY98JFOfVrBaqPxW5LpmiPRBgIwJS4rDZR//+McHQCOPDz744JRmpJ/t18VigwFMwte8sQCWABvXprrLj3Q6jYA5B+RihV5xxRWZppk0GazImuvkq5XH01xn+WMYNFTAIsMWgNwjdbmj2OYnfzeGDFok+Kijjsq0G0BxYCrNGCt0YzI0Q0KxwDTxMQCZLaoZHp12G0C3tYWLVRoD07QXGnbD3QFbbbVV9vWvfz3TjPamg5Xr4lHS37e5rjasWMpNroQQ7GS57Ezqw1c9fKpbzSFVviKxZ511FuZKYJ8vp0Iv7vm/prhVpb2qcAchV6edUViPEsu6bskSDXrg0eRCKZrlcR2kTjZ7J1EpQ6kkgXgG/OvzMvUQarOKWKkFtAxcLBPxPCgvmpbgajOZkbQk7k8GBiumivjgiCOOOKKY28YUkIaT6+DrqezKS6MGxEhzpSSBeELpUXlBewlAI8vdCstcrd133z0AA+DlMw+t8BJqAo2GysAb71GGGgks9NRlX9xonsd17ygqvZI/HhNEyWy3JKG4afgU+SdPXdC60OaV9aMpdpMABY43jvPWMAm0mgXWLi8OqXATcLvttmvdeuutodBj6/pRLWicz3WOOvgU6q/cRg5vdos9fT8nwbhpuElezNjVj3YM5Teb5MRfWw1xF0s0OPDAx5G7IqAbiestg3hx+SGHHNLSwEFQR3+cmqSbHdJKXXNbdhMqsq5TUxBBzEQWkNzPi6F/TDrN/Y2/vDQRP/GJTxTA5A55ySP1bdUQsP0x0fSLlpuAmmcVNky0RsYfJd9rqOu6tj/1U3lIYDUTUPm+hFRMtZD/orzg3abOL5vpxIrNujJ0AmbxNBUCvyuI/0vu8C0uD5xQFuy1xUcHij9EzdTIKal2HbtA+Qykf4u66HvJ7SABCSrMdpc7IfbBFTZVdau5FIOW1sIVB3hKDAG4NBs6AZdkgTyGzez+YAuYjwp7+5vicvS9Brvut+K4rgnJHeuqUStOSPNQSQJzf9a2uSIg1Eb3Z+X5CE6s8ByQ8PKXvzxUULbPZeM5CT9wsrgGD1xx849y+OpXv1psgjhiVhW6SJ0yYG1Dpdd1agoiiF7JgpM7eXb3CPRnKS8FxaDFQQTf/va3C6BiJDHe+1uyK/5L/nJl4Y+CZu4Xo3/IeOedd24xl84Ul5fvjYCb+q16BaaZnpcysDo6tKPlnp4rh9va+WXznbgiaNHslGYiw+feVpdK5MqFP/HcZGBZssd63E+11lprtbQdTLE76whaVa40rks/pw7qZlHfuE7UhwQkRPdnLSr/5ISXVsuzcC34xrtUihi4fve737Xe/e53F6DUDlwSZfFf8ncvC4MUMmNaCUDle9ppImxoiLVrisvE90bEdR2ar/w8laopN/VbIYi5kgTp/qyV5begR6ITXvmZQlQQwAvCz3mDO+20UwFOdAK37xwq+Rb/J//ssmDiZ2xRIbPvfOc7LW0cWJRFXA7FzdHxuO7Qd7Uy9VNu6rdCEGWRBSp3GzGE0EemEz7kKPqJv+xMSgS4dtlllwKYGMGin4uFt5JxYFsKvk7u1CY0MouBij7CI488sqX9uQrJjzhQkU/qjAHrddRPXSewQhBlkwUr90NiCGtrZEGLDMbAhZ+DUn02ouQbgIohd/q5Fl544QReuUwsG/ZUb9/PfuONN2795Cc/aXGQiGkMgIqsUlfcQvkQ9VPXCawQRFUkAbtP62D5IXccTl6N4G97/xZZvOmmm1qHHXZYqIySdQAqQIulI/GhDP5vnFz6ojilJl5GQ/45YJZFyt7+BTmOCVCRVch15WDJo5F9Vo2bySqhhzTT/BEdJ7lvK/6n+PHikSeB15SDITgE45JLLslOOOGE7NBDDy3yr7lcYSdPthjmEATJKvwnuRX+4uEGetrzwfbOAuqwseCNN95Y5Egjftm73vWujEM22P2T9yDkiN/XxQuj63Ed+YnyvB3ZpC6JJhWjIfluHGDlgl5Igg576Ero5+je+mIXSENEP7dktlc4AOlmnTSjvq7suOOOm3LSDDtfst0xWxyzPzrbNvO+SbKsNYh1Sh+7nQJSbOXM/7I4nZ3gfuYznwkgxSEaPGdql5vvj7jrunGuZEVdobyLOtSkvDcSsHKB+6iwRXR9kXhVsQuGR8aCACo4PuCAwxuowJxAc+qpp2bHHHPMFFlgfam/K2xXfP/99wcgm/JADS9IL/u/Az7kVev5MtJuwnrSaGo4nWallVYKh2P4P4NzLCP/Nwau68TlyusrBFhMFB3KEV1lyLqxgEXmJXgfYrG4Li8Rv0DsfajlHS/qVDE52IEjvDjj7/zzzw/gdYtOrImJ02+wWHif59lrneO3ZjqpBoumnQDNmaiX5wEVDnDwARicwkO6dCz9tOO93vSmNwUravXVV8/UsR6ahE4D6YGJu1P8fm7EXdcFzM81JIf7XWeamu/pmtewnLgA5D5bSefcqGXELqiG5aac5FJRYajdqtDIWDjCizMAL7vssuzss88Ollh7zFgySyyxRAFkgJc6qAOgAWr4zQBKHKfjNlDgkg4YSwkXIAIkOTGHe1wTHn1uHJDaid761rdma665ZjjsFYDiXEVO9TE5DcTnuP3fGLquA7cp7y+XPO6WfMIHvsmyaDxgIXwVhA9lXVqXgNZzxC4weceXXImRQDt4cY8+Lc4J1K6ZoRnJydVYY9r+hr9nJZppAI+ByGBBvBBgBhABeMQF2M1GNFk5JVn7T4Xj0jRZNnvuc58bLCiALSbChxxv/N8Y+637d0kGgBW7h4Y60nSZjARgUQguELnP1yV7+iTQQjBtBJDAUCcA4z6d8zQJGV2krwiL584778wYkaR5ySgcpxrfcMMNPN4TcSIyltHExERoxmmP+3AoK/ft5xBVLDxAsJ3i9CeQapdOuI7Bai3J6A+S2UiAFbkbGcAiMy4YuVha54tpHrrTUd5E7RLoFQCwlOjUx7LBZcQRq0mz8YMlFYcHIAIqbvJxnqGPucdS4npBFIeVwGlBkir+s67TDHylZDYylpVzOFKARaak5G4e0qf1azEd8S5IeRPNJgGAArKLvyrAcBx2HVfs4k80qwSs4zfryXVUXvRZjYxl5dyPHGCRMReUXEYPzxaP5ZQH5bt0ioGFwNuvFxQhoBdT+3X8X/L3JAGD1ZV6awPJ9S+uAz2F0oCHp2pQAxLcbRJVYJ7ywDwtepDXE9O+p2NkZPOtvCUaHwlgCv9LzEjEueJNBVYPW/d1PXI0sueNqeDYOgPQ+oeY2b3HiynYf4sn2zzyJEoSaKgE0GF0GZ0+Hh0XjzRYUU4jC1hkTgUIaD0297Pm8GtiLCwKe3I8XJ5ESQINkwBABaHLX5Oeo9s0z5nBjsU1sjTSgEWpqQDZ+yfkU/4P6NaHxVzDI124yl+i0ZMAOstHmG6ND+U6DVixNtBANnq5znM0Nn05KlDyGgpVfk4HOVZMwXveiryJkgRqLQHrKqD1egHUidJldPg/8o9FN8fYAJbVUAXsaQ9sDXuS+PliRlnoCxg7eSjPieovAcAIsGId0q3i1wigrrIu63psaOSbhO0lqYJmx0VAiyHgl4hPF6MI9Gmlfi0JIVGtJGC9REfR1ZeMK1hRKmMHWGQ6Aq2/yb+Zbh0gxrRGHnzJEiUJ1EEC6CI6iW4egK6KOZ155CaEdivssW4CqeCL9r/89Gt9T/xkcWoidqtB6bkqJBA3AR9UBG8VUJ0gHaW+jkXn+kxCHWvAQii5EjBfi6Yi/Vk/Eq8lxhRHcQC1REkCg5IAI30BmOSyMeUbpZvzpZv0sf5LfnRybGksm4RxaaMAOVhhZt8qXlv/00S0KZ6aiLHAkr9KCaBr7pqgCchuCwGs5D4iHmuwQvBjb2HF2qevWLF1rPyb6L/viJcSM4yMrJK1JSEkKl0CWFWAERNB2cNqJ4ETHey0AAqd5HrcaewtrFgBpCRMMuU4HqytM/TfiuIfiFEkwCpZWxJColIlYKsKHUPXVgCs0EF0EZ0sNbaGB5YsrBkKMAetAFDyb6/HDhE/U2wFStbWDLJLt7uSQKxHf9Qb7xM4MZkZq2psRwFnk1wCrAVISIqDBcqoDGsSnyb/V8Q75q8AZnwVkwxzgSSnKwnQ9KOLgU506Cjx7tIxtoRBn5i1nuYDIpkOlCpbB6G034q/ePK/Wv9/Vbxs/hzKh6IlShKYTQKxrtyshz8ocDqFl2Idmy2Qcf4/9WF1UfpSKqY8LCRm+sOpeoW+rc+J+RICVpj3NvHlTZQkMEUC1g90BQsL3VkRsEKn0C10bMob6aKjBJKF1VEsM9/MQYsvJV/FFeR8Ubwl1yJ3oKYPwaQ8xv2XDxpg5eYf1tSHBU6/RzCxLnGdaHYJJMCaXUbTnpCiIbcw2ZQ/db2VHL6aL+ZalIBrUg7j+tsOVNdIEP8joPopApG+AGBjPwkUWfRKCbB6lVj0vBQvjBRKEcN0CP31fvE+4iXzx1LHfC6IMXHaO9QZ/dtPzCZ7UpdH9WVM5FF6NhNglSBSKSLWlpuJiynID4n3ED81Dz4BVy6IEXXageoB5fPL4i9JL/6PPMc6wnWi/iSQAKs/uU17SwrZ3kzkINe9xbuJn5S/kJqKuSBGxGlv+j2kfH1D/AUB1V3kUXqRmn8IoiRKgFWSIB2MFJQOd5ZTAE4o7NJy9hLvKmYnCIj/wnPhKv00TQJ0pANW7kx/UP7DxQeq3G+Xa6D6t655LlFJEkiAVZIg24PpAFysSXyfGOB6Rv58aEbKT19YKotcKDV1aPZ56grTE6A/ib8ppo/qTm7kFlUCKoRRAaVKUoFQ4yBz4Aqz5bmva2bM7ySmqbi8GHIfCMCVpkQEkdTmx80+QMr15Tr5afp9R0D1F1KqcuX/NEsdYVRILoAKo0hBI4EcuOKmIsD0OvF7xRuJTba6/BX3/eQOVgKdyuEsJeFQMecAhqaeypVmYbKoBlQ2CbAGJGhH0w5c3Ne91eS8U7yD2FMi5C22tQHcUlkhkWqpvW+K2JiacLT4CIHU77gBJaCalMOgf1MlGLTE8/ik8MieJmDRjNA9pkRgde0o3lAMUEFuMnKdwCuIpJQf5IqlBMdNPq5/Kf6u+KcCKk9NsPyxqHg30YAlkABrwALvFJ2AKnS6qxK4GcIXnPWK2+WMBRYTz1F2CbxiqXTnN0jhtje7saCOEx+rsgjLZwhSZcFzbE7lTnduJxqCBBJgDUHoM0WpiuEveGF18azurykHy+s1Ys5TjMkgZ/BKZRpLZ9I6NUjxTztIXal7J4vpl/oND0AzlcXkv+l3WBJIyj0syc8SryrMNKuLV3T/ZXJYbL2FeHXx48UmKma79TVuZYwMDFC4cVMPOf1TfKn4NPEpAqnL5BYk+fL8lA9G8WfyDF0C46bMQxd4rwlQBaKMguWlyhUmozoM/TdP/g3Em4rXFk+I28kWmMPBHSWKwYl8tVtQ3JsvvkDMPunnSI63yC1IcmSkL/Rl6T/CS1RTCYya8tZUzOUkKwIvym1Kx6/+W0T3VhGvI15PjPX1fHE7USHjvhjCirn9+Tpck+aYnaZghfoicm+VHyvqXPF54isERP+QGyiXI+8SJtYUbqIGSABFTdRQCajiuc9rWoew/nuCsvUiMcBFH9hLxcuJny6eiQAyLA2oHcRiXYn9k0/39xsDhf24ZkJ1HmeK8z49c4P4t2L6oACq6wVCD8stSPIwuKXmXiGV5nlmUoLm5WTMU5xbDa7cVMrYigrS0TNLyPNCMSOQLxEz0x4Qe46YKRXdkMHEbjfvtD+D3sXc/n+na6YW3CUGnK4TXy2+Rnyj8vpnuVMoByjkkZp6UyTT7IsEWM0uvxlTHwGYy3hKE9Iv5s89S9fPFk+IlxUvI15a/FwxFhlgBmO1VUFYQwASjMV0h/h28W3im8W3igGrezo13/I8YEFBAGlq5gVRjN6PlXn0cpZyNE0CHUBs1uaR3qET+6nip4gXFxu8FpX/yeInitk+B5dnAQ6DB1YeTMf/38Vsv4LL7gZ/FRuk7pf/b+IHBEgeJNDldFJ6bEXyZwKn6SIa6TsJsEa6eGfPXA5i6EHMvDiUplQEqgAT5KZncDtZWJOPpd9xkEACrHEo5TnkMQI0QrG+2J1DyOFVQAgq3ARIkwJJv0kCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCSQJJAkkCTZDA/wcJXOtm8qZdKQAAAABJRU5ErkJggg==',
   },
 };
+
+export const EXPECTED_INPUT_CHANGES = {
+  quoteRequest1: [
+    {
+      token_destination:
+        'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
+    },
+    {
+      slippage: 2,
+    },
+    {
+      chain_source: 'eip155:1',
+    },
+    {
+      chain_destination: 'eip155:1',
+    },
+    {
+      token_source: 'eip155:1/erc20:0x6B175474E89094C44Da98b954EedeAC495271d0F',
+    },
+    {
+      token_destination: 'eip155:59144/slip44:60',
+    },
+    {
+      chain_destination: 'eip155:59144',
+    },
+  ],
+  resetPage: [
+    {
+      token_source: 'eip155:1/slip44:60',
+    },
+    {
+      chain_destination: 'eip155:1',
+    },
+    {
+      token_destination:
+        'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
+    },
+  ],
+  quoteRequest2: [
+    {
+      token_source: 'eip155:1/erc20:0x6B175474E89094C44Da98b954EedeAC495271d0F',
+    },
+    {
+      token_destination: 'eip155:59144/slip44:60',
+    },
+    {
+      chain_destination: 'eip155:59144',
+    },
+  ],
+  switchTokens: [
+    {
+      token_source: 'eip155:59144/slip44:60',
+    },
+    {
+      chain_destination: 'eip155:1',
+    },
+    {
+      token_destination:
+        'eip155:1/erc20:0x6B175474E89094C44Da98b954EedeAC495271d0F',
+    },
+    {
+      chain_source: 'eip155:59144',
+    },
+  ],
+};
diff --git a/test/e2e/tests/bridge/swap-positive-cases.spec.ts b/test/e2e/tests/bridge/swap-positive-cases.spec.ts
index 7974a8d65658..8ce61f7d9a18 100644
--- a/test/e2e/tests/bridge/swap-positive-cases.spec.ts
+++ b/test/e2e/tests/bridge/swap-positive-cases.spec.ts
@@ -13,7 +13,7 @@ describe('Swap tests', function (this: Suite) {
       {
         ...getBridgeFixtures(
           this.test?.fullTitle(),
-          BRIDGE_FEATURE_FLAGS_WITH_SSE_ENABLED,
+          { ...BRIDGE_FEATURE_FLAGS_WITH_SSE_ENABLED, refreshRate: 30000 },
           false,
           true,
         ),
diff --git a/test/e2e/tests/btc/btc-swap.spec.ts b/test/e2e/tests/btc/btc-swap.spec.ts
index 038aec81c17d..62f7cd8a49fc 100644
--- a/test/e2e/tests/btc/btc-swap.spec.ts
+++ b/test/e2e/tests/btc/btc-swap.spec.ts
@@ -38,6 +38,7 @@ describe('BTC Account - Swap (Bridge)', function (this: Suite) {
     await withBtcAccountSnap(
       async (driver) => {
         const homePage = new BitcoinHomepage(driver);
+        await homePage.checkPageIsLoaded();
         await homePage.checkIsExpectedBitcoinBalanceDisplayed(
           DEFAULT_BTC_BALANCE,
         );
@@ -160,6 +161,7 @@ describe('BTC Account - Swap (Bridge)', function (this: Suite) {
         await bridgePage.submitQuote();
 
         // Navigate to activity list and verify the bridge transaction
+        await homePage.goToActivityList();
         const activityListPage = new ActivityListPage(driver);
         await activityListPage.checkPendingBridgeTransactionActivity(1);
 
diff --git a/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts
index 2e9dd65bd9ea..ba57f791e469 100644
--- a/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts
@@ -12,8 +12,8 @@ import TestDapp from '../../../page-objects/pages/test-dapp';
 import ActivityListPage from '../../../page-objects/pages/home/activity-list';
 import HomePage from '../../../page-objects/pages/home/homepage';
 import TransactionConfirmation from '../../../page-objects/pages/confirmations/transaction-confirmation';
-import AdvancedSettings from '../../../page-objects/pages/settings/advanced-settings';
 import SettingsPage from '../../../page-objects/pages/settings/settings-page';
+import TransactionsSettingsPage from '../../../page-objects/pages/settings/transactions-settings';
 import {
   assertAdvancedGasDetails,
   assertAdvancedGasDetailsWithFewerFields,
@@ -314,10 +314,10 @@ describe('Confirmation Redesign Contract Interaction Component', function () {
           await homePage.headerNavbar.openSettingsPage();
           const settingsPage = new SettingsPage(driver);
           await settingsPage.checkPageIsLoaded();
-          await settingsPage.clickAdvancedTab();
-          const advancedSettingsPage = new AdvancedSettings(driver);
-          await advancedSettingsPage.checkPageIsLoaded();
-          await advancedSettingsPage.toggleOnHexData();
+          await settingsPage.goToTransactionsSettings();
+          const transactionsSettingsPage = new TransactionsSettingsPage(driver);
+          await transactionsSettingsPage.checkPageIsLoaded();
+          await transactionsSettingsPage.toggleOnHexData();
 
           const testDapp = new TestDapp(driver);
           await testDapp.openTestDappPage({ contractAddress });
diff --git a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts
index c5074f16c038..2a49a398f7d9 100644
--- a/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/speed-up-and-cancel-confirmations.spec.ts
@@ -64,7 +64,7 @@ describe('Speed Up and Cancel Transaction Tests', function () {
           const speedUpCancelModal = new SpeedUpAndCancelModal(driver);
           await speedUpCancelModal.waitForModal();
           await speedUpCancelModal.checkSpeedUpTitleVisible();
-          await speedUpCancelModal.checkSpeedRowShowsSiteSuggested();
+          await speedUpCancelModal.checkSpeedRowShowsTenPercentIncreased();
           await speedUpCancelModal.waitForConfirmEnabled();
           await speedUpCancelModal.clickConfirm();
           await driver.delay(3000); // Delay needed to ensure the transaction is updated before mining
@@ -121,7 +121,7 @@ describe('Speed Up and Cancel Transaction Tests', function () {
           const speedUpCancelModal = new SpeedUpAndCancelModal(driver);
           await speedUpCancelModal.waitForModal();
           await speedUpCancelModal.checkCancelTitleVisible();
-          await speedUpCancelModal.checkSpeedRowShowsSiteSuggested();
+          await speedUpCancelModal.checkSpeedRowShowsTenPercentIncreased();
           await speedUpCancelModal.waitForConfirmEnabled();
           await speedUpCancelModal.clickConfirm();
           await driver.delay(3000); // Delay needed to ensure the transaction updated before mining
diff --git a/test/e2e/tests/hardware-wallets/ledger/ledger-send.spec.ts b/test/e2e/tests/hardware-wallets/ledger/ledger-send.spec.ts
index 678b0ffda556..b252d2432c3d 100644
--- a/test/e2e/tests/hardware-wallets/ledger/ledger-send.spec.ts
+++ b/test/e2e/tests/hardware-wallets/ledger/ledger-send.spec.ts
@@ -34,6 +34,7 @@ describe('Ledger Hardware', function (this: Suite) {
           amount: '1',
         });
         await homePage.checkPageIsLoaded();
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity();
         await activityList.checkTxAmountInActivity();
@@ -64,6 +65,7 @@ describe('Ledger Hardware', function (this: Suite) {
           amount: '1',
         });
         await homePage.checkPageIsLoaded();
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity();
         await activityList.checkTxAmountInActivity();
diff --git a/test/e2e/tests/hardware-wallets/trezor/trezor-send.spec.ts b/test/e2e/tests/hardware-wallets/trezor/trezor-send.spec.ts
index e8515935b2af..6cf5ccec1ed5 100644
--- a/test/e2e/tests/hardware-wallets/trezor/trezor-send.spec.ts
+++ b/test/e2e/tests/hardware-wallets/trezor/trezor-send.spec.ts
@@ -45,6 +45,7 @@ describe('Trezor Hardware', function (this: Suite) {
             amount: '1',
           });
           await homePage.checkPageIsLoaded();
+          await homePage.goToActivityList();
           const activityList = new ActivityListPage(driver);
           await activityList.checkConfirmedTxNumberDisplayedInActivity();
           await activityList.checkTxAmountInActivity();
diff --git a/test/e2e/tests/identity/contact-syncing/backup-and-sync-settings.spec.ts b/test/e2e/tests/identity/contact-syncing/backup-and-sync-settings.spec.ts
index 5a8cc5a62e9b..8268aa43ddf3 100644
--- a/test/e2e/tests/identity/contact-syncing/backup-and-sync-settings.spec.ts
+++ b/test/e2e/tests/identity/contact-syncing/backup-and-sync-settings.spec.ts
@@ -123,7 +123,7 @@ describe('Contact Syncing - Backup and Sync Settings', function () {
             );
 
           // Add a new contact via UI (like the account syncing test does)
-          await settingsPage.closeSettingsPage();
+          await settingsPage.clickBackButton();
           await header.openContactsPage();
           const contactsSettings = new ContactsSettings(driver);
           await contactsSettings.checkPageIsLoaded();
@@ -266,7 +266,7 @@ describe('Contact Syncing - Backup and Sync Settings', function () {
             );
 
           // Add a new contact via UI to test that syncing works when enabled
-          await settingsPage.closeSettingsPage();
+          await settingsPage.clickBackButton();
           await header.openContactsPage();
           const contactsSettings = new ContactsSettings(driver);
           await contactsSettings.checkPageIsLoaded();
diff --git a/test/e2e/tests/identity/flows.ts b/test/e2e/tests/identity/flows.ts
index f7ed792ceb6e..034a6a967f30 100644
--- a/test/e2e/tests/identity/flows.ts
+++ b/test/e2e/tests/identity/flows.ts
@@ -50,10 +50,10 @@ export const getSRP = async (driver: Driver) => {
   await headerNavbar.openSettingsPage();
   const settingsPage = new SettingsPage(driver);
   await settingsPage.checkPageIsLoaded();
-  await settingsPage.goToPrivacySettings();
+  await settingsPage.goToSecurityAndPasswordSettings();
 
   const privacySettings = new PrivacySettings(driver);
-  await privacySettings.checkPageIsLoaded();
+  await privacySettings.checkSecurityAndPasswordPageIsLoaded();
   await privacySettings.openRevealSrpQuiz();
   await privacySettings.completeRevealSrpQuiz();
   await privacySettings.fillPasswordToRevealSrp(IDENTITY_TEAM_PASSWORD);
diff --git a/test/e2e/tests/metrics/bridge.spec.ts b/test/e2e/tests/metrics/bridge.spec.ts
index adb6d97e31f5..290d28ca01ae 100644
--- a/test/e2e/tests/metrics/bridge.spec.ts
+++ b/test/e2e/tests/metrics/bridge.spec.ts
@@ -12,6 +12,7 @@ import {
   getBridgeFixtures,
   EventTypes,
   EXPECTED_EVENT_TYPES,
+  checkInputChangedEvents,
 } from '../bridge/bridge-test-utils';
 import BridgeQuotePage from '../../page-objects/pages/bridge/quote-page';
 import { login } from '../../page-objects/flows/login.flow';
@@ -38,8 +39,10 @@ describe('Bridge tests', function (this: Suite) {
         await login(driver, { expectedBalance: '0' });
 
         const homePage = new HomePage(driver);
+        const bridgePage = new BridgeQuotePage(driver);
 
         // QUOTE REQUEST #1
+        console.log('Starting 1st Swap flow');
         await bridgeTransaction({
           driver,
           quote,
@@ -47,15 +50,37 @@ describe('Bridge tests', function (this: Suite) {
           expectedDestAmount: '0.0157',
         });
 
-        // Start the flow again
+        const inputChangesCount1 = await checkInputChangedEvents(
+          'quoteRequest1',
+          driver,
+          mockedEndpoints,
+        );
+
+        // QUOTE REQUEST #2 - Start the flow again
+        console.log('Starting 2nd Swap flow');
         await homePage.startSwapFlow();
 
-        const bridgePage = new BridgeQuotePage(driver);
-        // QUOTE REQUEST #2
+        const inputChangesCount2 = await checkInputChangedEvents(
+          'resetPage',
+          driver,
+          mockedEndpoints,
+          inputChangesCount1,
+        );
+
+        console.log('Entering 2nd Swap quote');
         await bridgePage.enterBridgeQuote(quote);
         await bridgePage.waitForQuote();
         await bridgePage.checkExpectedNetworkFeeIsDisplayed();
+
+        const inputChangesCount3 = await checkInputChangedEvents(
+          'quoteRequest2',
+          driver,
+          mockedEndpoints,
+          inputChangesCount1 + inputChangesCount2,
+        );
+
         // QUOTE REQUEST #3
+        console.log('Switching tokens');
         await bridgePage.switchTokens();
 
         let events = await getEventPayloads(driver, mockedEndpoints);
@@ -100,46 +125,31 @@ describe('Bridge tests', function (this: Suite) {
               'Unified SwapBridge',
         );
 
-        const swapBridgeInputChanged = findEventsByName(
-          EventTypes.SwapBridgeInputChanged,
+        const inputChangesCount4 = await checkInputChangedEvents(
+          'switchTokens',
+          driver,
+          mockedEndpoints,
+          inputChangesCount3 + inputChangesCount2 + inputChangesCount1,
         );
-        /**
-         * token_source
-         * chain_source
-         * slippage
-         * token_destination
-         * chain_destination
-         */
 
-        assert(
-          swapBridgeInputChanged.length === 16,
-          `Should have 16 input change events, but got ${swapBridgeInputChanged.length}`,
+        // Check total input change events
+        const swapBridgeInputChanged = findEventsByName(
+          EventTypes.SwapBridgeInputChanged,
         );
-
-        const swapBridgeInputChangedKeys = new Set(
-          swapBridgeInputChanged.map((event) => event.properties.input),
+        const expectedInputChangeLength =
+          inputChangesCount1 +
+          inputChangesCount2 +
+          inputChangesCount3 +
+          inputChangesCount4;
+        assert.equal(
+          swapBridgeInputChanged.length,
+          expectedInputChangeLength,
+          `Should have ${expectedInputChangeLength} total input change events, but got ${swapBridgeInputChanged.length}`,
         );
-
-        const inputTypes = [
-          'token_source',
-          'chain_source',
-          'slippage',
-          'token_destination',
-          'chain_destination',
-        ];
-
-        assert.ok(
-          swapBridgeInputChangedKeys.size === 5,
-          'Should have 5 input types',
+        console.log(
+          `${expectedInputChangeLength} expected Input Change events found`,
         );
 
-        inputTypes.forEach((inputType) => {
-          assert.ok(
-            swapBridgeInputChangedKeys.has(inputType),
-            `Missing input type: ${inputType}`,
-          );
-        });
-
         const swapBridgeQuotesRequested = findEventsByName(
           EventTypes.SwapBridgeQuotesRequested,
         );
diff --git a/test/e2e/tests/metrics/dapp-viewed.spec.ts b/test/e2e/tests/metrics/dapp-viewed.spec.ts
index 50ccd306310c..af969bbd761f 100644
--- a/test/e2e/tests/metrics/dapp-viewed.spec.ts
+++ b/test/e2e/tests/metrics/dapp-viewed.spec.ts
@@ -8,18 +8,11 @@ import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
 import TestDapp from '../../page-objects/pages/test-dapp';
 import { login } from '../../page-objects/flows/login.flow';
 import { connectAccountToTestDapp } from '../../page-objects/flows/test-dapp.flow';
-import { Driver } from '../../webdriver/driver';
+import HomePage from '../../page-objects/pages/home/homepage';
 
 // E2E Fixtures setup has 4 identities (1 EVM, 1 Solana, 1 Bitcoin, 1 Tron)
 const METAMASK_IDENTITIES = 4;
 
-async function waitForAccountsToBeAligned(driver: Driver) {
-  // Multichain accounts create non-EVM accounts asynchronously, thus we need to
-  // wait for them to be created before proceeding with tests that depend on
-  // account count.
-  await driver.delay(2000);
-}
-
 async function mockedDappViewedEndpointFirstVisit(mockServer: Mockttp) {
   return await mockServer
     .forPost('https://api.segment.io/v1/batch')
@@ -106,14 +99,14 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
         await testDapp.checkPageIsLoaded();
         await connectAccountToTestDapp(driver, {
           publicAddress: DEFAULT_FIXTURE_ACCOUNT,
         });
-
         const events = await getEventPayloads(driver, mockedEndpoints);
         assert.equal(events.length, 0);
       },
@@ -139,7 +132,8 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
         await testDapp.checkPageIsLoaded();
@@ -182,7 +176,8 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
         await testDapp.checkPageIsLoaded();
@@ -228,7 +223,8 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
         await testDapp.checkPageIsLoaded();
@@ -277,7 +273,8 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
         await testDapp.checkPageIsLoaded();
@@ -323,7 +320,8 @@ describe('Dapp viewed Event', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
-        await waitForAccountsToBeAligned(driver);
+        const homePage = new HomePage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         // connect to dapp and disconnect
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
diff --git a/test/e2e/tests/metrics/delete-metametrics-data.spec.ts b/test/e2e/tests/metrics/delete-metametrics-data.spec.ts
index faac8af94e7d..925fb397cd18 100644
--- a/test/e2e/tests/metrics/delete-metametrics-data.spec.ts
+++ b/test/e2e/tests/metrics/delete-metametrics-data.spec.ts
@@ -101,9 +101,8 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
         await privacySettings.deleteMetaMetrics();
-        assert.equal(
-          await privacySettings.checkDeleteMetaMetricsDataButtonEnabled(),
-          false,
+        await privacySettings.waitForDeleteMetaMetricsDataButtonState(
+          'enabled',
         );
 
         const events = await getEventPayloads(
@@ -122,17 +121,16 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
           environment_type: 'fullscreen',
         });
 
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
         await new HomePage(driver).checkPageIsLoaded();
         await headerNavbar.openSettingsPage();
         await settingsPage.checkPageIsLoaded();
         await settingsPage.goToPrivacySettings();
 
-        // check MetaMetrics data button is enabled when user goes back to privacy settings page
+        // check MetaMetrics data button remains enabled when user goes back to privacy settings page
         await privacySettings.checkPageIsLoaded();
-        assert.equal(
-          await privacySettings.checkDeleteMetaMetricsDataButtonEnabled(),
-          true,
+        await privacySettings.waitForDeleteMetaMetricsDataButtonState(
+          'enabled',
         );
       },
     );
@@ -160,9 +158,8 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
 
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
-        assert.equal(
-          await privacySettings.checkDeleteMetaMetricsDataButtonEnabled(),
-          false,
+        await privacySettings.waitForDeleteMetaMetricsDataButtonState(
+          'disabled',
         );
       },
     );
@@ -185,9 +182,8 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
 
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
-        assert.equal(
-          await privacySettings.checkDeleteMetaMetricsDataButtonEnabled(),
-          false,
+        await privacySettings.waitForDeleteMetaMetricsDataButtonState(
+          'disabled',
         );
       },
     );
diff --git a/test/e2e/tests/metrics/errors.spec.ts b/test/e2e/tests/metrics/errors.spec.ts
index ed96fd386856..161b29b5e54f 100644
--- a/test/e2e/tests/metrics/errors.spec.ts
+++ b/test/e2e/tests/metrics/errors.spec.ts
@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 import { promises as fs } from 'fs';
 import { strict as assert } from 'assert';
-import { get, has, set, unset, cloneDeep } from 'lodash';
+import { cloneDeep, get, has, set, unset } from 'lodash';
 import { Browser } from 'selenium-webdriver';
 import prettier from 'prettier';
 import { isObject, Json, JsonRpcResponse } from '@metamask/utils';
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 6d8a48db89d0..905fe1f1cb99 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -1,7 +1,7 @@
 {
   "AccountOrderController": {
-    "hiddenAccountList": {},
-    "pinnedAccountList": {}
+    "hiddenAccountList": "object",
+    "pinnedAccountList": "object"
   },
   "AccountTracker": { "accountsByChainId": "object" },
   "AccountTreeController": {
@@ -9,7 +9,8 @@
     "accountTree": "object",
     "accountWalletsMetadata": "object",
     "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean",
-    "isAccountTreeSyncingInProgress": "boolean"
+    "isAccountTreeSyncingInProgress": "boolean",
+    "selectedAccountGroup": "string"
   },
   "AccountsController": {
     "accountIdByAddress": "object",
@@ -104,11 +105,12 @@
     "quoteRequest": {
       "srcTokenAddress": "0x0000000000000000000000000000000000000000"
     },
-    "quotes": {},
+    "quotes": "object",
     "quotesInitialLoadTime": null,
     "quotesLastFetched": null,
     "quotesLoadingStatus": null,
-    "quotesRefreshCount": 0
+    "quotesRefreshCount": 0,
+    "tokenWarnings": "object"
   },
   "BridgeStatusController": { "txHistory": "object" },
   "ClaimsController": "object",
@@ -218,15 +220,7 @@
     "nativeAssetIdentifiers": "object"
   },
   "NetworkOrderController": {
-    "orderedNetworkList": {
-      "0": "object",
-      "1": "object",
-      "2": "object",
-      "3": "object",
-      "4": "object",
-      "5": "object",
-      "6": "object"
-    }
+    "orderedNetworkList": "object"
   },
   "NftController": {
     "allNftContracts": "object",
@@ -257,7 +251,7 @@
     "onboardingTabs": "object",
     "seedPhraseBackedUp": null
   },
-  "PPOMController": { "storageMetadata": {} },
+  "PPOMController": { "storageMetadata": "object" },
   "PermissionController": { "subjects": "object" },
   "PermissionLogController": {
     "permissionActivityLog": "object",
@@ -313,7 +307,6 @@
     "theme": "os",
     "use4ByteResolution": true,
     "useAddressBarEnsResolution": true,
-    "useBlockie": false,
     "useCurrencyRateCheck": true,
     "useExternalNameSources": "boolean",
     "useExternalServices": "boolean",
@@ -376,7 +369,7 @@
   },
   "SnapInsightsController": { "insights": "object" },
   "SnapInterfaceController": { "interfaces": "object" },
-  "SnapsRegistry": {
+  "SnapRegistryController": {
     "database": "object",
     "databaseUnavailable": "boolean",
     "lastUpdated": "number",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index c92eec465e65..dc3a2a54d667 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -193,7 +193,7 @@
     "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean",
     "hasPlacedFirstOrder": "object",
     "hasShownMultichainAccountsIntroModal": "boolean",
-    "hiddenAccountList": {},
+    "hiddenAccountList": "object",
     "hip3ConfigVersion": "number",
     "historicalPrices": "object",
     "ignoredNfts": "object",
@@ -283,15 +283,7 @@
     "onboardingDate": null,
     "onboardingTabs": "object",
     "openSeaEnabled": true,
-    "orderedNetworkList": {
-      "0": "object",
-      "1": "object",
-      "2": "object",
-      "3": "object",
-      "4": "object",
-      "5": "object",
-      "6": "object"
-    },
+    "orderedNetworkList": "object",
     "orderedTransactionHistory": "object",
     "outdatedBrowserWarningLastShown": "object",
     "overrideContentSecurityPolicyHeader": true,
@@ -306,7 +298,7 @@
     "permissionActivityLog": "object",
     "permissionHistory": "object",
     "perpsBalances": "object",
-    "pinnedAccountList": {},
+    "pinnedAccountList": "object",
     "pna25Acknowledged": "boolean",
     "popupGasPollTokens": "object",
     "preferences": {
@@ -337,7 +329,7 @@
     "quoteRequest": {
       "srcTokenAddress": "0x0000000000000000000000000000000000000000"
     },
-    "quotes": {},
+    "quotes": "object",
     "quotesInitialLoadTime": null,
     "quotesLastFetched": null,
     "quotesLoadingStatus": null,
@@ -364,6 +356,7 @@
     "securityAlertsEnabled": "boolean",
     "seedPhraseBackedUp": null,
     "segmentApiCalls": "object",
+    "selectedAccountGroup": "string",
     "selectedMultichainNetworkChainId": "string",
     "selectedNetworkClientId": "string",
     "selectedPaymentToken": null,
@@ -396,7 +389,7 @@
     "snapsAddSnapAccountModalDismissed": "boolean",
     "socialBackupsMetadata": "object",
     "srpSessionData": "object",
-    "storageMetadata": {},
+    "storageMetadata": "object",
     "storageWriteErrorType": null,
     "subjectMetadata": "object",
     "subjects": "object",
@@ -411,6 +404,7 @@
     "throttledOrigins": "object",
     "tokenBalances": "object",
     "tokenScanCache": "object",
+    "tokenWarnings": "object",
     "tokensChainsCache": { "0x539": "object" },
     "tracesBeforeMetricsOptIn": "object",
     "tradeConfigurations": "object",
@@ -434,7 +428,6 @@
     "urlScanCache": "object",
     "use4ByteResolution": true,
     "useAddressBarEnsResolution": true,
-    "useBlockie": false,
     "useCurrencyRateCheck": true,
     "useExternalNameSources": "boolean",
     "useExternalServices": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index 0d3295da6a4f..d8b83fc58503 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -1,14 +1,15 @@
 {
   "data": {
     "AccountOrderController": {
-      "hiddenAccountList": {},
-      "pinnedAccountList": {}
+      "hiddenAccountList": "object",
+      "pinnedAccountList": "object"
     },
     "AccountTracker": { "accountsByChainId": "object" },
     "AccountTreeController": {
       "accountGroupsMetadata": "object",
       "accountWalletsMetadata": "object",
-      "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean"
+      "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean",
+      "selectedAccountGroup": "string"
     },
     "AccountsController": {
       "internalAccounts": { "accounts": "object", "selectedAccount": "string" }
@@ -152,15 +153,7 @@
       "nativeAssetIdentifiers": "object"
     },
     "NetworkOrderController": {
-      "orderedNetworkList": {
-        "0": "object",
-        "1": "object",
-        "2": "object",
-        "3": "object",
-        "4": "object",
-        "5": "object",
-        "6": "object"
-      }
+      "orderedNetworkList": "object"
     },
     "NftController": {
       "allNftContracts": "object",
@@ -184,7 +177,7 @@
       "firstTimeFlowType": "import",
       "seedPhraseBackedUp": null
     },
-    "PPOMController": { "storageMetadata": {} },
+    "PPOMController": { "storageMetadata": "object" },
     "PermissionController": {},
     "PermissionLogController": { "permissionHistory": "object" },
     "PerpsController": "object",
@@ -237,7 +230,6 @@
       "theme": "os",
       "use4ByteResolution": true,
       "useAddressBarEnsResolution": true,
-      "useBlockie": false,
       "useCurrencyRateCheck": true,
       "useExternalNameSources": "boolean",
       "useExternalServices": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index 1140b2cec7ff..0322eda03c55 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -1,14 +1,15 @@
 {
   "data": {
     "AccountOrderController": {
-      "hiddenAccountList": {},
-      "pinnedAccountList": {}
+      "hiddenAccountList": "object",
+      "pinnedAccountList": "object"
     },
     "AccountTracker": { "accountsByChainId": "object" },
     "AccountTreeController": {
       "accountGroupsMetadata": "object",
       "accountWalletsMetadata": "object",
-      "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean"
+      "hasAccountTreeSyncingSyncedAtLeastOnce": "boolean",
+      "selectedAccountGroup": "string"
     },
     "AccountsController": {
       "internalAccounts": { "accounts": "object", "selectedAccount": "string" }
@@ -156,15 +157,7 @@
       "nativeAssetIdentifiers": "object"
     },
     "NetworkOrderController": {
-      "orderedNetworkList": {
-        "0": "object",
-        "1": "object",
-        "2": "object",
-        "3": "object",
-        "4": "object",
-        "5": "object",
-        "6": "object"
-      }
+      "orderedNetworkList": "object"
     },
     "NftController": {
       "allNftContracts": "object",
@@ -188,7 +181,7 @@
       "firstTimeFlowType": "import",
       "seedPhraseBackedUp": null
     },
-    "PPOMController": { "storageMetadata": {} },
+    "PPOMController": { "storageMetadata": "object" },
     "PermissionController": { "subjects": "object" },
     "PermissionLogController": { "permissionHistory": "object" },
     "PerpsController": "object",
@@ -241,7 +234,6 @@
       "theme": "os",
       "use4ByteResolution": true,
       "useAddressBarEnsResolution": true,
-      "useBlockie": false,
       "useCurrencyRateCheck": true,
       "useExternalNameSources": "boolean",
       "useExternalServices": "boolean",
@@ -283,7 +275,7 @@
       "unencryptedSnapStates": "object"
     },
     "SnapInterfaceController": { "interfaces": "object" },
-    "SnapsRegistry": {
+    "SnapRegistryController": {
       "database": "object",
       "databaseUnavailable": "boolean",
       "lastUpdated": "number",
@@ -313,5 +305,5 @@
     },
     "config": "object"
   },
-  "meta": { "storageKind": "split", "version": 200 }
+  "meta": { "storageKind": "split", "version": 202 }
 }
diff --git a/test/e2e/tests/metrics/transaction-finalized.spec.ts b/test/e2e/tests/metrics/transaction-finalized.spec.ts
index 637dcfbaf93d..7b9db1c82233 100644
--- a/test/e2e/tests/metrics/transaction-finalized.spec.ts
+++ b/test/e2e/tests/metrics/transaction-finalized.spec.ts
@@ -11,6 +11,7 @@ import { MOCK_META_METRICS_ID } from '../../constants';
 import { login } from '../../page-objects/flows/login.flow';
 import { sendRedesignedTransactionToAddress } from '../../page-objects/flows/send-transaction.flow';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
+import HomePage from '../../page-objects/pages/home/homepage';
 
 const FEATURE_FLAGS_URL = 'https://client-config.api.cx.metamask.io/v1/flags';
 
@@ -180,6 +181,8 @@ describe('Transaction Finalized Event', function (this: Suite) {
         });
 
         // Get the transaction hash from the activity list
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkCompletedTxNumberDisplayedInActivity(1);
         await activityList.clickOnActivity(1);
diff --git a/test/e2e/tests/metrics/wallet-imported.spec.ts b/test/e2e/tests/metrics/wallet-imported.spec.ts
index bb6911bc2be9..a1f5979da1ad 100644
--- a/test/e2e/tests/metrics/wallet-imported.spec.ts
+++ b/test/e2e/tests/metrics/wallet-imported.spec.ts
@@ -8,33 +8,24 @@ import {
 } from '../../helpers';
 import FixtureBuilder from '../../fixtures/fixture-builder';
 import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { mockSegment } from './mocks/segment';
 
 describe('Wallet Created Events - Imported Account', function () {
   it('are sent when onboarding user who chooses to opt in metrics', async function () {
     // We need to distinguish between browsers, because routes differ (MetaMetrics screen)
-    const eventsChrome = [
-      'App Installed',
-      'App Installed',
-      'SRP Backup Confirmed',
-      'Wallet Import Attempted',
-      'Wallet Imported',
-      'Wallet Setup Completed',
-    ];
-
-    const eventsFirefox = [
-      'App Installed',
-      'App Installed',
-      'App Installed',
-      'Analytics Preference Selected',
-      'Wallet Import Started',
-      'SRP Backup Confirmed',
-      'Wallet Import Attempted',
-      'Wallet Imported',
-      'Wallet Setup Completed',
+    const expectedEvents = [
+      MetaMetricsEventName.AppInstalled,
+      MetaMetricsEventName.AppInstalled,
+      MetaMetricsEventName.AppInstalled,
+      MetaMetricsEventName.AnalyticsPreferenceSelected,
+      MetaMetricsEventName.WalletImportStarted,
+      MetaMetricsEventName.OnboardingWalletSecurityPhraseConfirmed,
+      MetaMetricsEventName.WalletImportAttempted,
+      MetaMetricsEventName.WalletImported,
+      MetaMetricsEventName.WalletSetupCompleted,
     ];
     const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
-    const expectedEvents = isFirefox ? eventsFirefox : eventsChrome;
 
     await withFixtures(
       {
diff --git a/test/e2e/tests/multichain-accounts/multichain-wallet-details.spec.ts b/test/e2e/tests/multichain-accounts/multichain-wallet-details.spec.ts
index 335f46119343..3f144ac4b953 100644
--- a/test/e2e/tests/multichain-accounts/multichain-wallet-details.spec.ts
+++ b/test/e2e/tests/multichain-accounts/multichain-wallet-details.spec.ts
@@ -4,7 +4,7 @@ import { withFixtures } from '../../helpers';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import { Driver } from '../../webdriver/driver';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import { mockPriceApi } from '../tokens/utils/mocks';
 
@@ -12,8 +12,8 @@ describe('Multichain Accounts - Wallet Details', function (this: Suite) {
   it('should view wallet details with one Ethereum', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerShowNativeTokenAsMainBalanceDisabled()
+        fixtures: new FixtureBuilderV2()
+          .withShowNativeTokenAsMainBalanceDisabled()
           .withKeyringControllerMultiSRP()
           .withEnabledNetworks({ eip155: { '0x1': true } })
           .build(),
diff --git a/test/e2e/tests/multichain/aggregated-balances.spec.ts b/test/e2e/tests/multichain/aggregated-balances.spec.ts
index 6196aaa2e534..c895f0e59db0 100644
--- a/test/e2e/tests/multichain/aggregated-balances.spec.ts
+++ b/test/e2e/tests/multichain/aggregated-balances.spec.ts
@@ -77,7 +77,7 @@ describe('Multichain Aggregated Balances', function (this: Suite) {
         console.log('Step 3: Enable fiat balance display in settings');
         await headerNavbar.openSettingsPage();
         await settingsPage.toggleBalanceSetting();
-        await settingsPage.exitSettings();
+        await settingsPage.clickBackButton();
 
         console.log('Step 4: Verify main balance on homepage and account menu');
         await homepage.checkExpectedBalanceIsDisplayed(
@@ -107,9 +107,9 @@ describe('Multichain Aggregated Balances', function (this: Suite) {
         console.log('Step 7: Enable fiat display on testnets in settings');
         await headerNavbar.openSettingsPage();
         await settingsPage.toggleBalanceSetting();
-        await settingsPage.clickAdvancedTab();
+        await settingsPage.goToDeveloperOptions();
         await settingsPage.toggleShowFiatOnTestnets();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         console.log('Step 8: Verify USD balance on Sepolia network');
         await homepage.checkExpectedBalanceIsDisplayed(
diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.ts b/test/e2e/tests/multichain/all-permissions-page.spec.ts
index c260e0d6b59f..db311a46f095 100644
--- a/test/e2e/tests/multichain/all-permissions-page.spec.ts
+++ b/test/e2e/tests/multichain/all-permissions-page.spec.ts
@@ -68,7 +68,7 @@ describe('Permissions Page', function () {
 
         const experimentalSettings = new ExperimentalSettings(driver);
         await experimentalSettings.checkPageIsLoaded();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         // go to homepage and check site permissions
         await new Homepage(driver).checkPageIsLoaded();
diff --git a/test/e2e/tests/multichain/asset-list.spec.ts b/test/e2e/tests/multichain/asset-list.spec.ts
index 77015763ed5f..23fc4fc0b70a 100644
--- a/test/e2e/tests/multichain/asset-list.spec.ts
+++ b/test/e2e/tests/multichain/asset-list.spec.ts
@@ -1,6 +1,6 @@
 import { Suite } from 'mocha';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
@@ -9,6 +9,7 @@ import { Mockttp } from '../../mock-e2e';
 import { switchToNetworkFromNetworkSelect } from '../../page-objects/flows/network.flow';
 import SendPage from '../../page-objects/pages/send/send-page';
 import HomePage from '../../page-objects/pages/home/homepage';
+import { NETWORK_CLIENT_ID } from '../../constants';
 
 const NETWORK_NAME_MAINNET = 'Ethereum';
 
@@ -38,8 +39,8 @@ async function mockSetup(mockServer: Mockttp) {
 }
 function buildFixtures(title: string) {
   return {
-    fixtures: new FixtureBuilder()
-      .withNetworkControllerOnPolygon()
+    fixtures: new FixtureBuilderV2()
+      .withSelectedNetwork(NETWORK_CLIENT_ID.POLYGON_MAINNET)
       .withEnabledNetworks({
         eip155: {
           [CHAIN_IDS.POLYGON]: true,
@@ -71,8 +72,8 @@ describe('Multichain Asset List', function (this: Suite) {
   it('allows clicking into the asset details page of native token on another network', async function () {
     await withFixtures(
       buildFixtures(this.test?.fullTitle() as string),
-      async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+      async ({ driver, localNodes }) => {
+        await login(driver, { localNode: localNodes[0] });
         const assetListPage = new AssetListPage(driver);
         await switchToNetworkFromNetworkSelect(
           driver,
@@ -90,8 +91,8 @@ describe('Multichain Asset List', function (this: Suite) {
   it('validate the tokens appear on send given network', async function () {
     await withFixtures(
       buildFixtures(this.test?.fullTitle() as string),
-      async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+      async ({ driver, localNodes }) => {
+        await login(driver, { localNode: localNodes[0] });
         const homePage = new HomePage(driver);
         const assetListPage = new AssetListPage(driver);
         const sendPage = new SendPage(driver);
diff --git a/test/e2e/tests/network/add-custom-rpc.spec.ts b/test/e2e/tests/network/add-custom-rpc.spec.ts
index b0de13c34f1f..e0b5a4072856 100644
--- a/test/e2e/tests/network/add-custom-rpc.spec.ts
+++ b/test/e2e/tests/network/add-custom-rpc.spec.ts
@@ -2,7 +2,7 @@ import { Suite } from 'mocha';
 import { MockttpServer } from 'mockttp';
 import { WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import TestDapp from '../../page-objects/pages/test-dapp';
 import AddNetworkConfirmation from '../../page-objects/pages/confirmations/add-network-confirmations';
 import UpdateNetworkConfirmation from '../../page-objects/pages/confirmations/update-network-confirmation';
@@ -14,7 +14,7 @@ describe('Add Custom RPC', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
           .build(),
         title: this.test?.fullTitle(),
@@ -65,7 +65,7 @@ describe('Add Custom RPC', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
           .withPreferencesController({ useSafeChainsListValidation: true })
           .build(),
@@ -131,7 +131,7 @@ describe('Add Custom RPC', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
           .withPreferencesController({ useSafeChainsListValidation: false })
           .build(),
@@ -172,7 +172,7 @@ describe('Add Custom RPC', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
           .build(),
         title: this.test?.fullTitle(),
diff --git a/test/e2e/tests/network/deprecated-networks.spec.ts b/test/e2e/tests/network/deprecated-networks.spec.ts
index 8084478daf38..973098d979d8 100644
--- a/test/e2e/tests/network/deprecated-networks.spec.ts
+++ b/test/e2e/tests/network/deprecated-networks.spec.ts
@@ -4,6 +4,7 @@ import { withFixtures } from '../../helpers';
 import { DAPP_URL, WINDOW_TITLES } from '../../constants';
 import SelectNetwork from '../../page-objects/pages/dialog/select-network';
 import { login } from '../../page-objects/flows/login.flow';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
 
 describe('Deprecated networks', function (this: Suite) {
   it('User should not find goerli network when clicking on the network selector', async function () {
@@ -16,6 +17,7 @@ describe('Deprecated networks', function (this: Suite) {
       async ({ driver }) => {
         // Navigate to extension home screen
         await login(driver);
+        const headerNavbar = new HeaderNavbar(driver);
         // Open the first dapp which starts on chain '0x539
         await driver.openNewPage(DAPP_URL);
         await driver.clickElement({
@@ -40,11 +42,7 @@ describe('Deprecated networks', function (this: Suite) {
           .window()
           .setRect({ width: 400, height: 600 });
 
-        await driver.clickElement('.multichain-connected-site-menu ');
-        await driver.clickElement({
-          text: 'Localhost 8545',
-          tag: 'button',
-        });
+        await headerNavbar.openDappNetworkMenu();
 
         const selectNetworkDialog = new SelectNetwork(driver);
         await selectNetworkDialog.checkPageIsLoaded();
diff --git a/test/e2e/tests/network/popular-network.spec.ts b/test/e2e/tests/network/popular-network.spec.ts
index 73dfb4606e9b..e4eb6136edaf 100644
--- a/test/e2e/tests/network/popular-network.spec.ts
+++ b/test/e2e/tests/network/popular-network.spec.ts
@@ -217,7 +217,7 @@ describe('Popular Networks', function (this: Suite) {
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
         await privacySettings.toggleNetworkDetailsCheck();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         // return to the home screen
         const homepage = new Homepage(driver);
diff --git a/test/e2e/tests/network/remove-network.spec.ts b/test/e2e/tests/network/remove-network.spec.ts
index 0abd63e270d4..1713ccac8d5a 100644
--- a/test/e2e/tests/network/remove-network.spec.ts
+++ b/test/e2e/tests/network/remove-network.spec.ts
@@ -13,7 +13,7 @@ import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import HomePage from '../../page-objects/pages/home/homepage';
 import { getPermittedChains } from './common';
 
-describe('Remove Network:', function (this: Suite) {
+describe('Remove Network', function (this: Suite) {
   it('should remove the chainId from existing permissions when a network configuration is removed entirely', async function () {
     await withFixtures(
       {
diff --git a/test/e2e/tests/phishing-controller/helpers.js b/test/e2e/tests/phishing-controller/helpers.js
index bc0703af760d..07bfa626829c 100644
--- a/test/e2e/tests/phishing-controller/helpers.js
+++ b/test/e2e/tests/phishing-controller/helpers.js
@@ -16,10 +16,39 @@ const BlockProvider = {
   MetaMask: 'metamask',
 };
 
+/** Default C2 domain hash used across phishing E2E fixtures. */
+const DEFAULT_BLOCKED_DOMAIN =
+  'a379a6f6eeafb9a55e378c118034e2751e682fab9f2d30ab13d2125586ce1947';
+
+/**
+ * Waits until the PhishingController has fetched and processed its blocklist.
+ * The fixture pre-populates `stalelistLastFetched` with a non-zero timestamp,
+ * so we check `phishingLists.length > 0` instead — that only becomes true
+ * after the runtime has fetched and parsed the stalelist from the mock server.
+ *
+ * @param {object} driver - The E2E test Driver instance.
+ * @returns {Promise<void>}
+ */
+async function waitForPhishingBlocklistToBeLoaded(driver) {
+  await driver.wait(async () => {
+    const state = await driver.executeScript(
+      'return window.stateHooks.getPersistedState()',
+    );
+    const lists = state?.data?.PhishingController?.phishingLists;
+    return Array.isArray(lists) && lists.length > 0;
+  }, 10000);
+  // The state being populated doesn't guarantee the extension's content
+  // script / webNavigation handlers are registered yet. A brief delay
+  // lets the browser finish activating its interception mechanisms.
+  await driver.delay(500);
+}
+
 module.exports = {
   METAMASK_HOTLIST_DIFF_URL,
   METAMASK_STALELIST_URL,
   C2_DOMAIN_BLOCKLIST_URL,
   BlockProvider,
   ListNames,
+  DEFAULT_BLOCKED_DOMAIN,
+  waitForPhishingBlocklistToBeLoaded,
 };
diff --git a/test/e2e/tests/phishing-controller/phishing-detection-path-based.spec.ts b/test/e2e/tests/phishing-controller/phishing-detection-path-based.spec.ts
new file mode 100644
index 000000000000..77d932d1248f
--- /dev/null
+++ b/test/e2e/tests/phishing-controller/phishing-detection-path-based.spec.ts
@@ -0,0 +1,190 @@
+import { until } from 'selenium-webdriver';
+import { Suite } from 'mocha';
+import { Mockttp } from 'mockttp';
+import { withFixtures, veryLargeDelayMs } from '../../helpers';
+import { WINDOW_TITLES } from '../../constants';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import HomePage from '../../page-objects/pages/home/homepage';
+import PhishingWarningPage from '../../page-objects/pages/phishing-warning-page';
+import { login } from '../../page-objects/flows/login.flow';
+import { setupPhishingDetectionMocks } from './mocks';
+import {
+  DEFAULT_BLOCKED_DOMAIN,
+  BlockProvider,
+  waitForPhishingBlocklistToBeLoaded,
+} from './helpers';
+
+describe('Phishing Detection - Path-based URLs', function (this: Suite) {
+  describe('blocklisted paths', function () {
+    it('displays the MetaMask Phishing Detection page when accessing a blocklisted path', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilderV2().build(),
+          title: this.test?.fullTitle(),
+          testSpecificMock: async (mockServer: Mockttp) => {
+            return setupPhishingDetectionMocks(mockServer, {
+              statusCode: 200,
+              blockProvider: BlockProvider.MetaMask,
+              blocklist: [],
+              c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
+              blocklistPaths: ['127.0.0.1/path1'],
+            });
+          },
+          dappOptions: {
+            customDappPaths: [
+              './tests/phishing-controller/mock-page-with-paths',
+            ],
+          },
+        },
+        async ({ driver }) => {
+          await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
+
+          await driver.openNewPage('http://127.0.0.1:8080/path1/');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
+          const phishingWarningPage = new PhishingWarningPage(driver);
+          await phishingWarningPage.checkPageIsLoaded();
+        },
+      );
+    });
+
+    it('blocks access to blocklisted subpaths', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilderV2().build(),
+          title: this.test?.fullTitle(),
+          testSpecificMock: async (mockServer: Mockttp) => {
+            return setupPhishingDetectionMocks(mockServer, {
+              statusCode: 200,
+              blockProvider: BlockProvider.MetaMask,
+              blocklist: [],
+              c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
+              blocklistPaths: ['127.0.0.1/path1'],
+            });
+          },
+          dappOptions: {
+            customDappPaths: [
+              './tests/phishing-controller/mock-page-with-paths',
+            ],
+          },
+        },
+        async ({ driver }) => {
+          await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
+
+          await driver.openNewPage('http://127.0.0.1:8080/path1/path2');
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
+          const phishingWarningPage = new PhishingWarningPage(driver);
+          await phishingWarningPage.checkPageIsLoaded();
+        },
+      );
+    });
+  });
+
+  describe('whitelisted paths', function () {
+    it('does not display the MetaMask Phishing Detection page when accessing a whitelisted path', async function () {
+      if (process.env.SELENIUM_BROWSER === 'firefox') {
+        this.skip();
+      }
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilderV2().build(),
+          title: this.test?.fullTitle(),
+          testSpecificMock: async (mockServer: Mockttp) => {
+            return setupPhishingDetectionMocks(mockServer, {
+              statusCode: 200,
+              blockProvider: BlockProvider.MetaMask,
+              blocklist: [],
+              c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
+              blocklistPaths: ['127.0.0.1/path1'],
+            });
+          },
+          dappOptions: {
+            customDappPaths: [
+              './tests/phishing-controller/mock-page-with-paths',
+            ],
+          },
+        },
+        async ({ driver }) => {
+          await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
+
+          await driver.openNewPage('http://127.0.0.1:8080/path1/');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
+          const phishingWarningPage = new PhishingWarningPage(driver);
+          await phishingWarningPage.checkPageIsLoaded();
+          await phishingWarningPage.clickProceedAnywayButton();
+
+          // Wait for navigation to complete
+          await driver.waitForWindowWithTitleToBePresent(
+            'Mock E2E Phishing Page: Path 1',
+            15000,
+          );
+          await driver.switchToWindowWithTitle(
+            'Mock E2E Phishing Page: Path 1',
+          );
+        },
+      );
+    });
+
+    it('when the subpath is whitelisted, the phishing warning page is not displayed for the blocklisted path and all subpaths', async function () {
+      if (process.env.SELENIUM_BROWSER === 'firefox') {
+        this.skip();
+      }
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilderV2().build(),
+          title: this.test?.fullTitle(),
+          testSpecificMock: async (mockServer: Mockttp) => {
+            return setupPhishingDetectionMocks(mockServer, {
+              statusCode: 200,
+              blockProvider: BlockProvider.MetaMask,
+              blocklist: [],
+              c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
+              blocklistPaths: ['127.0.0.1/path1'],
+            });
+          },
+          dappOptions: {
+            customDappPaths: [
+              './tests/phishing-controller/mock-page-with-paths',
+            ],
+          },
+        },
+        async ({ driver }) => {
+          await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
+
+          await driver.openNewPage('http://127.0.0.1:8080/path1/path2');
+          // Note: unsure why it's needed but it stabilizes the test
+          await driver.delay(veryLargeDelayMs);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
+          const phishingWarningPage = new PhishingWarningPage(driver);
+          await phishingWarningPage.checkPageIsLoaded();
+          await phishingWarningPage.clickProceedAnywayButton();
+          await driver.waitForWindowWithTitleToBePresent(
+            'Mock E2E Phishing Page: Path 2',
+            15000,
+          );
+          await driver.switchToWindowWithTitle(
+            'Mock E2E Phishing Page: Path 2',
+          );
+
+          await driver.openNewPage('http://127.0.0.1:8080/path1');
+          await driver.wait(
+            until.titleIs('Mock E2E Phishing Page: Path 1'),
+            10000,
+          );
+        },
+      );
+    });
+  });
+});
diff --git a/test/e2e/tests/phishing-controller/phishing-detection-redirects.spec.ts b/test/e2e/tests/phishing-controller/phishing-detection-redirects.spec.ts
new file mode 100644
index 000000000000..404c0c5fe57c
--- /dev/null
+++ b/test/e2e/tests/phishing-controller/phishing-detection-redirects.spec.ts
@@ -0,0 +1,172 @@
+import { createServer } from 'node:http';
+import type { Server } from 'node:http';
+import { createDeferredPromise } from '@metamask/utils';
+import { Suite } from 'mocha';
+import { Mockttp } from 'mockttp';
+import { withFixtures } from '../../helpers';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import { Driver } from '../../webdriver/driver';
+import { login } from '../../page-objects/flows/login.flow';
+import HomePage from '../../page-objects/pages/home/homepage';
+import { setupPhishingDetectionMocks } from './mocks';
+import {
+  DEFAULT_BLOCKED_DOMAIN,
+  BlockProvider,
+  waitForPhishingBlocklistToBeLoaded,
+} from './helpers';
+
+describe('Phishing Detection - Redirect protections', function (this: Suite) {
+  /**
+   * Status codes 305 (via Location header) and 306 (Set-Proxy) header do not
+   * automatically forward user agents to the new location, so we don't test
+   * these status codes. Status code 304 (Not Modified) is not a redirect
+   * status code.
+   *
+   * 201 _does_ require a Location header, but it also doesn't get
+   * automatically redirected by the user-agent, so we don't test it either.
+   *
+   * 200 is only included in order to test the `Refresh` header.
+   *
+   * @type {readonly [200 | 301 | 302 | 303 | 307 | 308]}
+   */
+  const redirectableStatusCodes = [200, 301, 302, 303, 307, 308];
+
+  const destination = 'https://metamask.github.io/test-dapp/';
+  const blocked = '127.0.0.1';
+
+  let server: Server | undefined;
+  let driver: Driver | undefined;
+  let fixturePromise: Promise<void> | undefined;
+
+  /**
+   * Handle requests by setting the given header values and status code.
+   *
+   * @param name - The name of the header to set.
+   * @param value - The value of the header to set.
+   * @param code - The status code
+   */
+  function handleRequests(name: string, value: string, code: number): void {
+    server?.once('request', async function (_request, response) {
+      response.setHeader(name, value).writeHead(code).end(`
+        <!doctype html>
+        <html>
+          <head>
+            <meta http-equiv="Refresh" content="0;url="${destination}"/>
+            <title>Phishing test</title>
+
+            <script>
+              // this script should not run.
+              // it is meant to test for regressions in our redirect
+              // protection due to changes in either MetaMask or browsers.
+              document.location.href = "${destination}";
+              // Delay the canary to avoid a race condition for HTTP 200
+              // responses: the browser renders the body before the phishing
+              // content script can redirect, so a synchronous alert() fires
+              // before the extension has a chance to act. The setTimeout
+              // yields to the event loop, giving the redirect time to land.
+              setTimeout(() => {
+                alert("trying to prevent phishing protection");
+                while(true){}
+              }, 500);
+            </script>
+          </head>
+          <body>
+            <h1>Redirecting...</h1>
+          </body>
+        </html>
+        `);
+    });
+  }
+
+  const deferredTestSuite = createDeferredPromise();
+
+  /*  eslint-disable mocha/no-hooks-for-single-case, mocha/no-sibling-hooks */
+  before('Set up redirect server', async function () {
+    const { promise, resolve, reject } = createDeferredPromise();
+    server = createServer();
+    server.listen(0, blocked, resolve);
+    server.on('error', reject);
+    await promise;
+  });
+  after('Shut down redirect server', async function () {
+    if (server) {
+      const { promise, resolve } = createDeferredPromise();
+      server.close(() => resolve(undefined));
+      // We need to close all connections to stop the server quickly
+      // Otherwise it takes a few seconds for it to close
+      server.closeAllConnections();
+      await promise;
+    }
+  });
+  before('Set up fixtures', async function () {
+    const { promise, resolve } = createDeferredPromise<Driver>();
+    fixturePromise = withFixtures(
+      {
+        fixtures: new FixtureBuilderV2().build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: async (mockServer: Mockttp) => {
+          await setupPhishingDetectionMocks(mockServer, {
+            statusCode: 200,
+            blockProvider: BlockProvider.MetaMask,
+            blocklist: [blocked],
+            c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
+            blocklistPaths: [],
+          });
+        },
+      },
+      async (fixtures: { driver: Driver }) => {
+        resolve(fixtures.driver); // resolve this `beforeEach`
+        await deferredTestSuite.promise; // now wait for all tests to complete
+      },
+    );
+    driver = await promise;
+
+    // required to ensure MetaMask is fully started before running tests
+    // if we had a way of detecting when the offscreen/background were ready
+    // we could remove this
+    await login(driver);
+    const homePage = new HomePage(driver);
+    await homePage.checkPageIsLoaded();
+    await waitForPhishingBlocklistToBeLoaded(driver);
+  });
+  after('Shut down fixtures', async function () {
+    deferredTestSuite.resolve(); // let the fixtures know tests are complete
+    await fixturePromise; // wait for fixtures to shutdown
+  });
+  afterEach('Ensure listeners are torn down between tests', function () {
+    server?.removeAllListeners('request');
+  });
+  afterEach('Reset current window to about:blank', async function () {
+    await driver?.openNewURL(`about:blank`);
+  });
+  /* eslint-enable mocha/no-hooks-for-single-case, mocha/no-sibling-hooks */
+
+  for (const code of redirectableStatusCodes) {
+    // This rule is flagging unsafe references to `server` and `driver`, but
+    // they are being used safely here. We are intentionally sharing one
+    // instance for each test.
+    // eslint-disable-next-line no-loop-func
+    it(`should display the MetaMask Phishing Detection page if a blocked site redirects via HTTP Status Code ${code} to another page`, async function () {
+      const address = server?.address() as { port: number } | null;
+      if (!address) {
+        throw new Error('Server address is null');
+      }
+      const { port } = address;
+      const refresh = { name: 'Refresh', value: `0;url="${destination}"` };
+      const location = { name: 'Location', value: destination };
+      const { name, value } = code === 200 ? refresh : location;
+      handleRequests(name, value, code);
+      // navigate to the blocked site (it tries to redirect to the destination)
+      const blockedUrl = `http://${blocked}:${port}/`;
+      await driver?.openNewURL(blockedUrl);
+      // check that the redirect was ultimately _not_ followed and instead
+      // went to our "MetaMask Phishing Detection" site
+
+      await driver?.waitForUrl({
+        url:
+          // http://localhost:9999 is the Phishing Warning page
+          `http://localhost:9999/#hostname=${blocked}&href=http%3A%2F%2F${blocked}%3A${port}%2F`,
+      });
+    });
+  }
+});
diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.ts b/test/e2e/tests/phishing-controller/phishing-detection.spec.ts
index 1adcd29b785b..93f7a647cd10 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.ts
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.ts
@@ -1,7 +1,4 @@
 import { strict as assert } from 'assert';
-import { createServer } from 'node:http';
-import type { Server } from 'node:http';
-import { createDeferredPromise } from '@metamask/utils';
 import { until } from 'selenium-webdriver';
 import { Suite } from 'mocha';
 import { Mockttp } from 'mockttp';
@@ -12,7 +9,6 @@ import {
 } from '../../helpers';
 import { WINDOW_TITLES } from '../../constants';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import { Driver } from '../../webdriver/driver';
 import HomePage from '../../page-objects/pages/home/homepage';
 import MockedPage from '../../page-objects/pages/mocked-page';
 import PhishingWarningPage from '../../page-objects/pages/phishing-warning-page';
@@ -26,12 +22,10 @@ import {
   METAMASK_HOTLIST_DIFF_URL,
   METAMASK_STALELIST_URL,
   BlockProvider,
+  DEFAULT_BLOCKED_DOMAIN,
+  waitForPhishingBlocklistToBeLoaded,
 } from './helpers';
 
-// Common test constants
-const DEFAULT_BLOCKED_DOMAIN =
-  'a379a6f6eeafb9a55e378c118034e2751e682fab9f2d30ab13d2125586ce1947';
-
 describe('Phishing Detection', function (this: Suite) {
   describe('Phishing Detection Mock', function () {
     it('should be updated to use v1 of the API', function () {
@@ -68,6 +62,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
 
@@ -122,6 +119,9 @@ describe('Phishing Detection', function (this: Suite) {
         }),
         async ({ driver }) => {
           await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
           await driver.openNewPage(DAPP_WITH_IFRAMED_PAGE_ON_BLOCKLIST);
           // we don't expect the iframe because early-phishing-detection redirects
           // the top level frame automatically.
@@ -151,6 +151,9 @@ describe('Phishing Detection', function (this: Suite) {
         }),
         async ({ driver }) => {
           await login(driver);
+          const homePage = new HomePage(driver);
+          await homePage.checkPageIsLoaded();
+          await waitForPhishingBlocklistToBeLoaded(driver);
           await driver.openNewPage(DAPP_WITH_IFRAMED_PAGE_ON_BLOCKLIST);
           const phishingWarningPage = new PhishingWarningPage(driver);
           await phishingWarningPage.clickOpenWarningInNewTabLinkOnIframe();
@@ -190,6 +193,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
         await driver.openNewPage(
           `http://localhost:8080?extensionUrl=${driver.extensionUrl}`,
         );
@@ -228,6 +234,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
 
@@ -268,6 +277,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
         await driver.openNewPage(phishingSite.href);
 
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
@@ -310,6 +322,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
         await driver.openNewPage(
           `http://localhost:8080?extensionUrl=${driver.extensionUrl}`,
         );
@@ -347,6 +362,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
 
         await driver.openNewPage(testPageURL);
 
@@ -384,6 +402,9 @@ describe('Phishing Detection', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await waitForPhishingBlocklistToBeLoaded(driver);
 
         await driver.openNewPage(testPageURL);
 
@@ -397,311 +418,4 @@ describe('Phishing Detection', function (this: Suite) {
       },
     );
   });
-
-  describe('Phishing redirect protections', function () {
-    /**
-     * Status codes 305 (via Location header) and 306 (Set-Proxy) header do not
-     * automatically forward user agents to the new location, so we don't test
-     * these status codes. Status code 304 (Not Modified) is not a redirect
-     * status code.
-     *
-     * 201 _does_ require a Location header, but it also doesn't get
-     * automatically redirected by the user-agent, so we don't test it either.
-     *
-     * 200 is only included in order to test the `Refresh` header.
-     *
-     * @type {readonly [200 | 301 | 302 | 303 | 307 | 308]}
-     */
-    const redirectableStatusCodes = [200, 301, 302, 303, 307, 308];
-
-    const destination = 'https://metamask.github.io/test-dapp/';
-    const blocked = '127.0.0.1';
-
-    let server: Server | undefined;
-    let driver: Driver | undefined;
-    let fixturePromise: Promise<void> | undefined;
-
-    /**
-     * Handle requests by setting the given header values and status code.
-     *
-     * @param name - The name of the header to set.
-     * @param value - The value of the header to set.
-     * @param code - The status code
-     */
-    function handleRequests(name: string, value: string, code: number): void {
-      server?.once('request', async function (_request, response) {
-        response.setHeader(name, value).writeHead(code).end(`
-        <!doctype html>
-        <html>
-          <head>
-            <meta http-equiv="Refresh" content="0;url="${destination}"/>
-            <title>Phishing test</title>
-
-            <script>
-              // this script should not run.
-              // it is meant to test for regressions in our redirect
-              // protection due to changes in either MetaMask or browsers.
-              document.location.href = "${destination}";
-              alert("trying to prevent phishing protection");
-              while(true){}
-            </script>
-          </head>
-          <body>
-            <h1>Redirecting...</h1>
-          </body>
-        </html>
-        `);
-      });
-    }
-
-    const deferredTestSuite = createDeferredPromise();
-
-    /*  eslint-disable mocha/no-hooks-for-single-case, mocha/no-sibling-hooks */
-    before('Set up redirect server', async function () {
-      const { promise, resolve, reject } = createDeferredPromise();
-      server = createServer();
-      server.listen(0, blocked, resolve);
-      server.on('error', reject);
-      await promise;
-    });
-    after('Shut down redirect server', async function () {
-      if (server) {
-        const { promise, resolve } = createDeferredPromise();
-        server.close(() => resolve(undefined));
-        // We need to close all connections to stop the server quickly
-        // Otherwise it takes a few seconds for it to close
-        server.closeAllConnections();
-        await promise;
-      }
-    });
-    before('Set up fixtures', async function () {
-      const { promise, resolve } = createDeferredPromise<Driver>();
-      fixturePromise = withFixtures(
-        {
-          fixtures: new FixtureBuilderV2().build(),
-          title: this.test?.fullTitle(),
-          testSpecificMock: async (mockServer: Mockttp) => {
-            await setupPhishingDetectionMocks(mockServer, {
-              statusCode: 200,
-              blockProvider: BlockProvider.MetaMask,
-              blocklist: [blocked],
-              c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
-              blocklistPaths: [],
-            });
-          },
-        },
-        async (fixtures: { driver: Driver }) => {
-          resolve(fixtures.driver); // resolve this `beforeEach`
-          await deferredTestSuite.promise; // now wait for all tests to complete
-        },
-      );
-      driver = await promise;
-
-      // required to ensure MetaMask is fully started before running tests
-      // if we had a way of detecting when the offscreen/background were ready
-      // we could remove this
-      await login(driver);
-    });
-    after('Shut down fixtures', async function () {
-      deferredTestSuite.resolve(); // let the fixtures know tests are complete
-      await fixturePromise; // wait for fixtures to shutdown
-    });
-    afterEach('Ensure listeners are torn down between tests', function () {
-      server?.removeAllListeners('request');
-    });
-    afterEach('Reset current window to about:blank', async function () {
-      await driver?.openNewURL(`about:blank`);
-    });
-    /* eslint-enable mocha/no-hooks-for-single-case, mocha/no-sibling-hooks */
-
-    for (const code of redirectableStatusCodes) {
-      // This rule is flagging unsafe references to `server` and `driver`, but
-      // they are being used safely here. We are intentionally sharing one
-      // instance for each test.
-      // eslint-disable-next-line no-loop-func
-      it(`should display the MetaMask Phishing Detection page if a blocked site redirects via HTTP Status Code ${code} to another page`, async function () {
-        const address = server?.address() as { port: number } | null;
-        if (!address) {
-          throw new Error('Server address is null');
-        }
-        const { port } = address;
-        const refresh = { name: 'Refresh', value: `0;url="${destination}"` };
-        const location = { name: 'Location', value: destination };
-        const { name, value } = code === 200 ? refresh : location;
-        handleRequests(name, value, code);
-        // navigate to the blocked site (it tries to redirect to the destination)
-        const blockedUrl = `http://${blocked}:${port}/`;
-        await driver?.openNewURL(blockedUrl);
-        // check that the redirect was ultimately _not_ followed and instead
-        // went to our "MetaMask Phishing Detection" site
-
-        await driver?.waitForUrl({
-          url:
-            // http://localhost:9999 is the Phishing Warning page
-            `http://localhost:9999/#hostname=${blocked}&href=http%3A%2F%2F${blocked}%3A${port}%2F`,
-        });
-      });
-    }
-  });
-
-  describe('Path-based URLs', function () {
-    describe('blocklisted paths', function () {
-      it('displays the MetaMask Phishing Detection page when accessing a blocklisted path', async function () {
-        await withFixtures(
-          {
-            fixtures: new FixtureBuilderV2().build(),
-            title: this.test?.fullTitle(),
-            testSpecificMock: async (mockServer: Mockttp) => {
-              return setupPhishingDetectionMocks(mockServer, {
-                statusCode: 200,
-                blockProvider: BlockProvider.MetaMask,
-                blocklist: [],
-                c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
-                blocklistPaths: ['127.0.0.1/path1'],
-              });
-            },
-            dappOptions: {
-              customDappPaths: [
-                './tests/phishing-controller/mock-page-with-paths',
-              ],
-            },
-          },
-          async ({ driver }) => {
-            await login(driver);
-
-            await driver.openNewPage('http://127.0.0.1:8080/path1/');
-            await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
-            const phishingWarningPage = new PhishingWarningPage(driver);
-            await phishingWarningPage.checkPageIsLoaded();
-          },
-        );
-      });
-
-      it('blocks access to blocklisted subpaths', async function () {
-        await withFixtures(
-          {
-            fixtures: new FixtureBuilderV2().build(),
-            title: this.test?.fullTitle(),
-            testSpecificMock: async (mockServer: Mockttp) => {
-              return setupPhishingDetectionMocks(mockServer, {
-                statusCode: 200,
-                blockProvider: BlockProvider.MetaMask,
-                blocklist: [],
-                c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
-                blocklistPaths: ['127.0.0.1/path1'],
-              });
-            },
-            dappOptions: {
-              customDappPaths: [
-                './tests/phishing-controller/mock-page-with-paths',
-              ],
-            },
-          },
-          async ({ driver }) => {
-            await login(driver);
-
-            await driver.openNewPage('http://127.0.0.1:8080/path1/path2');
-
-            await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
-            const phishingWarningPage = new PhishingWarningPage(driver);
-            await phishingWarningPage.checkPageIsLoaded();
-          },
-        );
-      });
-    });
-
-    describe('whitelisted paths', function () {
-      it('does not display the MetaMask Phishing Detection page when accessing a whitelisted path', async function () {
-        if (process.env.SELENIUM_BROWSER === 'firefox') {
-          this.skip();
-        }
-        await withFixtures(
-          {
-            fixtures: new FixtureBuilderV2().build(),
-            title: this.test?.fullTitle(),
-            testSpecificMock: async (mockServer: Mockttp) => {
-              return setupPhishingDetectionMocks(mockServer, {
-                statusCode: 200,
-                blockProvider: BlockProvider.MetaMask,
-                blocklist: [],
-                c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
-                blocklistPaths: ['127.0.0.1/path1'],
-              });
-            },
-            dappOptions: {
-              customDappPaths: [
-                './tests/phishing-controller/mock-page-with-paths',
-              ],
-            },
-          },
-          async ({ driver }) => {
-            await login(driver);
-
-            await driver.openNewPage('http://127.0.0.1:8080/path1/');
-            await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
-            const phishingWarningPage = new PhishingWarningPage(driver);
-            await phishingWarningPage.checkPageIsLoaded();
-            await phishingWarningPage.clickProceedAnywayButton();
-
-            // Wait for navigation to complete
-            await driver.waitForWindowWithTitleToBePresent(
-              'Mock E2E Phishing Page: Path 1',
-              15000,
-            );
-            await driver.switchToWindowWithTitle(
-              'Mock E2E Phishing Page: Path 1',
-            );
-          },
-        );
-      });
-
-      it('when the subpath is whitelisted, the phishing warning page is not displayed for the blocklisted path and all subpaths', async function () {
-        if (process.env.SELENIUM_BROWSER === 'firefox') {
-          this.skip();
-        }
-        await withFixtures(
-          {
-            fixtures: new FixtureBuilderV2().build(),
-            title: this.test?.fullTitle(),
-            testSpecificMock: async (mockServer: Mockttp) => {
-              return setupPhishingDetectionMocks(mockServer, {
-                statusCode: 200,
-                blockProvider: BlockProvider.MetaMask,
-                blocklist: [],
-                c2DomainBlocklist: [DEFAULT_BLOCKED_DOMAIN],
-                blocklistPaths: ['127.0.0.1/path1'],
-              });
-            },
-            dappOptions: {
-              customDappPaths: [
-                './tests/phishing-controller/mock-page-with-paths',
-              ],
-            },
-          },
-          async ({ driver }) => {
-            await login(driver);
-
-            await driver.openNewPage('http://127.0.0.1:8080/path1/path2');
-            await driver.switchToWindowWithTitle(WINDOW_TITLES.Phishing);
-            const phishingWarningPage = new PhishingWarningPage(driver);
-            await phishingWarningPage.checkPageIsLoaded();
-            await phishingWarningPage.clickProceedAnywayButton();
-            await driver.waitForWindowWithTitleToBePresent(
-              'Mock E2E Phishing Page: Path 2',
-              15000,
-            );
-            await driver.switchToWindowWithTitle(
-              'Mock E2E Phishing Page: Path 2',
-            );
-
-            await driver.openNewPage('http://127.0.0.1:8080/path1');
-            await driver.wait(
-              until.titleIs('Mock E2E Phishing Page: Path 1'),
-              10000,
-            );
-          },
-        );
-      });
-    });
-  });
 });
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts
index 78c008b54e8b..8eea16930a58 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-contract-interaction.spec.ts
@@ -1,6 +1,6 @@
 import { Suite } from 'mocha';
 import { MockttpServer, CompletedRequest } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
 import TestDapp from '../../page-objects/pages/test-dapp';
@@ -228,21 +228,10 @@ describe('PPOM Blockaid Alert - Malicious Contract interaction', function (this:
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkController({
-            selectedNetworkClientId: 'networkConfigurationId',
-          })
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp({
             useLocalhostHostname: true,
           })
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
           .build(),
         testSpecificMock: mockInfura,
         title: this.test?.fullTitle(),
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 45408deb199c..bbe35ea1ae7e 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,9 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixtures/fixture-builder');
-
+const {
+  default: FixtureBuilderV2,
+} = require('../../fixtures/fixture-builder-v2');
 const { withFixtures } = require('../../helpers');
 const { login } = require('../../page-objects/flows/login.flow');
-const { DAPP_URL, WINDOW_TITLES } = require('../../constants');
+const {
+  DAPP_URL_LOCALHOST,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} = require('../../constants');
 const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
@@ -211,11 +216,16 @@ describe('PPOM Blockaid Alert - Malicious ERC20 Approval', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfura,
@@ -223,8 +233,8 @@ describe('PPOM Blockaid Alert - Malicious ERC20 Approval', function () {
       },
 
       async ({ driver }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         const expectedTitle = 'This is a deceptive request';
         const expectedDescription =
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts
index cf138cb5a40f..a3f42df19947 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.ts
@@ -1,6 +1,6 @@
 import { Suite } from 'mocha';
 import { MockttpServer } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
 import TestDapp from '../../page-objects/pages/test-dapp';
@@ -83,21 +83,10 @@ describe('PPOM Blockaid Alert - Malicious ERC20 Transfer', function (this: Suite
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkController({
-            selectedNetworkClientId: 'networkConfigurationId',
-          })
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp({
             useLocalhostHostname: true,
           })
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
           .build(),
         testSpecificMock: mockInfuraWithMaliciousResponses,
         title: this.test?.fullTitle(),
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 2834f4c649cc..7b175bfec0d8 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js
@@ -1,8 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixtures/fixture-builder');
+const {
+  default: FixtureBuilderV2,
+} = require('../../fixtures/fixture-builder-v2');
 const { withFixtures, getEventPayloads } = require('../../helpers');
 const { login } = require('../../page-objects/flows/login.flow');
-const { DAPP_URL, WINDOW_TITLES } = require('../../constants');
+const {
+  DAPP_URL_LOCALHOST,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} = require('../../constants');
 const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 const { MOCK_META_METRICS_ID } = require('./constants');
 
@@ -253,11 +259,16 @@ describe('Confirmation Security Alert - Blockaid', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .withMetaMetricsController({
             metaMetricsId: MOCK_META_METRICS_ID,
@@ -269,8 +280,8 @@ describe('Confirmation Security Alert - Blockaid', function () {
       },
 
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         // Click TestDapp button for transaction
         await driver.clickElement('#maliciousApprovalButton');
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 a9a6bb0eb165..cd65cecf10b2 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,8 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixtures/fixture-builder');
+const {
+  default: FixtureBuilderV2,
+} = require('../../fixtures/fixture-builder-v2');
 const { withFixtures } = require('../../helpers');
 const { login } = require('../../page-objects/flows/login.flow');
-const { DAPP_URL, WINDOW_TITLES } = require('../../constants');
+const {
+  DAPP_URL_LOCALHOST,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} = require('../../constants');
 const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 async function mockInfura(mockServer) {
@@ -44,15 +50,20 @@ async function mockInfuraWithMaliciousResponses(mockServer) {
 
 describe('PPOM Blockaid Alert - Multiple Networks Support', function () {
   // eslint-disable-next-line mocha/no-skipped-tests
-  it.skip('should show banner alert after switchinig to another supported network', async function () {
+  it.skip('should show banner alert after switching to another supported network', async function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1, 42161],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfuraWithMaliciousResponses,
@@ -64,8 +75,8 @@ describe('PPOM Blockaid Alert - Multiple Networks Support', function () {
         const expectedDescription =
           'If you approve this request, you might lose your assets.';
 
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         // Click TestDapp button to send JSON-RPC request
         await driver.clickElement('#maliciousTradeOrder');
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts
index 383182c7ee18..bf33ff84c052 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.ts
@@ -1,7 +1,7 @@
 import { Suite } from 'mocha';
 import { MockttpServer } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
-import { WINDOW_TITLES } from '../../constants';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import { NETWORK_CLIENT_ID, WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
 import { mockMultiNetworkBalancePolling } from '../../mock-balance-polling/mock-balance-polling';
 import HomePage from '../../page-objects/pages/home/homepage';
@@ -143,11 +143,8 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -159,7 +156,7 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
       },
 
       async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+        await login(driver, { expectedBalance: '20 ETH' });
         const homePage = new HomePage(driver);
 
         // We validate custom balance as it doesn't come from the local node but it's mocked
@@ -190,13 +187,11 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
       // see issue: https://github.com/MetaMask/MetaMask-planning/issues/3560
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withPermissionControllerConnectedToTestDapp({
             useLocalhostHostname: true,
-          })
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+            chainIds: [1],
           })
           .withEnabledNetworks({
             eip155: {
@@ -209,7 +204,7 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
       },
 
       async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+        await login(driver, { expectedBalance: '20 ETH' });
 
         // We validate custom balance as it doesn't come from the local node but it's mocked
         await new HomePage(driver).checkExpectedBalanceIsDisplayed('20 ETH');
@@ -235,11 +230,8 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -251,7 +243,7 @@ describe('Simple Send Security Alert - Blockaid', function (this: Suite) {
       },
 
       async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+        await login(driver, { expectedBalance: '20 ETH' });
         const homePage = new HomePage(driver);
 
         // We validate custom balance as it doesn't come from the local node but it's mocked
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts
index d2f8f27252c0..090e8eefa03d 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.ts
@@ -1,7 +1,7 @@
 import { Suite } from 'mocha';
 import { MockttpServer } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
-import { WINDOW_TITLES } from '../../constants';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import { NETWORK_CLIENT_ID, WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
 import TestDapp from '../../page-objects/pages/test-dapp';
 import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation';
@@ -107,7 +107,7 @@ async function mockSecurityAlertsRequest(server: MockttpServer): Promise<void> {
   };
 
   await server
-    .forPost(`${SECURITY_ALERTS_PROD_API_BASE_URL}/validate/0x539`)
+    .forPost(`${SECURITY_ALERTS_PROD_API_BASE_URL}/validate/0x1`)
     .withJsonBodyIncluding(request)
     .thenJson(response.statusCode ?? 201, response.body);
 }
@@ -119,29 +119,24 @@ describe('PPOM Blockaid Alert - Set Trade farming order', function (this: Suite)
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withPermissionControllerConnectedToTestDapp({
             useLocalhostHostname: true,
-          })
-          .withNetworkController({
-            selectedNetworkClientId: 'networkConfigurationId',
+            chainIds: [1],
           })
           .withEnabledNetworks({
             eip155: {
-              '0x539': true,
+              '0x1': true,
             },
           })
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
-          // .withNetworkControllerOnMainnet()
           .build(),
         testSpecificMock: mockInfura,
         title: this.test?.fullTitle(),
       },
 
       async ({ driver }) => {
-        await login(driver);
+        await login(driver, { expectedBalance: '1.37T ETH' });
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage({ url: 'http://localhost:8080' });
         await testDapp.checkPageIsLoaded();
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
index 754dbc9ebe52..b125caa6ef32 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert.spec.js
@@ -1,8 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixtures/fixture-builder');
+const {
+  default: FixtureBuilderV2,
+} = require('../../fixtures/fixture-builder-v2');
 const { login } = require('../../page-objects/flows/login.flow');
 const { withFixtures } = require('../../helpers');
-const { DAPP_URL, WINDOW_TITLES } = require('../../constants');
+const {
+  DAPP_URL_LOCALHOST,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} = require('../../constants');
 const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
@@ -166,11 +172,16 @@ describe('Confirmation Security Alert - Blockaid', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfura,
@@ -178,8 +189,8 @@ describe('Confirmation Security Alert - Blockaid', function () {
       },
 
       async ({ driver }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         for (const config of testBenignConfigs) {
           const { btnSelector, logExpectedDetail, method, params } = config;
@@ -228,11 +239,16 @@ describe('Confirmation Security Alert - Blockaid', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfuraWithMaliciousResponses,
@@ -240,8 +256,8 @@ describe('Confirmation Security Alert - Blockaid', function () {
       },
 
       async ({ driver }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         for (const config of testMaliciousConfigs) {
           const { expectedDescription, expectedReason, btnSelector } = config;
@@ -286,11 +302,16 @@ describe('Confirmation Security Alert - Blockaid', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfuraWithFailedResponses,
@@ -298,8 +319,8 @@ describe('Confirmation Security Alert - Blockaid', function () {
       },
 
       async ({ driver }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         // Click TestDapp button to send JSON-RPC request
         await driver.clickElement('#maliciousApprovalButton');
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 24f36bf83aa1..5aeaeccc39c0 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js
@@ -1,11 +1,17 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixtures/fixture-builder');
+const {
+  default: FixtureBuilderV2,
+} = require('../../fixtures/fixture-builder-v2');
 const { withFixtures } = require('../../helpers');
 const { login } = require('../../page-objects/flows/login.flow');
-const { DAPP_URL, WINDOW_TITLES } = require('../../constants');
+const {
+  DAPP_URL_LOCALHOST,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} = require('../../constants');
 const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
-const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
+const bannerAlertSelector = '[data-testid="confirm-banner-alert"]';
 
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
 const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1';
@@ -248,11 +254,16 @@ describe('PPOM Blockaid Alert - Set Approval to All', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
           })
           .build(),
         testSpecificMock: mockInfura,
@@ -260,8 +271,8 @@ describe('PPOM Blockaid Alert - Set Approval to All', function () {
       },
 
       async ({ driver }) => {
-        await login(driver);
-        await driver.openNewPage(DAPP_URL);
+        await login(driver, { expectedBalance: '1.37T ETH' });
+        await driver.openNewPage(DAPP_URL_LOCALHOST);
 
         const expectedTitle = 'This is a deceptive request';
         const expectedDescription =
diff --git a/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.ts b/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.ts
index 59e374323911..08b4efdc4605 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.ts
+++ b/test/e2e/tests/ppom/ppom-blockaid-toggle-metrics.spec.ts
@@ -2,11 +2,12 @@ import { strict as assert } from 'assert';
 import { Mockttp } from 'mockttp';
 import { login } from '../../page-objects/flows/login.flow';
 import { withFixtures, getEventPayloads } from '../../helpers';
-import { MOCK_META_METRICS_ID } from '../../constants';
+import { MOCK_META_METRICS_ID, NETWORK_CLIENT_ID } from '../../constants';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
+import TransactionsSettingsPage from '../../page-objects/pages/settings/transactions-settings';
 
 async function mockServerCalls(mockServer: Mockttp) {
   return [
@@ -58,9 +59,17 @@ describe('PPOM Blockaid Alert - Metrics', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+          .withEnabledNetworks({
+            eip155: {
+              '0x1': true,
+            },
+          })
+          .withPermissionControllerConnectedToTestDapp({
+            useLocalhostHostname: true,
+            chainIds: [1],
+          })
           .withMetaMetricsController({
             metaMetricsId: MOCK_META_METRICS_ID,
             participateInMetaMetrics: true,
@@ -72,24 +81,24 @@ describe('PPOM Blockaid Alert - Metrics', function () {
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await login(driver);
 
-        // toggle on
         const headerNavbar = new HeaderNavbar(driver);
         await headerNavbar.openSettingsPage();
 
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToTransactionsSettings();
 
-        const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        const transactionsSettingsPage = new TransactionsSettingsPage(driver);
+        await transactionsSettingsPage.waitForSecurityAlertsSection();
 
-        // toggle off
+        const privacySettings = new PrivacySettings(driver);
+        // Default fixture has security alerts enabled; first click turns them off.
         await privacySettings.toggleBlockaidAlerts();
 
         // wait for state to update
         await driver.delay(1000);
 
-        // toggle back ON
+        // Second click turns security alerts back on.
         await privacySettings.toggleBlockaidAlerts();
 
         await driver.delay(1000);
diff --git a/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts b/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts
index e87e94a21e45..66c1ca011901 100644
--- a/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts
+++ b/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts
@@ -6,7 +6,7 @@ import { TestSuiteArguments } from '../confirmations/transactions/shared';
 import { login } from '../../page-objects/flows/login.flow';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
-import DevelopOptions from '../../page-objects/pages/developer-options-page';
+import DeveloperOptionsPage from '../../page-objects/pages/developer-options-page';
 import {
   MOCK_CUSTOMIZED_REMOTE_FEATURE_FLAGS,
   MOCK_META_METRICS_ID,
@@ -126,11 +126,12 @@ describe('Remote feature flag', function (this: Suite) {
         await headerNavbar.openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToDeveloperOptions();
+        await settingsPage.goToDebugSettings();
 
-        const developOptionsPage = new DevelopOptions(driver);
-        await developOptionsPage.checkPageIsLoaded();
-        await developOptionsPage.validateRemoteFeatureFlagState();
+        // Debug tab embeds the legacy developer-options UI (remote flags, crash, etc.).
+        const developerOptionsPage = new DeveloperOptionsPage(driver);
+        await developerOptionsPage.checkPageIsLoaded();
+        await developerOptionsPage.validateRemoteFeatureFlagState();
       },
     );
   });
diff --git a/test/e2e/tests/request-queuing/ui.spec.ts b/test/e2e/tests/request-queuing/ui.spec.ts
index bdde05f2a537..1025f059666c 100644
--- a/test/e2e/tests/request-queuing/ui.spec.ts
+++ b/test/e2e/tests/request-queuing/ui.spec.ts
@@ -15,7 +15,6 @@ import NetworkManager, {
   NetworkId,
 } from '../../page-objects/pages/network-manager';
 import { login } from '../../page-objects/flows/login.flow';
-import FixtureBuilder from '../../fixtures/fixture-builder';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { withFixtures, veryLargeDelayMs } from '../../helpers';
 import { Driver, PAGES } from '../../webdriver/driver';
@@ -261,16 +260,8 @@ describe('Request-queue UI changes', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 3 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withNetworkControllerTripleNode()
-          .withPreferencesController({
-            preferences: { showTestNetworks: true },
-          })
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
           .build(),
         localNodeOptions: [
           {
@@ -492,9 +483,8 @@ describe('Request-queue UI changes', function () {
         // Open the popup with shimmed activeTabOrigin
         await openPopupWithActiveTabOrigin(driver, DAPP_URL);
 
-        // Switch to mainnet using per-dapp connected network flow
-        await headerNavbar.openConnectionMenu();
-        await headerNavbar.clickConnectedSitePopoverNetworkButton();
+        // Switch to mainnet using control bar per-dapp network selector
+        await headerNavbar.openDappNetworkMenu();
         await headerNavbar.selectNetwork('Ethereum');
 
         // Switch back to the Dapp tab
diff --git a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.ts b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.ts
index 8a40642ead4f..e8290c7020a7 100644
--- a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.ts
+++ b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.ts
@@ -143,7 +143,8 @@ describe('MetaMask Responsive UI', function (this: Suite) {
           recipientAddress: '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           amount: '1',
         });
-        await new HomePage(driver).checkPageIsLoaded();
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
 
         // Network Selector
         await driver.clickElement('[data-testid="sort-by-networks"]');
@@ -154,6 +155,7 @@ describe('MetaMask Responsive UI', function (this: Suite) {
         await driver.clickElement('[data-testid="Localhost 8545"]');
 
         // check confirmed transaction is displayed in activity list
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
         await activityList.checkTxAmountInActivity('-1 ETH');
diff --git a/test/e2e/tests/seedless-onboarding/refresh-auth-tokens.spec.ts b/test/e2e/tests/seedless-onboarding/refresh-auth-tokens.spec.ts
index c2d05b8b8ab7..1fcc502fd1d0 100644
--- a/test/e2e/tests/seedless-onboarding/refresh-auth-tokens.spec.ts
+++ b/test/e2e/tests/seedless-onboarding/refresh-auth-tokens.spec.ts
@@ -95,7 +95,7 @@ describe('Refresh Auth Tokens (Seedless Onboarding)', function () {
         assert.strictEqual(authServiceTokenRequests.length, 2);
 
         // close the settings page
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         // Lock the wallet and wait for login page
         await lockAndWaitForLoginPage(driver);
diff --git a/test/e2e/tests/send/send-erc20-gas.spec.ts b/test/e2e/tests/send/send-erc20-gas.spec.ts
index 946f67a56f33..4058bfb84748 100644
--- a/test/e2e/tests/send/send-erc20-gas.spec.ts
+++ b/test/e2e/tests/send/send-erc20-gas.spec.ts
@@ -11,7 +11,7 @@ import { Mockttp } from 'mockttp';
 import { mockedSourcifyTokenSend } from '../confirmations/helpers';
 import { DAPP_URL, WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import { login } from '../../page-objects/flows/login.flow';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
@@ -35,13 +35,7 @@ describe('Send ERC20 - Gas Customization', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
-          .build(),
+        fixtures: new FixtureBuilderV2().build(),
         localNodeOptions: { hardfork: 'muirGlacier' },
         smartContract,
         title: this.test?.fullTitle(),
@@ -90,6 +84,7 @@ describe('Send ERC20 - Gas Customization', function () {
         await tokenTransferRedesignedConfirmPage.clickConfirmButton();
 
         // check that transaction has completed correctly and is displayed in the activity list
+        await homePage.goToActivityList();
         await activityListPage.checkTxAction({ action: `Sent ${symbol}` });
         await activityListPage.checkTxAmountInActivity(valueWithSymbol('-1'));
       },
@@ -100,13 +95,8 @@ describe('Send ERC20 - Gas Customization', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
           .build(),
         localNodeOptions: { hardfork: 'muirGlacier' },
         smartContract,
@@ -177,13 +167,8 @@ describe('Send ERC20 - Gas Customization', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
-          .withEnabledNetworks({
-            eip155: {
-              '0x539': true,
-            },
-          })
           .build(),
         smartContract,
         title: this.test?.fullTitle(),
diff --git a/test/e2e/tests/send/send-erc20-mainnet.spec.ts b/test/e2e/tests/send/send-erc20-mainnet.spec.ts
index 7709fa648c59..1d15134cc7bf 100644
--- a/test/e2e/tests/send/send-erc20-mainnet.spec.ts
+++ b/test/e2e/tests/send/send-erc20-mainnet.spec.ts
@@ -6,7 +6,7 @@
  */
 
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
 import HomePage from '../../page-objects/pages/home/homepage';
@@ -14,13 +14,15 @@ import SendPage from '../../page-objects/pages/send/send-page';
 import TokenOverviewPage from '../../page-objects/pages/token-overview-page';
 import TokenTransferTransactionConfirmation from '../../page-objects/pages/confirmations/token-transfer-confirmation';
 import { login } from '../../page-objects/flows/login.flow';
+import { NETWORK_CLIENT_ID } from '../../constants';
+import { MAINNET_DISPLAY_NAME } from '../../../../shared/constants/network';
 
 describe('Send ERC20 - Mainnet', function () {
   it('sends DAI with preloaded state', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -44,7 +46,11 @@ describe('Send ERC20 - Mainnet', function () {
         const homePage = new HomePage(driver);
         const assetListPage = new AssetListPage(driver);
         await homePage.checkPageIsLoaded();
-        await assetListPage.importTokenBySearch('DAI');
+        await homePage.waitForNonEvmAccountsLoaded();
+        await assetListPage.importTokenBySearch({
+          tokenName: 'DAI',
+          networkName: MAINNET_DISPLAY_NAME,
+        });
         await assetListPage.clickOnAsset('Dai Stablecoin');
 
         // Send DAI
@@ -68,6 +74,7 @@ describe('Send ERC20 - Mainnet', function () {
 
         await tokenTransferTransactionConfirmation.clickFooterConfirmButton();
         await homePage.checkPageIsLoaded();
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity();
         await activityList.checkTxAmountInActivity('-10 DAI');
diff --git a/test/e2e/tests/send/send-erc20.spec.ts b/test/e2e/tests/send/send-erc20.spec.ts
index 00dfff85c67f..e7ce5465dc45 100644
--- a/test/e2e/tests/send/send-erc20.spec.ts
+++ b/test/e2e/tests/send/send-erc20.spec.ts
@@ -77,6 +77,7 @@ describe('Send ERC20', function () {
           await confirmation.checkPageIsLoaded();
           await confirmation.clickFooterConfirmButton();
 
+          await homePage.goToActivityList();
           await activityListPage.checkTransactionActivityByText('Sent');
           await activityListPage.checkCompletedTxNumberDisplayedInActivity(1);
         },
diff --git a/test/e2e/tests/send/send-eth-max.spec.ts b/test/e2e/tests/send/send-eth-max.spec.ts
index 2032b54611d3..37df833fece4 100644
--- a/test/e2e/tests/send/send-eth-max.spec.ts
+++ b/test/e2e/tests/send/send-eth-max.spec.ts
@@ -9,11 +9,8 @@
 
 import { MockttpServer } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import {
-  createInternalTransactionWithMaxAmount,
-  reviewTransaction,
-} from '../../page-objects/flows/transaction';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import { createInternalTransactionWithMaxAmount } from '../../page-objects/flows/transaction';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { GAS_API_BASE_URL } from '../../../../shared/constants/swaps';
 import { login } from '../../page-objects/flows/login.flow';
 import { validateTransaction } from '../../page-objects/flows/send-transaction.flow';
@@ -21,6 +18,7 @@ import { mockSpotPrices } from '../tokens/utils/mocks';
 import GasFeeModal from '../../page-objects/pages/confirmations/gas-fee-modal';
 import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page';
 import SendPage from '../../page-objects/pages/send/send-page';
+import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation';
 
 const PREFERENCES_STATE_MOCK = {
   preferences: {
@@ -36,7 +34,7 @@ describe('Send ETH - Max Amount', function () {
   it.skip('sends with correct amount', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPreferencesController(PREFERENCES_STATE_MOCK)
           .build(),
         localNodeOptions: { hardfork: 'london' },
@@ -56,12 +54,10 @@ describe('Send ETH - Max Amount', function () {
         await login(driver);
 
         await createInternalTransactionWithMaxAmount({ driver });
-        await reviewTransaction(driver);
+        const transactionConfirmation = new TransactionConfirmation(driver);
+        await transactionConfirmation.checkGasFeeFiat('$0.75');
 
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await transactionConfirmation.clickFooterConfirmButtonAndWaitToDisappear();
         await validateTransaction(driver, '-24.99945808');
       },
     );
@@ -71,7 +67,7 @@ describe('Send ETH - Max Amount', function () {
     it('handles custom gas fee changes', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder()
+          fixtures: new FixtureBuilderV2()
             .withPreferencesController(PREFERENCES_STATE_MOCK)
             .build(),
           localNodeOptions: { hardfork: 'london' },
@@ -90,7 +86,8 @@ describe('Send ETH - Max Amount', function () {
           await login(driver);
 
           await createInternalTransactionWithMaxAmount({ driver });
-          await reviewTransaction(driver);
+          const transactionConfirmation = new TransactionConfirmation(driver);
+          await transactionConfirmation.checkGasFeeFiat('$0.75');
 
           const sendTokenConfirmPage = new SendTokenConfirmPage(driver);
           const gasFeeModal = new GasFeeModal(driver);
@@ -104,20 +101,13 @@ describe('Send ETH - Max Amount', function () {
           });
 
           // has correct updated value on the confirm screen the transaction
-          await sendTokenConfirmPage.checkFirstGasFee('0.0006');
           await sendTokenConfirmPage.checkNativeCurrency('$1.00');
 
           // verify max amount after gas fee changes
-          await driver.waitForSelector({
-            text: '$42,494.90',
-            tag: 'p',
-          });
+          await transactionConfirmation.checkSendAmountConversion('$42,494.90');
 
           // confirms the transaction
-          await driver.clickElementAndWaitToDisappear({
-            text: 'Confirm',
-            tag: 'button',
-          });
+          await transactionConfirmation.clickFooterConfirmButtonAndWaitToDisappear();
 
           await validateTransaction(driver, '-24.997');
         },
@@ -127,7 +117,7 @@ describe('Send ETH - Max Amount', function () {
     it('handles market value changes - low', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder()
+          fixtures: new FixtureBuilderV2()
             .withPreferencesController(PREFERENCES_STATE_MOCK)
             .build(),
           localNodeOptions: { hardfork: 'london' },
@@ -146,7 +136,8 @@ describe('Send ETH - Max Amount', function () {
           await login(driver);
 
           await createInternalTransactionWithMaxAmount({ driver });
-          await reviewTransaction(driver);
+          const transactionConfirmation = new TransactionConfirmation(driver);
+          await transactionConfirmation.checkGasFeeFiat('$0.75');
 
           const sendTokenConfirmPage = new SendTokenConfirmPage(driver);
           const gasFeeModal = new GasFeeModal(driver);
@@ -157,7 +148,6 @@ describe('Send ETH - Max Amount', function () {
           await gasFeeModal.selectLowGasFee();
 
           // has correct updated value on the confirm screen the transaction
-          await sendTokenConfirmPage.checkFirstGasFee('0.0004');
           await sendTokenConfirmPage.checkNativeCurrency('$0.73');
 
           // verify max amount after gas fee changes
@@ -167,10 +157,7 @@ describe('Send ETH - Max Amount', function () {
           });
 
           // confirms the transaction
-          await driver.clickElementAndWaitToDisappear({
-            text: 'Confirm',
-            tag: 'button',
-          });
+          await transactionConfirmation.clickFooterConfirmButtonAndWaitToDisappear();
 
           await validateTransaction(driver, '-24.99957065');
         },
@@ -181,7 +168,7 @@ describe('Send ETH - Max Amount', function () {
   it('adjusts max amount when gas estimations change', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPreferencesController(PREFERENCES_STATE_MOCK)
           .build(),
         localNodeOptions: { hardfork: 'london' },
@@ -238,21 +225,15 @@ describe('Send ETH - Max Amount', function () {
           });
 
         // verify gas fee changed
-        await driver.waitForSelector({
-          text: '0.0009',
-        });
+        const transactionConfirmation = new TransactionConfirmation(driver);
+        await transactionConfirmation.checkGasFeeFiat('$1.46');
 
         // verify initial max amount
-        await driver.waitForSelector({
-          text: '$42,498.19',
-          tag: 'p',
-        });
+        await transactionConfirmation.checkSendAmount('25 ETH');
+        await transactionConfirmation.checkSendAmountConversion('$42,498.19');
 
         // confirms the transaction
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Confirm',
-          tag: 'button',
-        });
+        await transactionConfirmation.clickFooterConfirmButtonAndWaitToDisappear();
         await validateTransaction(driver, '-24.99893303');
       },
     );
@@ -263,7 +244,7 @@ describe('Send ETH - Max Amount', function () {
   it.skip('updates transaction value when navigating back to edit', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPreferencesController(PREFERENCES_STATE_MOCK)
           .build(),
         localNodeOptions: { hardfork: 'london' },
@@ -282,11 +263,10 @@ describe('Send ETH - Max Amount', function () {
         await login(driver);
 
         await createInternalTransactionWithMaxAmount({ driver });
-        await reviewTransaction(driver);
+        const transactionConfirmation = new TransactionConfirmation(driver);
+        await transactionConfirmation.checkGasFeeFiat('$0.75');
         // navigate back to edit
-        await driver.clickElement(
-          '[data-testid="wallet-initiated-header-back-button"]',
-        );
+        await transactionConfirmation.clickBackButton();
 
         const sendPage = new SendPage(driver);
         await sendPage.fillAmount('10'); // update the value
diff --git a/test/e2e/tests/send/send-eth.spec.ts b/test/e2e/tests/send/send-eth.spec.ts
index 810d3295e900..bcda7c43738d 100644
--- a/test/e2e/tests/send/send-eth.spec.ts
+++ b/test/e2e/tests/send/send-eth.spec.ts
@@ -15,7 +15,6 @@ import { TransactionEnvelopeType } from '@metamask/transaction-controller';
 import { Mockttp } from 'mockttp';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
-import FixtureBuilder from '../../fixtures/fixture-builder';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import HomePage from '../../page-objects/pages/home/homepage';
 import SendPage from '../../page-objects/pages/send/send-page';
@@ -24,7 +23,12 @@ import TokenTransferTransactionConfirmation from '../../page-objects/pages/confi
 import TestDapp from '../../page-objects/pages/test-dapp';
 import { Driver } from '../../webdriver/driver';
 import { Anvil } from '../../seeder/anvil';
-import { DAPP_PATH, DAPP_URL, WINDOW_TITLES } from '../../constants';
+import {
+  DAPP_PATH,
+  DAPP_URL,
+  NETWORK_CLIENT_ID,
+  WINDOW_TITLES,
+} from '../../constants';
 import { veryLargeDelayMs, withFixtures } from '../../helpers';
 import { login } from '../../page-objects/flows/login.flow';
 import { mockLookupSnap } from '../../mock-response-data/snaps/snap-binary-mocks';
@@ -62,6 +66,7 @@ describe('Send ETH', function () {
 
           await sendTokenConfirmPage.clickOnConfirm();
 
+          await homePage.goToActivityList();
           await activityListPage.checkTransactionActivityByText('Sent');
           await activityListPage.checkCompletedTxNumberDisplayedInActivity(1);
           await activityListPage.checkTxAmountInActivity('-1 ETH');
@@ -140,6 +145,7 @@ describe('Send ETH', function () {
 
           const sendTokenConfirmationPage = new SendTokenConfirmPage(driver);
           const activityListPage = new ActivityListPage(driver);
+          const homePage = new HomePage(driver);
 
           await createInternalTransaction({
             driver,
@@ -150,6 +156,7 @@ describe('Send ETH', function () {
           });
 
           await sendTokenConfirmationPage.clickOnConfirm();
+          await homePage.goToActivityList();
           await activityListPage.checkTransactionActivityByText('Sent');
           await activityListPage.checkCompletedTxNumberDisplayedInActivity(1);
           await activityListPage.checkTxAmountInActivity('-1 ETH');
@@ -165,9 +172,10 @@ describe('Send ETH', function () {
           dappOptions: {
             customDappPaths: [DAPP_PATH.TEST_SNAPS],
           },
-          fixtures: new FixtureBuilder({
-            inputChainId: CHAIN_IDS.MAINNET,
-          }).build(),
+          fixtures: new FixtureBuilderV2()
+            .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
+            .withSnapsPrivacyWarningAlreadyShown()
+            .build(),
           title: this.test?.fullTitle(),
           testSpecificMock: (mockServer: Mockttp) => {
             mockLookupSnap(mockServer);
diff --git a/test/e2e/tests/send/send-nft.spec.ts b/test/e2e/tests/send/send-nft.spec.ts
index 2b68ef7c4061..eb674d7776e4 100644
--- a/test/e2e/tests/send/send-nft.spec.ts
+++ b/test/e2e/tests/send/send-nft.spec.ts
@@ -163,6 +163,7 @@ describe('Send NFT', function () {
             await tokenTransferConfirmation.clickScrollToBottomButton();
             await tokenTransferConfirmation.clickFooterConfirmButton();
 
+            await homePage.goToActivityList();
             await activityListPage.checkConfirmedTxNumberDisplayedInActivity(2);
           },
           erc721Mocks,
@@ -298,6 +299,7 @@ describe('Send NFT', function () {
             await tokenTransferConfirmation.clickScrollToBottomButton();
             await tokenTransferConfirmation.clickFooterConfirmButton();
 
+            await homePage.goToActivityList();
             await activityListPage.checkConfirmedTxNumberDisplayedInActivity(2);
           },
           erc1155Mocks,
diff --git a/test/e2e/tests/settings/about-metamask-ui-validation.spec.ts b/test/e2e/tests/settings/about-metamask-ui-validation.spec.ts
index e735d58fc877..21a248821120 100644
--- a/test/e2e/tests/settings/about-metamask-ui-validation.spec.ts
+++ b/test/e2e/tests/settings/about-metamask-ui-validation.spec.ts
@@ -34,7 +34,7 @@ describe('Setting - About MetaMask :', function (this: Suite) {
         await aboutPage.checkMetaMaskVersionNumber(version);
 
         // click on `close` button
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
 
         // wait for home page and validate the balance
         const homePage = new HomePage(driver);
diff --git a/test/e2e/tests/settings/account-token-list.spec.ts b/test/e2e/tests/settings/account-token-list.spec.ts
index c00c076a58fc..b968a66952d3 100644
--- a/test/e2e/tests/settings/account-token-list.spec.ts
+++ b/test/e2e/tests/settings/account-token-list.spec.ts
@@ -148,7 +148,7 @@ describe('Settings', function () {
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
         await settingsPage.toggleBalanceSetting();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
         await homePage.checkExpectedBalanceIsDisplayed('25', 'SepoliaETH');
       },
     );
diff --git a/test/e2e/tests/settings/address-book.spec.ts b/test/e2e/tests/settings/address-book.spec.ts
index eaea8419a599..fe9f4141d40a 100644
--- a/test/e2e/tests/settings/address-book.spec.ts
+++ b/test/e2e/tests/settings/address-book.spec.ts
@@ -3,6 +3,7 @@ import { Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
 import { shortenAddress } from '../../../../ui/helpers/utils/util';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import HomePage from '../../page-objects/pages/home/homepage';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import ContactsPage from '../../page-objects/pages/settings/contacts-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
@@ -58,6 +59,8 @@ describe('Address Book', function (this: Suite) {
 
         await new TransactionConfirmation(driver).clickFooterConfirmButton();
 
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
         await activityList.checkTxAction({ action: 'Sent' });
@@ -114,6 +117,8 @@ describe('Address Book', function (this: Suite) {
         await networkSelector.selectTab('Custom');
         await networkSelector.selectNetworkByName('Localhost 8545');
 
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
         const activityList = new ActivityListPage(driver);
         await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
         await activityList.checkTxAction({ action: 'Sent' });
diff --git a/test/e2e/tests/settings/auto-lock.spec.ts b/test/e2e/tests/settings/auto-lock.spec.ts
index 102bce7dce8a..aa112c8e574c 100644
--- a/test/e2e/tests/settings/auto-lock.spec.ts
+++ b/test/e2e/tests/settings/auto-lock.spec.ts
@@ -1,6 +1,5 @@
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import HomePage from '../../page-objects/pages/home/homepage';
 import LoginPage from '../../page-objects/pages/login-page';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
@@ -20,21 +19,15 @@ describe('Auto-Lock Timer', function () {
         await homePage.headerNavbar.openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettingsPage = new AdvancedSettings(driver);
-        await advancedSettingsPage.checkPageIsLoaded();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
-        // Set Auto Lock Timer
-        const sixSecsInMins = '0.1';
-        await advancedSettingsPage.fillAutoLockoutTime(
-          '10081',
-          'Lock time must be a number between 0 and 10080',
-        );
-        await advancedSettingsPage.fillAutoLockoutTime(sixSecsInMins);
-        await advancedSettingsPage.confirmAutoLockout();
+        // Set auto lock timer to the shortest V2 option: 15 seconds.
+        await settingsPage.goToAutoLockSettings();
+        await settingsPage.waitForAutoLockOptionsList();
+        await settingsPage.selectQuarterMinuteAutoLockOption();
 
-        // Necessary wait for the auto lockout to trigger
-        await driver.delay(6000);
+        // Necessary wait for the 15-second auto lockout to trigger.
+        await driver.delay(16000);
 
         // Verify the wallet is locked
         const loginPage = new LoginPage(driver);
diff --git a/test/e2e/tests/settings/backup-restore.spec.ts b/test/e2e/tests/settings/backup-restore.spec.ts
index db8ec703b8a8..ecd58312fc75 100644
--- a/test/e2e/tests/settings/backup-restore.spec.ts
+++ b/test/e2e/tests/settings/backup-restore.spec.ts
@@ -2,9 +2,9 @@ import { strict as assert } from 'assert';
 import { promises as fs } from 'fs';
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
+import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
 import { login } from '../../page-objects/flows/login.flow';
 
 const downloadsFolder = `${process.cwd()}/test-artifacts/downloads`;
@@ -61,16 +61,15 @@ describe('Backup and Restore', function () {
       async ({ driver }) => {
         await login(driver);
 
-        // Download user settings
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettings = new AdvancedSettings(driver);
-        await advancedSettings.checkPageIsLoaded();
-        await advancedSettings.downloadData();
+        await settingsPage.goToPrivacySettings();
+
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.checkPageIsLoaded();
+        await privacySettings.exportYourData();
 
-        // Verify download
         let info: BackupData | null = null;
         await driver.wait(async () => {
           info = await getBackupJson();
@@ -81,7 +80,6 @@ describe('Backup and Restore', function () {
           throw new Error('Backup data is null after waiting');
         }
         const backupData = info as BackupData;
-        // Verify Json
         assert.equal(
           backupData.network?.networkConfigurationsByChainId?.['0x539']
             ?.chainId,
diff --git a/test/e2e/tests/settings/change-password.spec.ts b/test/e2e/tests/settings/change-password.spec.ts
index b0572eb23556..961fdc74d865 100644
--- a/test/e2e/tests/settings/change-password.spec.ts
+++ b/test/e2e/tests/settings/change-password.spec.ts
@@ -22,15 +22,15 @@ async function doPasswordChangeAndLockWallet(
   newPassword: string,
   isSocialLogin: boolean = false,
 ) {
-  // navigate to security & privacy settings
+  // navigate to security and password settings
   const headerNavbar = new HeaderNavbar(driver);
   await headerNavbar.openSettingsPage();
   const settingsPage = new SettingsPage(driver);
   await settingsPage.checkPageIsLoaded();
-  await settingsPage.goToPrivacySettings();
+  await settingsPage.goToSecurityAndPasswordSettings();
 
   const privacySettings = new PrivacySettings(driver);
-  await privacySettings.checkPageIsLoaded();
+  await privacySettings.checkSecurityAndPasswordPageIsLoaded();
   await privacySettings.openChangePassword();
 
   const changePasswordPage = new ChangePasswordPage(driver);
@@ -46,7 +46,7 @@ async function doPasswordChangeAndLockWallet(
 
   await privacySettings.checkPasswordChangeSuccessToastIsDisplayed();
 
-  await settingsPage.closeSettingsPage();
+  await settingsPage.clickBackButton();
 
   // Wait for the password change to be applied
   await driver.delay(2_000);
diff --git a/test/e2e/tests/settings/clear-activity.spec.ts b/test/e2e/tests/settings/clear-activity.spec.ts
index 2793b130b303..9798ca0d8fd3 100644
--- a/test/e2e/tests/settings/clear-activity.spec.ts
+++ b/test/e2e/tests/settings/clear-activity.spec.ts
@@ -2,7 +2,6 @@ import { Suite } from 'mocha';
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import ActivityList from '../../page-objects/pages/home/activity-list';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import HomePage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { login } from '../../page-objects/flows/login.flow';
@@ -10,10 +9,10 @@ import { login } from '../../page-objects/flows/login.flow';
 describe('Clear account activity', function (this: Suite) {
   // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   // When user get stuck with pending transactions, one can reset the account by clicking the 'Clear activity tab data' //
-  // button in settings, advanced tab. This functionality will clear all the transactions history.                      //
+  // button in settings, developer tools tab. This functionality will clear all the transactions history.               //
   // Note that it only only affects the current network.                                                                //
   // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  it('User can clear account activity via the advanced setting tab, ', async function () {
+  it('User can clear account activity via the developer tools tab, ', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2()
@@ -37,11 +36,10 @@ describe('Clear account activity', function (this: Suite) {
         await homePage.headerNavbar.openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettings = new AdvancedSettings(driver);
-        await advancedSettings.checkPageIsLoaded();
-        await advancedSettings.clearActivityTabData();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.goToDeveloperOptions();
+        await settingsPage.clickDeveloperOptionsDeleteActivityAndNonceData();
+        await settingsPage.confirmDeleteActivityAndNonceModal();
+        await settingsPage.clickBackButton();
 
         await activityList.checkNoTxInActivity();
       },
diff --git a/test/e2e/tests/settings/hide-token-without-balance.spec.ts b/test/e2e/tests/settings/hide-token-without-balance.spec.ts
index b11511487570..6d79bdbce8cb 100644
--- a/test/e2e/tests/settings/hide-token-without-balance.spec.ts
+++ b/test/e2e/tests/settings/hide-token-without-balance.spec.ts
@@ -3,7 +3,7 @@ import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
-import GeneralSettings from '../../page-objects/pages/settings/general-settings';
+import AssetsSettingsPage from '../../page-objects/pages/settings/assets-settings-page';
 import HomePage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { login } from '../../page-objects/flows/login.flow';
@@ -44,10 +44,11 @@ describe('Hide tokens without balance', function (this: Suite) {
 
         // Navigate to settings and toggle on "hide tokens without balance" feature
         await new HomePage(driver).headerNavbar.openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
-        await generalSettings.toggleHideTokensWithoutBalance();
-        await new SettingsPage(driver).closeSettingsPage();
+        const assetsSettings = new AssetsSettingsPage(driver);
+        await assetsSettings.checkAssetsPageIsLoaded();
+        await assetsSettings.toggleHideTokensWithoutBalance();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.clickBackButton();
 
         // Check that tokens with zero balances are hidden, tokens with non-zero balances remain visible
         await new HomePage(driver).checkPageIsLoaded();
diff --git a/test/e2e/tests/settings/ipfs-ens-resolution.spec.ts b/test/e2e/tests/settings/ipfs-ens-resolution.spec.ts
index b50b54d75be0..0bd96e83c75b 100644
--- a/test/e2e/tests/settings/ipfs-ens-resolution.spec.ts
+++ b/test/e2e/tests/settings/ipfs-ens-resolution.spec.ts
@@ -1,5 +1,5 @@
 import { MockedEndpoint, MockttpServer } from 'mockttp';
-import { tinyDelayMs, withFixtures } from '../../helpers';
+import { getCleanAppState, tinyDelayMs, withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import LoginPage from '../../page-objects/pages/login-page';
@@ -44,14 +44,16 @@ describe('Settings', function () {
       async ({ driver }) => {
         await driver.navigate();
 
-        // Wait until the PreferencesController state has the expected ipfsGateway value
+        // Wait for the live controller state (via Redux) to confirm the
+        // ipfsGateway and useAddressBarEnsResolution settings are active.
+        // Unlike getPersistedState (which reads IndexedDB fixture data
+        // immediately), getCleanAppState reflects the running controller
+        // state that has been synced to the UI after background init.
         await driver.wait(async () => {
-          const persistedState = await driver.executeScript(
-            'return window.stateHooks.getPersistedState()',
-          );
+          const uiState = await getCleanAppState(driver);
           return (
-            persistedState?.data?.PreferencesController?.ipfsGateway ===
-            'dweb.link'
+            uiState?.metamask?.ipfsGateway === 'dweb.link' &&
+            uiState?.metamask?.useAddressBarEnsResolution === true
           );
         }, 10000);
 
@@ -107,6 +109,7 @@ describe('Settings', function () {
         // turns off IPFS setting and ENS domain resolution
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
+        await privacySettings.goToThirdPartyApisSettings();
         await privacySettings.toggleIpfsGateway();
         await privacySettings.toggleEnsDomainResolution();
 
diff --git a/test/e2e/tests/settings/ipfs-toggle.spec.ts b/test/e2e/tests/settings/ipfs-toggle.spec.ts
index c2541ff2a86b..605222057c4f 100644
--- a/test/e2e/tests/settings/ipfs-toggle.spec.ts
+++ b/test/e2e/tests/settings/ipfs-toggle.spec.ts
@@ -40,8 +40,9 @@ describe('Settings', function () {
         await settingsPage.goToPrivacySettings();
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.checkPageIsLoaded();
+        await privacySettings.goToThirdPartyApisSettings();
         await privacySettings.toggleIpfsGateway();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
         const homePage = new Homepage(driver);
         await homePage.checkPageIsLoaded();
 
diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/preferences-and-display-language.spec.ts
similarity index 58%
rename from test/e2e/tests/settings/change-language.spec.ts
rename to test/e2e/tests/settings/preferences-and-display-language.spec.ts
index 7d12d9f0a1f5..dbec7d090681 100644
--- a/test/e2e/tests/settings/change-language.spec.ts
+++ b/test/e2e/tests/settings/preferences-and-display-language.spec.ts
@@ -3,8 +3,7 @@ import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
-import GeneralSettings from '../../page-objects/pages/settings/general-settings';
+import PreferencesAndDisplaySettings from '../../page-objects/pages/settings/preferences-and-display-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import Homepage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
@@ -13,32 +12,37 @@ import ar from '../../../../app/_locales/ar/messages.json';
 import da from '../../../../app/_locales/da/messages.json';
 import de from '../../../../app/_locales/de/messages.json';
 import en from '../../../../app/_locales/en/messages.json';
-import hu from '../../../../app/_locales/hu/messages.json';
 import es from '../../../../app/_locales/es/messages.json';
 import hi from '../../../../app/_locales/hi/messages.json';
 import SendPage from '../../page-objects/pages/send/send-page';
 
 const selectors = {
-  currentLanguageDansk: { tag: 'p', text: da.currentLanguage.message },
-  currentLanguageDeutsch: { tag: 'p', text: de.currentLanguage.message },
-  currentLanguageEnglish: { tag: 'p', text: en.currentLanguage.message },
-  currentLanguageMagyar: { tag: 'p', text: hu.currentLanguage.message },
-  currentLanguageSpanish: { tag: 'p', text: es.currentLanguage.message },
-  currentLanguageवर्तमान: { tag: 'p', text: hi.currentLanguage.message },
+  // Preferences V2 row uses `t('language')` (see create-select-item), not `currentLanguage`.
+  // Locales without `language` fall back to English for that key.
+  currentLanguageDansk: { tag: 'p', text: en.language.message },
+  currentLanguageDeutsch: { tag: 'p', text: de.language.message },
+  currentLanguageEnglish: { tag: 'p', text: en.language.message },
+  currentLanguageSpanish: { tag: 'p', text: es.language.message },
+  currentLanguageवर्तमान: { tag: 'p', text: hi.language.message },
   advanceTextDansk: { text: da.advanced.message, tag: 'div' },
   waterTextDansk: `[placeholder="${da.search.message}"]`,
-  headerTextDansk: { text: da.settings.message, tag: 'h3' },
+  headerTextDansk: { text: da.settings.message, tag: 'p' },
   buttonTextDansk: {
     testId: 'auto-lockout-button',
     text: da.save.message,
   },
-  dialogTextDeutsch: { text: de.invalidAddress.message, tag: 'p' },
+  // Send recipient errors render in HelpText (.mm-help-text). Use css+text so the
+  // driver matches nested text; plain tag+p uses contains(text()) on direct nodes only.
+  dialogTextDeutsch: {
+    css: '.mm-help-text',
+    text: de.invalidAddress.message,
+  },
   discoverTextवर्तमान: { text: hi.discover.message, tag: 'a' },
-  headerTextAr: { text: ar.settings.message, tag: 'h3' },
+  headerTextAr: { text: ar.settings.message, tag: 'p' },
 };
 
-describe('Settings - general tab', function (this: Suite) {
-  it('validate the change language functionality', async function () {
+describe('Settings V2 - Preferences and display', function (this: Suite) {
+  it('validates language changes from preferences and display', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -47,27 +51,26 @@ describe('Settings - general tab', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
         await new HeaderNavbar(driver).openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
 
-        // Change language to Spanish and validate that the word has changed correctly
-        await generalSettings.changeLanguage('Español');
+        await preferencesAndDisplaySettings.changeLanguage('Español');
         const isLanguageLabelChanged = await driver.isElementPresent(
           selectors.currentLanguageSpanish,
         );
         assert.equal(isLanguageLabelChanged, true, 'Language did not change');
 
-        // Refresh the page and validate that the language is still Spanish
         await driver.refresh();
-        await generalSettings.checkPageIsLoaded();
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
         assert.equal(
           await driver.isElementPresent(selectors.currentLanguageSpanish),
           true,
           'Language did not change after refresh',
         );
 
-        // Change language back to English and validate that the word has changed correctly
-        await generalSettings.changeLanguage('English');
+        await preferencesAndDisplaySettings.changeLanguage('English');
         const isLabelTextChanged = await driver.isElementPresent(
           selectors.currentLanguageEnglish,
         );
@@ -76,7 +79,7 @@ describe('Settings - general tab', function (this: Suite) {
     );
   });
 
-  it('validate "Dansk" language on page navigation', async function () {
+  it('validates "Dansk" localization across settings v2 navigation', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -85,31 +88,21 @@ describe('Settings - general tab', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
         await new HeaderNavbar(driver).openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
 
-        // Select "Dansk" language
-        await generalSettings.changeLanguage('Dansk');
+        await preferencesAndDisplaySettings.changeLanguage('Dansk');
         const isLanguageLabelChanged = await driver.isElementPresent(
           selectors.currentLanguageDansk,
         );
         assert.equal(isLanguageLabelChanged, true, 'Language did not change');
 
-        await driver.clickElement(selectors.advanceTextDansk);
-        const advancedSettings = new AdvancedSettings(driver);
-        await advancedSettings.checkPageIsLoaded();
-
-        // Confirm that the language change is reflected in search box water text
-        const isWaterTextChanged = await driver.isElementPresent(
-          selectors.waterTextDansk,
-        );
-        assert.equal(
-          isWaterTextChanged,
-          true,
-          'Water text in the search box does not match with the selected language',
-        );
+        await driver.refresh();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.checkPageIsLoaded();
 
-        // Confirm that the language change is reflected in headers
         const isHeaderTextChanged = await driver.isElementPresent(
           selectors.headerTextDansk,
         );
@@ -119,20 +112,21 @@ describe('Settings - general tab', function (this: Suite) {
           'Language change is not reflected in headers',
         );
 
-        // Confirm that the language change is reflected in button
-        const isButtonTextChanged = await driver.isElementPresent(
-          selectors.buttonTextDansk,
+        await settingsPage.openSearch();
+
+        const isWaterTextChanged = await driver.isElementPresent(
+          selectors.waterTextDansk,
         );
         assert.equal(
-          isButtonTextChanged,
+          isWaterTextChanged,
           true,
-          'Language change is not reflected in button',
+          'Water text in the search box does not match with the selected language',
         );
       },
     );
   });
 
-  it('validate "Deutsch" language on error messages', async function () {
+  it('validates "Deutsch" localization in error messages', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -141,17 +135,19 @@ describe('Settings - general tab', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
         await new HeaderNavbar(driver).openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
 
-        // Select "Deutsch" language
-        await generalSettings.changeLanguage('Deutsch');
+        await preferencesAndDisplaySettings.changeLanguage('Deutsch');
         const isLanguageLabelChanged = await driver.isElementPresent(
           selectors.currentLanguageDeutsch,
         );
         assert.equal(isLanguageLabelChanged, true, 'Language did not change');
 
-        await new SettingsPage(driver).closeSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.clickBackButton();
 
         const homepage = new Homepage(driver);
         await homepage.checkPageIsLoaded();
@@ -160,23 +156,15 @@ describe('Settings - general tab', function (this: Suite) {
 
         const sendPage = new SendPage(driver);
         await sendPage.selectToken('0x539', 'ETH');
-        // use wrong address for recipient to allow error message to show
         await sendPage.fillRecipient('0xAAA');
 
-        // Validate the language change is reflected in the dialog message
-        const isDialogMessageChanged = await driver.isElementPresent(
-          selectors.dialogTextDeutsch,
-        );
-        assert.equal(
-          isDialogMessageChanged,
-          true,
-          'Language change is not reflected in dialog message',
-        );
+        // Recipient validation is debounced (~500ms); waitForSelector waits for the German error.
+        await driver.waitForSelector(selectors.dialogTextDeutsch);
       },
     );
   });
 
-  it('validate "मानक हिन्दी" language on tooltips', async function () {
+  it('validates "मानक हिन्दी" localization in tooltips', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -185,21 +173,26 @@ describe('Settings - general tab', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
         await new HeaderNavbar(driver).openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
 
-        // Select "मानक हिन्दी" language
-        await generalSettings.changeLanguage('मानक हिन्दी');
+        await preferencesAndDisplaySettings.changeLanguage('मानक हिन्दी');
 
         const isLabelTextChanged = await driver.isElementPresent(
           selectors.currentLanguageवर्तमान,
         );
         assert.equal(isLabelTextChanged, true, 'Language did not change');
 
-        await new SettingsPage(driver).closeSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.clickBackButton();
         const homepage = new Homepage(driver);
         await homepage.checkPageIsLoaded();
         await homepage.checkExpectedBalanceIsDisplayed();
+        await driver.refresh();
+        await homepage.checkPageIsLoaded();
+        await homepage.checkExpectedBalanceIsDisplayed();
         const isDiscoverButtonTextChanged = await driver.isElementPresent(
           selectors.discoverTextवर्तमान,
         );
@@ -212,7 +205,7 @@ describe('Settings - general tab', function (this: Suite) {
     );
   });
 
-  it('validate "العربية" language change on page indent', async function () {
+  it('validates "العربية" localization in settings layout', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -221,11 +214,17 @@ describe('Settings - general tab', function (this: Suite) {
       async ({ driver }: { driver: Driver }) => {
         await login(driver);
         await new HeaderNavbar(driver).openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
+
+        await preferencesAndDisplaySettings.changeLanguage('العربية');
 
-        // Select "العربية" language and validate that the header text has changed
-        await generalSettings.changeLanguage('العربية');
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.clickBackButton();
+        await new HeaderNavbar(driver).openSettingsPage();
+        await settingsPage.checkPageIsLoaded();
 
         const isHeaderTextChanged = await driver.isElementPresent(
           selectors.headerTextAr,
diff --git a/test/e2e/tests/settings/settings-general.spec.ts b/test/e2e/tests/settings/settings-general.spec.ts
index 0ee91e31e162..88becfff2c3a 100644
--- a/test/e2e/tests/settings/settings-general.spec.ts
+++ b/test/e2e/tests/settings/settings-general.spec.ts
@@ -1,6 +1,6 @@
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import GeneralSettings from '../../page-objects/pages/settings/general-settings';
+import PreferencesAndDisplaySettings from '../../page-objects/pages/settings/preferences-and-display-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import { login } from '../../page-objects/flows/login.flow';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
@@ -15,7 +15,9 @@ describe('Settings', function () {
       async ({ driver }: { driver: Driver }) => {
         // Initialize page objects
         const settingsPage = new SettingsPage(driver);
-        const generalSettings = new GeneralSettings(driver);
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
         const headerNavbar = new HeaderNavbar(driver);
 
         // Unlock wallet and navigate to settings
@@ -24,8 +26,8 @@ describe('Settings', function () {
         await settingsPage.checkPageIsLoaded();
 
         // Verify identicon options
-        await generalSettings.checkIdenticonOptionsAreDisplayed();
-        await generalSettings.checkIdenticonIsActive('maskicon');
+        await preferencesAndDisplaySettings.checkIdenticonOptionsAreDisplayed();
+        await preferencesAndDisplaySettings.checkIdenticonIsActive('maskicon');
       },
     );
   });
diff --git a/test/e2e/tests/settings/settings-search.spec.ts b/test/e2e/tests/settings/settings-search.spec.ts
index c9002815272f..55ce1ebb3763 100644
--- a/test/e2e/tests/settings/settings-search.spec.ts
+++ b/test/e2e/tests/settings/settings-search.spec.ts
@@ -1,24 +1,23 @@
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import AboutPage from '../../page-objects/pages/settings/about-page';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
-import GeneralSettings from '../../page-objects/pages/settings/general-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import PreferencesAndDisplaySettings from '../../page-objects/pages/settings/preferences-and-display-settings';
 import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { login } from '../../page-objects/flows/login.flow';
 
 describe('Settings Search', function () {
   const settingsSearch = {
-    general: 'Show native token as main balance',
-    advanced: 'State logs',
-    security: 'Reveal Secret',
-    experimental: 'Snaps',
+    assets: 'Show native token as main balance',
+    privacy: 'State logs',
+    securityAndPassword: 'Manage wallet recovery',
+    experimental: 'Add account Snap',
     about: 'Terms of Use',
   };
 
-  it('should find element inside the General tab', async function () {
+  it('should find element inside the Assets page', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -30,16 +29,17 @@ describe('Settings Search', function () {
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.fillSearchSettingsInput(settingsSearch.general);
+        await settingsPage.fillSearchSettingsInput(settingsSearch.assets);
 
-        // navigate to general settings
-        await settingsPage.goToSearchResultPage('General');
-        await new GeneralSettings(driver).checkPageIsLoaded();
+        await settingsPage.goToSearchResultPage('Assets');
+        await new PreferencesAndDisplaySettings(
+          driver,
+        ).checkAssetsPageIsLoaded();
       },
     );
   });
 
-  it('should find element inside the Advanced tab', async function () {
+  it('should find element inside the Privacy page', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -51,16 +51,15 @@ describe('Settings Search', function () {
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.fillSearchSettingsInput(settingsSearch.advanced);
+        await settingsPage.fillSearchSettingsInput(settingsSearch.privacy);
 
-        // Check if element redirects to the correct page
-        await settingsPage.goToSearchResultPage('Advanced');
-        await new AdvancedSettings(driver).checkPageIsLoaded();
+        await settingsPage.goToSearchResultPage('Privacy');
+        await new PrivacySettings(driver).checkPageIsLoaded();
       },
     );
   });
 
-  it('should find element inside the "Security & privacy" tab', async function () {
+  it('should find element inside the Security and password page', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -72,16 +71,19 @@ describe('Settings Search', function () {
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.fillSearchSettingsInput(settingsSearch.security);
-
-        // Check if element redirects to the correct page
-        await settingsPage.goToSearchResultPage('Security');
-        await new PrivacySettings(driver).checkPageIsLoaded();
+        await settingsPage.fillSearchSettingsInput(
+          settingsSearch.securityAndPassword,
+        );
+
+        await settingsPage.goToSearchResultPage('Security and password');
+        await new PrivacySettings(
+          driver,
+        ).checkSecurityAndPasswordPageIsLoaded();
       },
     );
   });
 
-  it('should find element inside the Experimental tab', async function () {
+  it('should find element inside the Experimental page', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -102,7 +104,7 @@ describe('Settings Search', function () {
     );
   });
 
-  it('should find element inside the About tab', async function () {
+  it('should find element inside the About MetaMask page', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilderV2().build(),
@@ -117,7 +119,7 @@ describe('Settings Search', function () {
         await settingsPage.fillSearchSettingsInput(settingsSearch.about);
 
         // Check if element redirects to the correct page
-        await settingsPage.goToSearchResultPage('About');
+        await settingsPage.goToSearchResultPage('About MetaMask');
         await new AboutPage(driver).checkPageIsLoaded();
       },
     );
diff --git a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
index a8a663565b56..da23163773df 100644
--- a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
+++ b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
@@ -19,14 +19,14 @@ describe('Reveal SRP through settings', function () {
       async ({ driver }) => {
         await login(driver);
 
-        // navigate to security & privacy settings
+        // navigate to security and password settings
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
         const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        await privacySettings.checkSecurityAndPasswordPageIsLoaded();
         await privacySettings.openRevealSrpQuiz();
         await privacySettings.completeRevealSrpQuiz();
         await privacySettings.fillPasswordToRevealSrp(
@@ -46,14 +46,14 @@ describe('Reveal SRP through settings', function () {
       async ({ driver }) => {
         await login(driver);
 
-        // navigate to security & privacy settings
+        // navigate to security and password settings
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
         const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        await privacySettings.checkSecurityAndPasswordPageIsLoaded();
 
         // fill password to reveal SRP and check the displayed SRP
         await privacySettings.openRevealSrpQuiz();
@@ -78,14 +78,14 @@ describe('Reveal SRP through settings', function () {
       async ({ driver }) => {
         await login(driver);
 
-        // Navigate to security & privacy settings
+        // Navigate to security and password settings
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.goToPrivacySettings();
+        await settingsPage.goToSecurityAndPasswordSettings();
 
         const privacySettings = new PrivacySettings(driver);
-        await privacySettings.checkPageIsLoaded();
+        await privacySettings.checkSecurityAndPasswordPageIsLoaded();
 
         // fill password to reveal SRP and check the displayed SRP QR code
         await privacySettings.openRevealSrpQuiz();
diff --git a/test/e2e/tests/settings/show-default-address.spec.ts b/test/e2e/tests/settings/show-default-address.spec.ts
index 3637e4eaf8e0..447229f7bb7a 100644
--- a/test/e2e/tests/settings/show-default-address.spec.ts
+++ b/test/e2e/tests/settings/show-default-address.spec.ts
@@ -1,7 +1,7 @@
 import { Suite } from 'mocha';
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import GeneralSettings from '../../page-objects/pages/settings/general-settings';
+import PreferencesAndDisplaySettings from '../../page-objects/pages/settings/preferences-and-display-settings';
 import HomePage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { login } from '../../page-objects/flows/login.flow';
@@ -24,9 +24,11 @@ describe('Show default address', function (this: Suite) {
         // Navigate to settings and check "show default address" section is displayed
         const homePage = new HomePage(driver);
         await homePage.headerNavbar.openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
-        await generalSettings.checkShowDefaultAddressSectionIsDisplayed();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
+        await preferencesAndDisplaySettings.checkShowDefaultAddressSectionIsDisplayed();
       },
     );
   });
@@ -62,10 +64,13 @@ describe('Show default address', function (this: Suite) {
         // Navigate to settings and toggle off "show default address" feature
         const homePage = new HomePage(driver);
         await homePage.headerNavbar.openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
-        await generalSettings.toggleShowDefaultAddress();
-        await new SettingsPage(driver).closeSettingsPage();
+        const preferencesAndDisplaySettings = new PreferencesAndDisplaySettings(
+          driver,
+        );
+        await preferencesAndDisplaySettings.checkPageIsLoaded();
+        await preferencesAndDisplaySettings.toggleShowDefaultAddress();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.clickBackButton();
 
         // Check on home page that default address is not present
         await homePage.checkPageIsLoaded();
@@ -73,26 +78,4 @@ describe('Show default address', function (this: Suite) {
       },
     );
   });
-
-  it('does not display Show default address section when feature flag is off', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilderV2().build(),
-        title: this.test?.fullTitle(),
-        manifestFlags: {
-          remoteFeatureFlags: { extensionUxDefaultAddressVersioned: false },
-        },
-      },
-      async ({ driver }) => {
-        await login(driver);
-
-        // Navigate to settings and check "show default address" section is not displayed
-        const homePage = new HomePage(driver);
-        await homePage.headerNavbar.openSettingsPage();
-        const generalSettings = new GeneralSettings(driver);
-        await generalSettings.checkPageIsLoaded();
-        await generalSettings.checkShowDefaultAddressSectionIsNotDisplayed();
-      },
-    );
-  });
 });
diff --git a/test/e2e/tests/settings/show-native-as-main-balance.spec.ts b/test/e2e/tests/settings/show-native-as-main-balance.spec.ts
index 686d1229442a..25110f42dfcf 100644
--- a/test/e2e/tests/settings/show-native-as-main-balance.spec.ts
+++ b/test/e2e/tests/settings/show-native-as-main-balance.spec.ts
@@ -1,11 +1,10 @@
 import { Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
-import FixtureBuilder from '../../fixtures/fixture-builder';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
 import HomePage from '../../page-objects/pages/home/homepage';
+import PreferencesAndDisplaySettings from '../../page-objects/pages/settings/preferences-and-display-settings';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { login } from '../../page-objects/flows/login.flow';
 
@@ -73,10 +72,9 @@ describe('Settings: Show native token as main balance', function () {
   it('Should show balance in fiat when toggle is on', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withConversionRateEnabled()
+        fixtures: new FixtureBuilderV2()
           .withEnabledNetworks({ eip155: { '0x1': true } })
-          .withPreferencesControllerShowNativeTokenAsMainBalanceDisabled()
+          .withShowNativeTokenAsMainBalanceDisabled()
           .build(),
         title: this.test?.fullTitle(),
         testSpecificMock: async (mockServer: Mockttp) => {
@@ -90,13 +88,13 @@ describe('Settings: Show native token as main balance', function () {
         await homePage.checkExpectedBalanceIsDisplayed('$42,500.00', 'USD');
 
         await homePage.headerNavbar.openSettingsPage();
+        const assetsSettings = new PreferencesAndDisplaySettings(driver);
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettingsPage = new AdvancedSettings(driver);
-        await advancedSettingsPage.checkPageIsLoaded();
-        await advancedSettingsPage.toggleShowConversionOnTestnets();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.goToAssetsSettings();
+        await assetsSettings.checkAssetsPageIsLoaded();
+        await assetsSettings.toggleShowNativeTokenAsMainBalance();
+        await settingsPage.clickBackButton();
 
         // assert amount displayed
         const assetListPage = new AssetListPage(driver);
@@ -108,10 +106,9 @@ describe('Settings: Show native token as main balance', function () {
   it('Should not show popover twice', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withEnabledNetworks({ eip155: { '0x1': true } })
-          .withConversionRateEnabled()
-          .withPreferencesControllerShowNativeTokenAsMainBalanceDisabled()
+          .withShowNativeTokenAsMainBalanceDisabled()
           .build(),
         title: this.test?.fullTitle(),
         testSpecificMock: async (mockServer: Mockttp) => {
@@ -125,18 +122,18 @@ describe('Settings: Show native token as main balance', function () {
         await homePage.checkExpectedBalanceIsDisplayed('$42,500.00', 'USD');
 
         await homePage.headerNavbar.openSettingsPage();
+        const assetsSettings = new PreferencesAndDisplaySettings(driver);
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettingsPage = new AdvancedSettings(driver);
-        await advancedSettingsPage.checkPageIsLoaded();
-        await advancedSettingsPage.toggleShowConversionOnTestnets();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.goToAssetsSettings();
+        await assetsSettings.checkAssetsPageIsLoaded();
+        await assetsSettings.toggleShowNativeTokenAsMainBalance();
+        await settingsPage.clickBackButton();
 
         // go to setting and back to home page and make sure popover is not shown again
         await homePage.headerNavbar.openSettingsPage();
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.closeSettingsPage();
+        await settingsPage.clickBackButton();
         await homePage.checkPageIsLoaded();
       },
     );
diff --git a/test/e2e/tests/settings/state-logs-helpers.ts b/test/e2e/tests/settings/state-logs-helpers.ts
index b03a4496c992..da3ad0c66929 100644
--- a/test/e2e/tests/settings/state-logs-helpers.ts
+++ b/test/e2e/tests/settings/state-logs-helpers.ts
@@ -50,12 +50,13 @@ const createDifferenceMessage = (
 };
 
 // Minimal type definition for the specific fields we validate in the State Logs Account spec
-type MinimalStateLogsJson = {
+export type MinimalStateLogsJson = {
   metamask: {
     internalAccounts: {
       selectedAccount: string;
       accounts: {
         [key: string]: {
+          type: string;
           address: string;
         };
       };
diff --git a/test/e2e/tests/settings/state-logs.json b/test/e2e/tests/settings/state-logs.json
index 80328906d537..46638a1a1d91 100644
--- a/test/e2e/tests/settings/state-logs.json
+++ b/test/e2e/tests/settings/state-logs.json
@@ -164,14 +164,17 @@
         "hidden": {
           "value": "boolean",
           "lastUpdatedAt": "number"
-        }
+        },
+        "lastSelected": "number"
       }
     },
     "accountIdByAddress": {
       "*": "string"
     },
     "accountsAssets": {
-      "3c62fe60-6f00-4227-86f4-33d0b1f4c39e": ["string"]
+      "<solana-account-1>": ["string"],
+      "<bitcoin-account-1>": ["string"],
+      "<tron-account-1>": ["string"]
     },
     "accountState": "null",
     "accountsByChainId": {
@@ -258,18 +261,19 @@
                 "hidden": "boolean",
                 "entropy": {
                   "groupIndex": "number"
-                }
+                },
+                "lastSelected": "number"
               },
               "accounts": [
                 "d5e45e4a-3b04-4a09-a5e1-39762e5c6be4",
-                "dcf615fa-115e-4b45-af18-2df686fffde2",
-                "3c62fe60-6f00-4227-86f4-33d0b1f4c39e"
+                "<solana-account-1>",
+                "<bitcoin-account-1>",
+                "<tron-account-1>"
               ]
             }
           }
         }
-      },
-      "selectedAccountGroup": "string"
+      }
     },
     "accountWalletsMetadata": {},
     "activeProvider": "string",
@@ -320,14 +324,285 @@
             "decimals": "number"
           }
         ]
+      },
+      "tron:728126428/slip44:195": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:195-staked-for-bandwidth": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:195-staked-for-energy": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:195-ready-for-withdrawal": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:195-in-lock-period": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:195-staking-rewards": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:energy": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:maximum-energy": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:bandwidth": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "tron:728126428/slip44:maximum-bandwidth": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
+      },
+      "bip122:000000000019d6689c085ae165831e93/slip44:0": {
+        "name": "string",
+        "symbol": "string",
+        "fungible": "boolean",
+        "iconUrl": "string",
+        "units": [
+          {
+            "name": "string",
+            "symbol": "string",
+            "decimals": "number"
+          }
+        ]
       }
     },
     "balances": {
-      "3c62fe60-6f00-4227-86f4-33d0b1f4c39e": {
+      "<solana-account-1>": {
         "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501": {
           "unit": "string",
           "amount": "string"
         }
+      },
+      "<tron-account-1>": {
+        "tron:728126428/slip44:195": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:195-staked-for-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195-staked-for-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195-staked-for-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:195-staked-for-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195-staked-for-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195-staked-for-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:195-ready-for-withdrawal": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195-ready-for-withdrawal": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195-ready-for-withdrawal": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:195-staking-rewards": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195-staking-rewards": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195-staking-rewards": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:195-in-lock-period": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:195-in-lock-period": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:195-in-lock-period": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:maximum-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:maximum-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:maximum-energy": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:728126428/slip44:maximum-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:3448148188/slip44:maximum-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        },
+        "tron:2494104990/slip44:maximum-bandwidth": {
+          "unit": "string",
+          "amount": "string"
+        }
+      },
+      "<bitcoin-account-1>": {
+        "bip122:000000000019d6689c085ae165831e93/slip44:0": {
+          "unit": "string",
+          "amount": "string"
+        }
       }
     },
     "browserEnvironment": {
@@ -601,7 +876,7 @@
             }
           }
         },
-        "3c62fe60-6f00-4227-86f4-33d0b1f4c39e": {
+        "<solana-account-1>": {
           "type": "string",
           "scopes": ["string"],
           "id": "string",
@@ -631,6 +906,70 @@
             },
             "lastSelected": "number"
           }
+        },
+        "<bitcoin-account-1>": {
+          "type": "string",
+          "scopes": ["string"],
+          "id": "string",
+          "address": "string",
+          "options": {
+            "exportable": "boolean",
+            "entropySource": "string",
+            "entropy": {
+              "type": "string",
+              "id": "string",
+              "derivationPath": "string",
+              "groupIndex": "number"
+            }
+          },
+          "methods": ["string"],
+          "metadata": {
+            "name": "string",
+            "importTime": "number",
+            "keyring": {
+              "type": "string"
+            },
+            "snap": {
+              "id": "string",
+              "name": "string",
+              "enabled": "boolean"
+            },
+            "lastSelected": "number"
+          }
+        },
+        "<tron-account-1>": {
+          "type": "string",
+          "scopes": ["string"],
+          "id": "string",
+          "address": "string",
+          "options": {
+            "exportable": "boolean",
+            "addressType": "string",
+            "scope": "string",
+            "index": "number",
+            "groupIndex": "number",
+            "entropySource": "string",
+            "entropy": {
+              "type": "string",
+              "id": "string",
+              "derivationPath": "string",
+              "groupIndex": "number"
+            }
+          },
+          "methods": ["string"],
+          "metadata": {
+            "name": "string",
+            "importTime": "number",
+            "keyring": {
+              "type": "string"
+            },
+            "snap": {
+              "id": "string",
+              "name": "string",
+              "enabled": "boolean"
+            },
+            "lastSelected": "number"
+          }
         }
       },
       "selectedAccount": "string"
@@ -810,7 +1149,9 @@
     "nftsDetectionNoticeDismissed": "boolean",
     "nftsDropdownState": {},
     "nonEvmTransactions": {
-      "3c62fe60-6f00-4227-86f4-33d0b1f4c39e": {}
+      "<solana-account-1>": {},
+      "<bitcoin-account-1>": {},
+      "<tron-account-1>": {}
     },
     "nonRPCGasFeeApisDisabled": "boolean",
     "notificationGasPollTokens": [],
@@ -940,6 +1281,7 @@
     "securityAlertsEnabled": "boolean",
     "seedPhraseBackedUp": "null",
     "segmentApiCalls": {},
+    "selectedAccountGroup": "string",
     "selectedMultichainNetworkChainId": "string",
     "selectedPaymentToken": "null",
     "selectedNetworkClientId": "string",
@@ -1138,6 +1480,7 @@
         "timestamp": "number"
       }
     },
+    "tokenWarnings": [],
     "tradeConfigurations": {
       "testnet": {},
       "mainnet": {}
@@ -1166,7 +1509,6 @@
     "urlScanCache": {},
     "use4ByteResolution": "boolean",
     "useAddressBarEnsResolution": "boolean",
-    "useBlockie": "boolean",
     "useCurrencyRateCheck": "boolean",
     "useExternalNameSources": "boolean",
     "useExternalServices": "boolean",
diff --git a/test/e2e/tests/settings/state-logs.spec.ts b/test/e2e/tests/settings/state-logs.spec.ts
index bb318b05429d..e5fbaee032e0 100644
--- a/test/e2e/tests/settings/state-logs.spec.ts
+++ b/test/e2e/tests/settings/state-logs.spec.ts
@@ -7,7 +7,7 @@ import { Driver } from '../../webdriver/driver';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
+import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
 import { login } from '../../page-objects/flows/login.flow';
 import { mockPriceApi } from '../tokens/utils/mocks';
 
@@ -17,6 +17,7 @@ import {
   createTypeMap,
   createTypeMapFromDefinition,
   getDownloadedStateLogs,
+  MinimalStateLogsJson,
   StateLogsTypeDefinition,
   StateLogsTypeMap,
 } from './state-logs-helpers';
@@ -66,6 +67,44 @@ async function mockStateLogsMocks(server: Mockttp) {
   await mockPriceApi(server);
 }
 
+async function replacePlaceholderInReferenceLogs(
+  stateLogs: MinimalStateLogsJson,
+): Promise<StateLogsTypeDefinition> {
+  // We'll use this mapping to replace placeholders in the reference logs with actual account IDs
+  // from the downloaded logs (e.g "<bitcoin-account-1>" -> "75ad4470-156b-4f7f-b0a5-ffe6cd114ac9").
+  const accountsMapping: Record<'solana' | 'bitcoin' | 'tron', string[]> = {
+    tron: [],
+    solana: [],
+    bitcoin: [],
+  };
+
+  for (const [id, account] of Object.entries(
+    stateLogs.metamask.internalAccounts.accounts,
+  )) {
+    if (account.type.startsWith('bip122')) {
+      accountsMapping.bitcoin.push(id);
+    } else if (account.type.startsWith('solana')) {
+      accountsMapping.solana.push(id);
+    } else if (account.type.startsWith('tron')) {
+      accountsMapping.tron.push(id);
+    }
+  }
+
+  let referenceLogsText = JSON.stringify(referenceStateLogsDefinition);
+  for (const [network, ids] of Object.entries(accountsMapping)) {
+    for (const [index, id] of ids.entries()) {
+      const placeholder = `<${network}-account-${index + 1}>`;
+      referenceLogsText = referenceLogsText.replaceAll(
+        // Use regex to replace all occurrences of the placeholder, not only the first one.
+        new RegExp(placeholder, 'gu'),
+        id,
+      );
+    }
+  }
+
+  return JSON.parse(referenceLogsText);
+}
+
 describe('State logs', function () {
   it('should download state logs for the account', async function () {
     if (process.env.SELENIUM_BROWSER === 'chrome') {
@@ -98,10 +137,10 @@ describe('State logs', function () {
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettingsPage = new AdvancedSettings(driver);
-        await advancedSettingsPage.checkPageIsLoaded();
-        await advancedSettingsPage.downloadStateLogs();
+        await settingsPage.goToPrivacySettings();
+        const privacySettingsPage = new PrivacySettings(driver);
+        await privacySettingsPage.checkPageIsLoaded();
+        await privacySettingsPage.downloadStateLogs();
 
         // Verify download and get state logs
         const stateLogs = await getDownloadedStateLogs(driver, downloadsFolder);
@@ -155,27 +194,18 @@ describe('State logs', function () {
         await new HeaderNavbar(driver).openSettingsPage();
         const settingsPage = new SettingsPage(driver);
         await settingsPage.checkPageIsLoaded();
-        await settingsPage.clickAdvancedTab();
-        const advancedSettingsPage = new AdvancedSettings(driver);
-        await advancedSettingsPage.checkPageIsLoaded();
-        await advancedSettingsPage.downloadStateLogs();
+        await settingsPage.goToPrivacySettings();
+        const privacySettingsPage = new PrivacySettings(driver);
+        await privacySettingsPage.checkPageIsLoaded();
+        await privacySettingsPage.downloadStateLogs();
 
         // Verify download and get state logs
         const stateLogs = await getDownloadedStateLogs(driver, downloadsFolder);
 
-        // Get new account ID for Solana
-        const newAccountId = Object.keys(
-          stateLogs.metamask.internalAccounts.accounts,
-        )[1];
-
-        let referenceLogsText = JSON.stringify(referenceStateLogsDefinition);
-
-        // Replace ID in reference logs
-        referenceLogsText = referenceLogsText.replaceAll(
-          '3c62fe60-6f00-4227-86f4-33d0b1f4c39e',
-          newAccountId,
-        );
-        const referenceLogs = JSON.parse(referenceLogsText);
+        // We need to replace placeholders in the reference logs with actual account IDs from the downloaded
+        // logs before comparing them.
+        const referenceLogs =
+          await replacePlaceholderInReferenceLogs(stateLogs);
 
         // Create type maps for comparison
         const currentTypeMap = createTypeMap(stateLogs);
diff --git a/test/e2e/tests/shield/shield-entry-modal.spec.ts b/test/e2e/tests/shield/shield-entry-modal.spec.ts
index 1e2ea6ceb522..90420322ee1f 100644
--- a/test/e2e/tests/shield/shield-entry-modal.spec.ts
+++ b/test/e2e/tests/shield/shield-entry-modal.spec.ts
@@ -1,17 +1,18 @@
 import { Mockttp } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { withFixtures } from '../../helpers';
 import { login } from '../../page-objects/flows/login.flow';
 import ShieldPlanPage from '../../page-objects/pages/settings/shield/shield-plan-page';
 import HomePage from '../../page-objects/pages/home/homepage';
 import { ShieldMockttpService } from '../../helpers/shield/mocks';
+import { NETWORK_CLIENT_ID } from '../../constants';
 
 describe('Shield Entry Modal', function () {
   it('should show the shield entry modal if user does not have a shield subscription and has a balance greater than the minimum fiat balance threshold', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -32,9 +33,6 @@ describe('Shield Entry Modal', function () {
               },
             },
           })
-          .withAppStateController({
-            showShieldEntryModalOnce: null, // set the initial state to null so that the modal is shown
-          })
           .build(),
         title: this.test?.fullTitle(),
         testSpecificMock: (server: Mockttp) => {
@@ -59,17 +57,11 @@ describe('Shield Entry Modal', function () {
   it('should not show the shield entry modal if external services are disabled', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPreferencesController({
             useExternalServices: false,
           })
-          .withAppStateController({
-            showShieldEntryModalOnce: null,
-          })
           .build(),
-        manifestFlags: {
-          useExternalServices: false,
-        },
         title: this.test?.fullTitle(),
         testSpecificMock: (server: Mockttp) => {
           const shieldMockttpService = new ShieldMockttpService();
@@ -91,8 +83,8 @@ describe('Shield Entry Modal', function () {
   it('should not show the shield entry modal if eligibility request returns false', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -113,9 +105,6 @@ describe('Shield Entry Modal', function () {
               },
             },
           })
-          .withAppStateController({
-            showShieldEntryModalOnce: null, // set the initial state to null so that the modal is shown
-          })
           .build(),
         title: this.test?.fullTitle(),
         testSpecificMock: (server: Mockttp) => {
diff --git a/test/e2e/tests/shield/shield-plan-subscription.spec.ts b/test/e2e/tests/shield/shield-plan-subscription.spec.ts
index fabbfb2bef22..0c1eaf09df58 100644
--- a/test/e2e/tests/shield/shield-plan-subscription.spec.ts
+++ b/test/e2e/tests/shield/shield-plan-subscription.spec.ts
@@ -1,6 +1,7 @@
 import { Mockttp } from 'mockttp';
+import { toHex } from '@metamask/controller-utils';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import ShieldPlanPage from '../../page-objects/pages/settings/shield/shield-plan-page';
 import HomePage from '../../page-objects/pages/home/homepage';
@@ -8,11 +9,12 @@ import ShieldSubscriptionApprovePage from '../../page-objects/pages/settings/shi
 import ShieldDetailPage from '../../page-objects/pages/settings/shield/shield-detail-page';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { ShieldMockttpService } from '../../helpers/shield/mocks';
+import { NETWORK_CLIENT_ID } from '../../constants';
 
 // Local fixture for card payment tests
 function createShieldFixtureCard() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
@@ -32,25 +34,13 @@ function createShieldFixtureCard() {
           ],
         },
       },
-    })
-    .withAccountTracker({
-      accountsByChainId: {
-        '0x1': {
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
-            balance: '0x15af1d78b58c40000', // 25 ETH
-          },
-        },
-      },
-    })
-    .withAppStateController({
-      showShieldEntryModalOnce: null, // set the initial state to null so that the modal is shown
     });
 }
 
 // Local fixture for crypto payment tests
 function createShieldFixtureCrypto() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
@@ -83,23 +73,11 @@ function createShieldFixtureCrypto() {
       tokenBalances: {
         '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
           '0x1': {
-            '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': '100000000', // 100 USDC (6 decimals)
-            '0xdac17f958d2ee523a2206206994597c13d831ec7': '100000000', // 100 USDT (6 decimals)
+            '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': toHex(100000000), // 100 USDC (6 decimals)
+            '0xdac17f958d2ee523a2206206994597c13d831ec7': toHex(100000000), // 100 USDT (6 decimals)
           },
         },
       },
-    })
-    .withAccountTracker({
-      accountsByChainId: {
-        '0x1': {
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
-            balance: '0x15af1d78b58c40000', // 25 ETH
-          },
-        },
-      },
-    })
-    .withAppStateController({
-      showShieldEntryModalOnce: null, // set the initial state to null so that the modal is shown
     });
 }
 
diff --git a/test/e2e/tests/shield/shield-ruleset-engine.spec.ts b/test/e2e/tests/shield/shield-ruleset-engine.spec.ts
index 17ae0cf6f85d..7201980cd361 100644
--- a/test/e2e/tests/shield/shield-ruleset-engine.spec.ts
+++ b/test/e2e/tests/shield/shield-ruleset-engine.spec.ts
@@ -1,17 +1,17 @@
 import { Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import HomePage from '../../page-objects/pages/home/homepage';
 import TransactionConfirmation from '../../page-objects/pages/confirmations/transaction-confirmation';
 import TestDapp from '../../page-objects/pages/test-dapp';
-import { WINDOW_TITLES } from '../../constants';
+import { NETWORK_CLIENT_ID, WINDOW_TITLES } from '../../constants';
 import PersonalSignConfirmation from '../../page-objects/pages/confirmations/personal-sign-confirmation';
 import { ShieldMockttpService } from '../../helpers/shield/mocks';
 
 function createShieldFixture() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
@@ -32,9 +32,8 @@ function createShieldFixture() {
         },
       },
     })
-    .withPermissionControllerConnectedToTestDapp()
-    .withAppStateController({
-      showShieldEntryModalOnce: null,
+    .withPermissionControllerConnectedToTestDapp({
+      chainIds: [1],
     });
 }
 
diff --git a/test/e2e/tests/shield/shield-subscription-management.spec.ts b/test/e2e/tests/shield/shield-subscription-management.spec.ts
index 344037f25d66..a60037efc61f 100644
--- a/test/e2e/tests/shield/shield-subscription-management.spec.ts
+++ b/test/e2e/tests/shield/shield-subscription-management.spec.ts
@@ -1,6 +1,6 @@
 import { Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import HomePage from '../../page-objects/pages/home/homepage';
@@ -18,25 +18,17 @@ import {
   MOCK_CLAIMS_3_PENDING,
 } from '../../helpers/shield/constants';
 import { ShieldMockttpService } from '../../helpers/shield/mocks';
+import { NETWORK_CLIENT_ID } from '../../constants';
 
 // Local fixture for this spec file
 function createShieldFixture() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
       },
     })
-    .withAccountTracker({
-      accountsByChainId: {
-        '0x1': {
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
-            balance: '0x15af1d78b58c40000', // 25 ETH
-          },
-        },
-      },
-    })
     .withTokensController({
       allTokens: {
         '0x1': {
@@ -51,16 +43,13 @@ function createShieldFixture() {
           ],
         },
       },
-    })
-    .withAppStateController({
-      showShieldEntryModalOnce: null, // set the initial state to null so that the modal is shown
     });
 }
 
 // Local fixture for cancelled subscription test - prevents entry modal from showing
 function createShieldFixtureCancelled() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
@@ -82,31 +71,19 @@ function createShieldFixtureCancelled() {
       },
     })
     .withAppStateController({
-      showShieldEntryModalOnce: {
-        show: false,
-        hasUserInteractedWithModal: true,
-      }, // Prevent entry modal from showing since subscription exists (even if cancelled)
+      showShieldEntryModalOnce: true, // Prevent entry modal from showing since subscription exists (even if cancelled)
     });
 }
 
 // Local fixture for crypto payment tests with USDC and USDT
 function createShieldFixtureCrypto() {
-  return new FixtureBuilder()
-    .withNetworkControllerOnMainnet()
+  return new FixtureBuilderV2()
+    .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
     .withEnabledNetworks({
       eip155: {
         '0x1': true,
       },
     })
-    .withAccountTracker({
-      accountsByChainId: {
-        '0x1': {
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
-            balance: '0x15af1d78b58c40000', // 25 ETH
-          },
-        },
-      },
-    })
     .withTokensController({
       allTokens: {
         '0x1': {
@@ -129,9 +106,6 @@ function createShieldFixtureCrypto() {
           ],
         },
       },
-    })
-    .withAppStateController({
-      showShieldEntryModalOnce: null,
     });
 }
 
diff --git a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
index f1fc75912509..e7b687ff0331 100644
--- a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
+++ b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
@@ -1,7 +1,6 @@
-/* eslint-disable mocha/no-skipped-tests */
 import { MockttpServer } from 'mockttp';
-import FixtureBuilder from '../../fixtures/fixture-builder';
-import { WINDOW_TITLES } from '../../constants';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
+import { NETWORK_CLIENT_ID, WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
 import { login } from '../../page-objects/flows/login.flow';
@@ -41,9 +40,9 @@ async function withFixturesForSmartTransactions(
   await withFixtures(
     {
       dappOptions: { numberOfTestDapps: 1 },
-      fixtures: new FixtureBuilder()
-        .withPermissionControllerConnectedToTestDapp()
-        .withNetworkControllerOnMainnet()
+      fixtures: new FixtureBuilderV2()
+        .withPermissionControllerConnectedToTestDapp({ chainIds: [1] })
+        .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
         .withEnabledNetworks({
           eip155: {
             '0x1': true,
@@ -94,6 +93,9 @@ describe('Smart Transactions', function () {
       async ({ driver }) => {
         // fill ens address as recipient when user lands on send token screen
         const transactionConfirmation = new TransactionConfirmation(driver);
+        const homePage = new HomePage(driver);
+        const activityList = new ActivityListPage(driver);
+
         await createInternalTransaction({
           driver,
           chainId: '0x1',
@@ -104,7 +106,7 @@ describe('Smart Transactions', function () {
         await transactionConfirmation.selectTokenFee('USDC');
         await transactionConfirmation.clickFooterConfirmButtonAndWaitToDisappear();
 
-        const activityList = new ActivityListPage(driver);
+        await homePage.goToActivityList();
         await activityList.checkCompletedTxNumberDisplayedInActivity(1);
         await activityList.checkNoFailedTransactions();
         await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
@@ -142,9 +144,6 @@ describe('Smart Transactions', function () {
         await swapPage.checkQuoteIsGasIncluded();
         await swapPage.submitSwap();
 
-        await swapPage.waitForSmartTransactionToComplete();
-        await swapPage.clickViewActivity();
-
         await homePage.checkPageIsLoaded();
         await homePage.goToActivityList();
 
@@ -176,9 +175,6 @@ describe('Smart Transactions', function () {
         await swapPage.checkQuoteIsGasIncluded();
         await swapPage.submitSwap();
 
-        await swapPage.waitForSmartTransactionToComplete();
-        await swapPage.clickViewActivity();
-
         await homePage.checkPageIsLoaded();
         await homePage.goToActivityList();
 
diff --git a/test/e2e/tests/solana/send-flow.spec.ts b/test/e2e/tests/solana/send-flow.spec.ts
index 2a9039183d37..eeeebd2e50a8 100644
--- a/test/e2e/tests/solana/send-flow.spec.ts
+++ b/test/e2e/tests/solana/send-flow.spec.ts
@@ -25,6 +25,7 @@ describe('Send flow', function (this: Suite) {
       async ({ driver }) => {
         await login(driver);
         const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const sendPage = new SendPage(driver);
 
         await switchToNetworkFromNetworkSelect(driver, 'Popular', 'Solana');
@@ -61,6 +62,7 @@ describe('Send flow', function (this: Suite) {
       async ({ driver }) => {
         await login(driver);
         const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const sendPage = new SendPage(driver);
 
         await switchToNetworkFromNetworkSelect(driver, 'Popular', 'Solana');
@@ -110,6 +112,7 @@ describe('Send flow', function (this: Suite) {
       async ({ driver }) => {
         await login(driver);
         const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const sendPage = new SendPage(driver);
 
         await switchToNetworkFromNetworkSelect(driver, 'Popular', 'Solana');
diff --git a/test/e2e/tests/solana/send-spl-token.spec.ts b/test/e2e/tests/solana/send-spl-token.spec.ts
index 1c47632e28d5..c370b42256f6 100644
--- a/test/e2e/tests/solana/send-spl-token.spec.ts
+++ b/test/e2e/tests/solana/send-spl-token.spec.ts
@@ -87,13 +87,14 @@ describe('Send flow - SPL Token', function (this: Suite) {
       },
       async ({ driver }) => {
         await login(driver);
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
 
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
         await homePage.clickOnSendButton();
 
@@ -142,12 +143,13 @@ describe('Send flow - SPL Token', function (this: Suite) {
       async ({ driver }) => {
         await login(driver);
 
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
         await homePage.clickOnSendButton();
 
diff --git a/test/e2e/tests/solana/swap.spec.ts b/test/e2e/tests/solana/swap.spec.ts
index b98e0d761a96..946a7ce9dc5a 100644
--- a/test/e2e/tests/solana/swap.spec.ts
+++ b/test/e2e/tests/solana/swap.spec.ts
@@ -1,6 +1,6 @@
 import { Mockttp, MockedEndpoint } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { login } from '../../page-objects/flows/login.flow';
 import NetworkManager from '../../page-objects/pages/network-manager';
 import NonEvmHomepage from '../../page-objects/pages/home/non-evm-homepage';
@@ -142,7 +142,7 @@ describe('Swap on Solana', function () {
   it('Completes a Swap between SOL and USDC', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withConversionRates({
             'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
               conversionTime: 1770832998.066,
@@ -168,13 +168,15 @@ describe('Swap on Solana', function () {
       async ({ driver }) => {
         await login(driver);
 
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
+
         // Switch to Solana network
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
 
         // Create swap
@@ -212,6 +214,7 @@ describe('Swap on Solana', function () {
           swapFromAmount: '1',
         });
 
+        await homePage.goToActivityList();
         const activityListPage = new ActivityListPage(driver);
         await activityListPage.checkTxAmountInActivity('-0.001 SOL', 1);
         await activityListPage.checkWaitForTransactionStatus('confirmed');
@@ -224,20 +227,22 @@ describe('Swap on Solana', function () {
   it('Completes a Swap between USDC and SOL', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().build(),
+        fixtures: new FixtureBuilderV2().build(),
         title: this.test?.fullTitle(),
         testSpecificMock: mockSwapUSDCtoSOL,
       },
       async ({ driver }) => {
         await login(driver);
 
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
+
         // Switch to Solana network
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
 
         // Create swap USDC → SOL
@@ -258,6 +263,7 @@ describe('Swap on Solana', function () {
           swapFromAmount: '1',
         });
 
+        await homePage.goToActivityList();
         const activityListPage = new ActivityListPage(driver);
         await activityListPage.checkTxAmountInActivity('-1 USDC', 1);
         await activityListPage.checkWaitForTransactionStatus('confirmed');
@@ -271,20 +277,22 @@ describe('Swap on Solana', function () {
   it('Swap has no quotes available', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().build(),
+        fixtures: new FixtureBuilderV2().build(),
         title: this.test?.fullTitle(),
         testSpecificMock: mockSwapNoQuotes,
       },
       async ({ driver }) => {
         await login(driver);
 
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
+
         // Switch to Solana network
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
 
         // Create swap and verify no quotes message
@@ -305,20 +313,22 @@ describe('Swap on Solana', function () {
   it('Swap transaction fails gracefully', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().build(),
+        fixtures: new FixtureBuilderV2().build(),
         title: this.test?.fullTitle(),
         testSpecificMock: mockSwapSOLtoUSDCFailed,
       },
       async ({ driver }) => {
         await login(driver);
 
+        const homePage = new NonEvmHomepage(driver);
+        await homePage.waitForNonEvmAccountsLoaded();
+
         // Switch to Solana network
         const networkManager = new NetworkManager(driver);
         await networkManager.openNetworkManager();
         await networkManager.selectTab('Popular');
         await networkManager.selectNetworkByNameWithWait('Solana');
 
-        const homePage = new NonEvmHomepage(driver);
         await homePage.checkPageIsLoaded({ amount: '50' });
 
         // Create swap SOL → USDC
@@ -340,6 +350,7 @@ describe('Swap on Solana', function () {
         });
 
         // After failure, the bridge navigates to home/activity with the failed tx
+        await homePage.goToActivityList();
         const activityListPage = new ActivityListPage(driver);
         await activityListPage.checkFailedTxNumberDisplayedInActivity(1);
       },
diff --git a/test/e2e/tests/tokens/add-token-using-search.spec.ts b/test/e2e/tests/tokens/add-token-using-search.spec.ts
index 5f777b15fe68..5db782ec6c83 100644
--- a/test/e2e/tests/tokens/add-token-using-search.spec.ts
+++ b/test/e2e/tests/tokens/add-token-using-search.spec.ts
@@ -2,10 +2,28 @@ import { MockedEndpoint, Mockttp } from 'mockttp';
 import { withFixtures } from '../../helpers';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { NETWORK_CLIENT_ID } from '../../constants';
-import { CHAIN_IDS } from '../../../../shared/constants/network';
+import {
+  BSC_DISPLAY_NAME,
+  CHAIN_IDS,
+} from '../../../../shared/constants/network';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { login } from '../../page-objects/flows/login.flow';
 
+const BSC_BAT_ADDRESS = '0x0d8775f648430679a709e98d2b0cb6250d2887ef';
+
+const BSC_BAT_TOKEN_LIST_ENTRY = {
+  [BSC_BAT_ADDRESS]: {
+    name: 'Basic Attention Token',
+    symbol: 'BAT',
+    decimals: 18,
+    address: BSC_BAT_ADDRESS,
+    occurrences: 1,
+    aggregators: [],
+    iconUrl: '',
+  },
+};
+
 describe('Add existing token using search', function () {
   // Mock call to core to fetch BAT token price
   async function mockPriceFetch(
@@ -88,22 +106,16 @@ describe('Add existing token using search', function () {
           .withPreferencesController({ useTokenDetection: true })
           .withTokenListController({
             tokensChainsCache: {
-              '0x38': {
+              [CHAIN_IDS.BSC]: {
                 timestamp: Date.now(),
-                data: {
-                  '0x0d8775f648430679a709e98d2b0cb6250d2887ef': {
-                    name: 'Basic Attention Token',
-                    symbol: 'BAT',
-                    decimals: 18,
-                    address: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
-                    occurrences: 1,
-                    aggregators: [],
-                    iconUrl: '',
-                  },
-                },
+                data: BSC_BAT_TOKEN_LIST_ENTRY,
               },
             },
           })
+          // Seed both for reliable search
+          .withTokenListControllerStorageServiceData([
+            { chainId: CHAIN_IDS.BSC, data: BSC_BAT_TOKEN_LIST_ENTRY },
+          ])
           .build(),
         localNodeOptions: {
           chainId: parseInt(CHAIN_IDS.BSC, 16),
@@ -112,10 +124,17 @@ describe('Add existing token using search', function () {
         testSpecificMock: mockBscApis,
       },
       async ({ driver }) => {
-        await login(driver, { validateBalance: false });
+        await login(driver);
+        const homePage = new HomePage(driver);
+        await homePage.checkPageIsLoaded();
+        await homePage.waitForNonEvmAccountsLoaded();
+
         const assetListPage = new AssetListPage(driver);
         await assetListPage.checkTokenAmountIsDisplayed('25 BNB');
-        await assetListPage.importTokenBySearch('BAT');
+        await assetListPage.importTokenBySearch({
+          tokenName: 'BAT',
+          networkName: BSC_DISPLAY_NAME,
+        });
         await assetListPage.checkTokenAmountInTokenDetailsModal(
           'Basic Attention Token',
           '0 BAT',
diff --git a/test/e2e/tests/tokens/token-list-storage-service.spec.ts b/test/e2e/tests/tokens/token-list-storage-service.spec.ts
index 6d8bb6d9afd8..c4b8ac3d8939 100644
--- a/test/e2e/tests/tokens/token-list-storage-service.spec.ts
+++ b/test/e2e/tests/tokens/token-list-storage-service.spec.ts
@@ -1,5 +1,8 @@
 import { Context } from 'mocha';
-import { CHAIN_IDS } from '../../../../shared/constants/network';
+import {
+  CHAIN_IDS,
+  MAINNET_DISPLAY_NAME,
+} from '../../../../shared/constants/network';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import { NETWORK_CLIENT_ID } from '../../constants';
 import { withFixtures } from '../../helpers';
@@ -48,7 +51,11 @@ describe('Token List via StorageService', function () {
         const assetListPage = new AssetListPage(driver);
 
         await homePage.checkPageIsLoaded();
-        await assetListPage.importTokenBySearch(tokenName);
+        await homePage.waitForNonEvmAccountsLoaded();
+        await assetListPage.importTokenBySearch({
+          tokenName,
+          networkName: MAINNET_DISPLAY_NAME,
+        });
         await assetListPage.checkTokenExistsInList(tokenSymbol);
       },
     );
diff --git a/test/e2e/tests/transaction/edit-gas-fee.spec.ts b/test/e2e/tests/transaction/edit-gas-fee.spec.ts
index d3523e5d34b4..7682a1ecc75e 100644
--- a/test/e2e/tests/transaction/edit-gas-fee.spec.ts
+++ b/test/e2e/tests/transaction/edit-gas-fee.spec.ts
@@ -6,7 +6,6 @@ import {
 } from '../../page-objects/flows/transaction';
 import { WINDOW_TITLES } from '../../constants';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
 import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import SendTokenConfirmPage from '../../page-objects/pages/send/send-token-confirmation-page';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
@@ -78,7 +77,7 @@ describe('Editing Confirm Transaction', function () {
   it('allows accessing advance gas fee popover from edit gas fee popover', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPreferencesController(PREFERENCES_STATE_MOCK)
           .build(),
         localNodeOptions: { hardfork: 'london' },
@@ -115,8 +114,6 @@ describe('Editing Confirm Transaction', function () {
         });
 
         // has correct updated value on the confirm screen the transaction
-        await sendTokenConfirmationPage.checkFirstGasFee('0.0002');
-
         await sendTokenConfirmationPage.checkNativeCurrency('$0.30');
 
         // confirms the transaction
@@ -134,7 +131,7 @@ describe('Editing Confirm Transaction', function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withPermissionControllerConnectedToTestDapp()
           .withPreferencesController(PREFERENCES_STATE_MOCK)
           .build(),
@@ -176,8 +173,6 @@ describe('Editing Confirm Transaction', function () {
         await sendTokenConfirmationPage.checkGasFee('0.001 ETH');
 
         // has correct updated value on the confirm screen the transaction
-        await sendTokenConfirmationPage.checkFirstGasFee('0.0019');
-
         await sendTokenConfirmationPage.checkNativeCurrency('$3.15');
 
         // confirms the transaction
diff --git a/test/e2e/tests/transaction/incoming-transactions.spec.ts b/test/e2e/tests/transaction/incoming-transactions.spec.ts
index c04d3bdc9b51..c9a3202a81b9 100644
--- a/test/e2e/tests/transaction/incoming-transactions.spec.ts
+++ b/test/e2e/tests/transaction/incoming-transactions.spec.ts
@@ -1,9 +1,9 @@
 import { Mockttp } from 'mockttp';
 import { login } from '../../page-objects/flows/login.flow';
 import { Driver } from '../../webdriver/driver';
-import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
+import { DEFAULT_FIXTURE_ACCOUNT, NETWORK_CLIENT_ID } from '../../constants';
 import { withFixtures } from '../../helpers';
-import FixtureBuilder from '../../fixtures/fixture-builder';
+import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
 import HomePage from '../../page-objects/pages/home/homepage';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
 
@@ -117,12 +117,11 @@ async function mockAccountsApi(
 }
 
 describe('Incoming Transactions', function () {
-  it('adds standard incoming transactions', async function () {
+  it('ignores incoming native transfer transactions', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withUseBasicFunctionalityEnabled()
-          .withNetworkControllerOnMainnet()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -138,21 +137,7 @@ describe('Incoming Transactions', function () {
         await homepage.goToActivityList();
 
         const activityList = new ActivityListPage(driver);
-        await activityList.checkConfirmedTxNumberDisplayedInActivity(2);
-
-        await activityList.checkTxAction({
-          action: 'Received',
-          txIndex: 1,
-          confirmedTx: 2,
-        });
-        await activityList.checkTxAmountInActivity('1.23 ETH', 1);
-
-        await activityList.checkTxAction({
-          action: 'Received',
-          txIndex: 2,
-          confirmedTx: 2,
-        });
-        await activityList.checkTxAmountInActivity('2.34 ETH', 2);
+        await activityList.checkNoTxInActivity();
       },
     );
   });
@@ -160,8 +145,8 @@ describe('Incoming Transactions', function () {
   it('ignores token transfer transactions', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withUseBasicFunctionalityEnabled()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -179,7 +164,7 @@ describe('Incoming Transactions', function () {
       },
       async ({ driver }: { driver: Driver }) => {
         const activityList = await changeNetworkAndGoToActivity(driver);
-        await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
+        await activityList.checkNoTxInActivity();
       },
     );
   });
@@ -187,8 +172,8 @@ describe('Incoming Transactions', function () {
   it('adds outgoing transactions', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
-          .withUseBasicFunctionalityEnabled()
+        fixtures: new FixtureBuilderV2()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
@@ -203,14 +188,14 @@ describe('Incoming Transactions', function () {
       },
       async ({ driver }: { driver: Driver }) => {
         const activityList = await changeNetworkAndGoToActivity(driver);
-        await activityList.checkConfirmedTxNumberDisplayedInActivity(2);
+        await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
 
         await activityList.checkTxAction({
           action: 'Sent ETH',
-          txIndex: 2,
-          confirmedTx: 2,
+          txIndex: 1,
+          confirmedTx: 1,
         });
-        await activityList.checkTxAmountInActivity('-4.56 ETH', 2);
+        await activityList.checkTxAmountInActivity('-4.56 ETH', 1);
       },
     );
   });
@@ -218,8 +203,9 @@ describe('Incoming Transactions', function () {
   it('does nothing if preference disabled', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder()
+        fixtures: new FixtureBuilderV2()
           .withUseBasicFunctionalityDisabled()
+          .withSelectedNetwork(NETWORK_CLIENT_ID.MAINNET)
           .withEnabledNetworks({
             eip155: {
               '0x1': true,
diff --git a/test/helpers/setup-helper.js b/test/helpers/setup-helper.js
index 30117f35c1be..e40d384031b9 100644
--- a/test/helpers/setup-helper.js
+++ b/test/helpers/setup-helper.js
@@ -165,6 +165,17 @@ if (!window.crypto.getRandomValues) {
   window.crypto.getRandomValues = require('crypto').webcrypto.getRandomValues;
 }
 
+// Ensure `crypto.randomUUID` exists in the test environment (some Jest
+// environments don't expose the webcrypto `crypto.randomUUID` even on Node 18+).
+if (typeof window.crypto.randomUUID !== 'function') {
+  // eslint-disable-next-line n/global-require
+  const nodeCrypto = require('crypto');
+
+  if (typeof nodeCrypto.randomUUID === 'function') {
+    window.crypto.randomUUID = nodeCrypto.randomUUID.bind(nodeCrypto);
+  }
+}
+
 // TextEncoder/TextDecoder
 window.TextEncoder = TextEncoder;
 window.TextDecoder = TextDecoder;
diff --git a/test/integration/config/setupAfter.js b/test/integration/config/setupAfter.js
index d1580ff51323..f052d0342438 100644
--- a/test/integration/config/setupAfter.js
+++ b/test/integration/config/setupAfter.js
@@ -10,6 +10,13 @@ beforeEach(() => {
     .get('/v4/multiaccount/transactions')
     .query(true)
     .reply(200, { data: [], pageInfo: { hasNextPage: false, count: 0 } });
+
+  // Mock surveys API, this is being called when metametrics-id is minted in the integration tests
+  // so, need to mock it to avoid the test from failing
+  nock(ACCOUNTS_API_BASE_URL)
+    .persist()
+    .get(/\/v1\/users\/.*\/surveys/)
+    .reply(200, { surveys: {} });
 });
 
 // Should be path from root of your project
diff --git a/test/integration/confirmations/signatures/permit.test.tsx b/test/integration/confirmations/signatures/permit.test.tsx
index 8029088d88c3..5ef6c1465fda 100644
--- a/test/integration/confirmations/signatures/permit.test.tsx
+++ b/test/integration/confirmations/signatures/permit.test.tsx
@@ -59,6 +59,7 @@ describe('Permit Confirmation', () => {
         preloadedState: {
           ...mockedMetaMaskState,
           participateInMetaMetrics: true,
+          metaMetricsId: 'test-metametrics-id',
           dataCollectionForMarketing: false,
         },
         backgroundConnection: backgroundConnectionMocked,
diff --git a/test/integration/confirmations/signatures/personalSign.test.tsx b/test/integration/confirmations/signatures/personalSign.test.tsx
index b0fb10e4a7a9..ad1966c752ef 100644
--- a/test/integration/confirmations/signatures/personalSign.test.tsx
+++ b/test/integration/confirmations/signatures/personalSign.test.tsx
@@ -84,6 +84,7 @@ describe('PersonalSign Confirmation', () => {
         preloadedState: {
           ...mockedMetaMaskState,
           participateInMetaMetrics: true,
+          metaMetricsId: 'test-metametrics-id',
           dataCollectionForMarketing: false,
         },
         backgroundConnection: backgroundConnectionMocked,
diff --git a/test/integration/confirmations/transactions/contract-deployment.test.tsx b/test/integration/confirmations/transactions/contract-deployment.test.tsx
index 82c731e4880f..32b033d60231 100644
--- a/test/integration/confirmations/transactions/contract-deployment.test.tsx
+++ b/test/integration/confirmations/transactions/contract-deployment.test.tsx
@@ -49,6 +49,7 @@ const getMetaMaskStateWithUnapprovedContractDeployment = ({
     ...mockMetaMaskState,
     participateInMetaMetrics: true,
     dataCollectionForMarketing: false,
+    metaMetricsId: 'test-metametrics-id',
     preferences: {
       ...mockMetaMaskState.preferences,
       showConfirmationAdvancedDetails,
diff --git a/test/integration/confirmations/transactions/contract-interaction.test.tsx b/test/integration/confirmations/transactions/contract-interaction.test.tsx
index 8881cdcfa728..62f625062db7 100644
--- a/test/integration/confirmations/transactions/contract-interaction.test.tsx
+++ b/test/integration/confirmations/transactions/contract-interaction.test.tsx
@@ -180,6 +180,7 @@ describe('Contract Interaction Confirmation', () => {
           ...mockedMetaMaskState,
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          metaMetricsId: 'test-metametrics-id',
         },
         backgroundConnection: backgroundConnectionMocked,
       });
diff --git a/test/integration/data/integration-init-state.json b/test/integration/data/integration-init-state.json
index 081a3477cad4..f143489a9dce 100644
--- a/test/integration/data/integration-init-state.json
+++ b/test/integration/data/integration-init-state.json
@@ -24,7 +24,6 @@
     "0xb552685e3d2790efd64a175b00d51f02cdafee5d": "c3deeb99-ba0d-4a4e-a0aa-033fc1f79ae3"
   },
   "accountTree": {
-    "selectedAccountGroup": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0",
     "wallets": {
       "entropy:01JKAF3DSGM3AB87EM9N0K41AJ": {
         "id": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ",
@@ -44,7 +43,8 @@
                 "groupIndex": 0
               },
               "hidden": false,
-              "pinned": false
+              "pinned": false,
+              "lastSelected": 0
             }
           }
         },
@@ -840,6 +840,7 @@
   },
   "securityAlertsEnabled": true,
   "seedPhraseBackedUp": true,
+  "selectedAccountGroup": "entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0",
   "selectedMultichainNetworkChainId": "bip122:000000000019d6689c085ae165831e93",
   "selectedNetworkClientId": "sepolia",
   "showAccountBanner": false,
@@ -2103,7 +2104,6 @@
   "unencryptedSnapStates": {},
   "use4ByteResolution": true,
   "useAddressBarEnsResolution": true,
-  "useBlockie": false,
   "useCurrencyRateCheck": true,
   "useExternalNameSources": true,
   "useExternalServices": true,
diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
index 8037bf9552e2..95c3981509f8 100644
--- a/test/integration/data/onboarding-completion-route.json
+++ b/test/integration/data/onboarding-completion-route.json
@@ -495,7 +495,6 @@
   "unencryptedSnapStates": {},
   "use4ByteResolution": true,
   "useAddressBarEnsResolution": true,
-  "useBlockie": false,
   "useCurrencyRateCheck": true,
   "useExternalNameSources": true,
   "useExternalServices": true,
diff --git a/test/integration/defi/defi-positions.test.tsx b/test/integration/defi/defi-positions.test.tsx
index 2c0b741f5e7e..d200af2b0107 100644
--- a/test/integration/defi/defi-positions.test.tsx
+++ b/test/integration/defi/defi-positions.test.tsx
@@ -60,6 +60,7 @@ const withMetamaskConnectedToMainnet = {
   ...mockMetaMaskState,
   participateInMetaMetrics: true,
   dataCollectionForMarketing: false,
+  metaMetricsId: 'test-metametrics-id',
   selectedNetworkClientId: 'testNetworkConfigurationId',
   preferences: {
     ...mockMetaMaskState.preferences,
diff --git a/test/integration/helpers.tsx b/test/integration/helpers.tsx
index b2179d978a65..859616183562 100644
--- a/test/integration/helpers.tsx
+++ b/test/integration/helpers.tsx
@@ -73,10 +73,10 @@ export const getSelectedAccountGroup = <
 >(
   state: State,
 ) => {
-  const groupId = state.accountTree.selectedAccountGroup;
+  const groupId = state.selectedAccountGroup;
   const {
     wallet: { id: walletId },
-  } = parseAccountGroupId(state.accountTree.selectedAccountGroup);
+  } = parseAccountGroupId(state.selectedAccountGroup);
   const wallet =
     state.accountTree.wallets[
       walletId as keyof typeof state.accountTree.wallets
diff --git a/test/integration/notifications&auth/data/notification-state.ts b/test/integration/notifications&auth/data/notification-state.ts
index abd627deaf98..c4a156f32ebc 100644
--- a/test/integration/notifications&auth/data/notification-state.ts
+++ b/test/integration/notifications&auth/data/notification-state.ts
@@ -40,6 +40,7 @@ export const getMockedNotificationsState = () => {
     isBackupAndSyncUpdateLoading: false,
     isContactSyncingEnabled: true,
     isContactSyncingInProgress: false,
+    metaMetricsId: 'test-metametrics-id',
     isMetamaskNotificationsFeatureSeen: true,
     isNotificationServicesEnabled: true,
     isFeatureAnnouncementsEnabled: true,
diff --git a/test/integration/notifications&auth/notifications-toggle.test.tsx b/test/integration/notifications&auth/notifications-toggle.test.tsx
index b9c55f3fc11b..a8a6ebf37beb 100644
--- a/test/integration/notifications&auth/notifications-toggle.test.tsx
+++ b/test/integration/notifications&auth/notifications-toggle.test.tsx
@@ -95,6 +95,7 @@ describe('Notifications Toggle', () => {
           ...mockedState,
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          metaMetricsId: 'test-metametrics-id',
         },
         backgroundConnection: backgroundConnectionMocked,
       });
diff --git a/test/jest/console-baseline-integration.json b/test/jest/console-baseline-integration.json
index 2e9ec8c7d73e..612b8014ffd3 100644
--- a/test/jest/console-baseline-integration.json
+++ b/test/jest/console-baseline-integration.json
@@ -1,142 +1,136 @@
 {
   "files": {
     "test/integration/confirmations/signatures/permit-batch.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/signatures/permit-seaport.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/signatures/permit-single.test.tsx": {
-      "React: State updates on unmounted components": 1,
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/signatures/permit-tradeOrder.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/signatures/permit.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/signatures/personalSign.test.tsx": {
-      "Reselect: Identity function warnings": 10,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 6,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/alerts.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/contract-deployment.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/contract-interaction.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/dapp-swap-comparison-banner.test.tsx": {
-      "Reselect: Identity function warnings": 9,
-      "Reselect: Input stability warnings": 4,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/erc20-approve.test.tsx": {
-      "React: Act warnings (component updates not wrapped)": 1,
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/erc721-approve.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/increase-allowance.test.tsx": {
-      "React: Act warnings (component updates not wrapped)": 1,
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/set-approval-for-all-revoke.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/confirmations/transactions/set-approval-for-all.test.tsx": {
-      "Reselect: Identity function warnings": 11,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 7,
+      "Reselect: Input stability warnings": 1,
       "error: Error: AggregateError": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/defi/defi-positions.test.tsx": {
-      "React: DOM nesting violations": 1,
-      "Reselect: Identity function warnings": 10,
-      "Reselect: Input stability warnings": 8,
+      "Reselect: Identity function warnings": 5,
+      "Reselect: Input stability warnings": 5,
       "error: Error: AggregateError": 4,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/nfts/nfts.test.tsx": {
-      "React: DOM nesting violations": 2,
-      "Reselect: Identity function warnings": 9,
-      "Reselect: Input stability warnings": 8,
+      "React: DOM nesting violations": 1,
+      "Reselect: Identity function warnings": 3,
+      "Reselect: Input stability warnings": 5,
       "error: Error: AggregateError": 3,
-      "error: Error: Uncaught [TypeError: mediaQuery.removeEventListener i...": 3,
-      "warn: ⚠️ React Router Future Flag": 2
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/notifications&auth/notifications-activation.test.tsx": {
-      "React: State updates on unmounted components": 1,
-      "Reselect: Identity function warnings": 9,
-      "Reselect: Input stability warnings": 9,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 3,
+      "Reselect: Input stability warnings": 6,
+      "error: Failed to fetch survey: test-metametrics-id": 2,
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/notifications&auth/notifications-list.test.tsx": {
-      "Reselect: Identity function warnings": 9,
-      "Reselect: Input stability warnings": 8,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 3,
+      "Reselect: Input stability warnings": 5,
+      "error: Failed to fetch survey: test-metametrics-id": 1,
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/notifications&auth/notifications-toggle.test.tsx": {
       "React: Missing key props in lists": 1,
       "React: componentWill* lifecycle deprecations": 1,
-      "Reselect: Identity function warnings": 9,
-      "Reselect: Input stability warnings": 11,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 3,
+      "Reselect: Input stability warnings": 8,
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/onboarding/import-wallet.test.tsx": {
-      "Reselect: Identity function warnings": 7,
-      "Reselect: Input stability warnings": 6,
-      "warn: Infura project ID not found,": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 4,
+      "Reselect: Input stability warnings": 5,
+      "warn: ⚠️ React Router Future Flag": 1
     },
     "test/integration/onboarding/wallet-created.test.tsx": {
-      "Reselect: Identity function warnings": 7,
-      "Reselect: Input stability warnings": 6,
-      "warn: Infura project ID not found,": 1,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 4,
+      "Reselect: Input stability warnings": 5,
+      "warn: ⚠️ React Router Future Flag": 1
     }
   }
 }
diff --git a/test/jest/console-baseline-unit.json b/test/jest/console-baseline-unit.json
index b8976c78867a..4d6c114c341c 100644
--- a/test/jest/console-baseline-unit.json
+++ b/test/jest/console-baseline-unit.json
@@ -37,7 +37,6 @@
       "error: Error: Migration 186: Invalid NetworkController": 1,
       "error: Error: Migration 189: Invalid NetworkController": 1,
       "error: Error: Migration 193: SnapController not": 1,
-      "error: Error: Migration 196: NetworkEnablementController not": 1,
       "error: Error: Migration 197: Invalid NetworkController": 1,
       "error: Error: No INFURA_PROJECT_ID set!": 1,
       "warn: Migration 139: typeof state.SelectedNetworkController is": 1,
@@ -74,7 +73,6 @@
       "error: Error: NetworkController state is invalid:": 1,
       "error: Error: invalid address (argument=\"address\", value=\"0x\",": 2,
       "error: This browser doesn't support cancelAnimationFrame.": 1,
-      "error: TypeError: Cannot convert undefined or": 2,
       "error: {": 1,
       "warn: Error during SnapController initialization. AssertionError:": 2,
       "warn: Unable to create some accounts": 1,
@@ -170,8 +168,6 @@
     },
     "app/scripts/migrations/196.test.ts": {
       "error: Error: Migration 196: NetworkEnablementController is": 1,
-      "error: Error: Migration 196: NetworkEnablementController missing": 1,
-      "error: Error: Migration 196: NetworkEnablementController not": 1,
       "error: Error: Migration 196: NetworkEnablementController.nativeAsse...": 1
     },
     "app/scripts/migrations/197.test.ts": {
@@ -285,12 +281,14 @@
       "React: Act warnings (component updates not wrapped)": 1
     },
     "ui/components/app/musd/hooks/useMerklRewards.test.ts": {
-      "React: State updates on unmounted components": 1,
-      "error: Error: Network error": 1
+      "React: State updates on unmounted components": 1
     },
     "ui/components/app/name/name-details/name-details.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 12
     },
+    "ui/components/app/perps/close-position/close-position-modal.test.tsx": {
+      "React: Act warnings (component updates not wrapped)": 2
+    },
     "ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.test.tsx": {
       "React: componentWill* lifecycle deprecations": 1
     },
@@ -303,9 +301,6 @@
     "ui/components/app/rewards/onboarding/OnboardingIntroStep.test.tsx": {
       "error: Warning: React does not recognize": 1
     },
-    "ui/components/app/rewards/onboarding/OnboardingStep4.test.tsx": {
-      "React: Missing key props in lists": 1
-    },
     "ui/components/app/selected-account/selected-account-component.test.js": {
       "React: DOM nesting violations": 1
     },
@@ -435,8 +430,7 @@
     "ui/components/multichain/account-menu/account-menu.test.tsx": {
       "MetaMask: Background connection not initialized": 2,
       "React: Act warnings (component updates not wrapped)": 3,
-      "React: State updates on unmounted components": 1,
-      "Reselect: Input stability warnings": 2
+      "React: State updates on unmounted components": 1
     },
     "ui/components/multichain/account-overview/account-overview-eth.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 1,
@@ -462,7 +456,7 @@
       "Reselect: Input stability warnings": 4
     },
     "ui/components/multichain/app-header/app-header.test.js": {
-      "React: Act warnings (component updates not wrapped)": 6,
+      "React: Act warnings (component updates not wrapped)": 4,
       "Reselect: Identity function warnings": 1,
       "Reselect: Input stability warnings": 4
     },
@@ -478,12 +472,6 @@
     "ui/components/multichain/connected-site-popover/connected-site-popover.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 4
     },
-    "ui/components/multichain/create-eth-account/create-eth-account.test.js": {
-      "Reselect: Input stability warnings": 1
-    },
-    "ui/components/multichain/create-snap-account/create-snap-account.test.tsx": {
-      "Reselect: Input stability warnings": 1
-    },
     "ui/components/multichain/disconnect-permissions-modal/disconnect-permissions-modal.test.tsx": {
       "Reselect: Identity function warnings": 1
     },
@@ -492,8 +480,7 @@
       "React: Act warnings (component updates not wrapped)": 1,
       "React: PropTypes validation failures": 1,
       "React: State updates on unmounted components": 1,
-      "Reselect: Identity function warnings": 1,
-      "Reselect: Input stability warnings": 2
+      "Reselect: Identity function warnings": 1
     },
     "ui/components/multichain/edit-networks-modal/edit-networks-modal.test.js": {
       "React: Missing key props in lists": 1,
@@ -560,6 +547,9 @@
     "ui/contexts/hardware-wallets/HardwareWalletContext.test.tsx": {
       "Test errors: Uncaught Errors": 4
     },
+    "ui/contexts/metametrics.test.tsx": {
+      "warn: ⚠️ React Router Future Flag": 1
+    },
     "ui/ducks/bridge/asset-selectors.test.ts": {
       "Reselect: Input stability warnings": 1
     },
@@ -639,6 +629,9 @@
       "Reselect: Identity function warnings": 1,
       "error: Unexpected key \"DNS\" found in": 1
     },
+    "ui/hooks/useHardwareWalletRecoveryLocation.test.tsx": {
+      "Reselect: Identity function warnings": 1
+    },
     "ui/hooks/useMultiPolling.test.ts": {
       "error: Error: Network error": 1
     },
@@ -675,10 +668,6 @@
       "React: DOM nesting violations": 2,
       "Reselect: Identity function warnings": 2
     },
-    "ui/pages/asset/hooks/useHistoricalPrices.test.ts": {
-      "MetaMask: Background connection not initialized": 6,
-      "React: Act warnings (component updates not wrapped)": 1
-    },
     "ui/pages/bridge/hooks/useEnableMissingNetwork.test.ts": {
       "MetaMask: Background connection not initialized": 1
     },
@@ -718,9 +707,6 @@
     "ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js": {
       "React: Act warnings (component updates not wrapped)": 16
     },
-    "ui/pages/confirmations/cancel-speedup/cancel-speedup.test.tsx": {
-      "React: PropTypes validation failures": 2
-    },
     "ui/pages/confirmations/components/UI/send-hero/send-hero.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 7,
       "error: Warning: React does not recognize": 5
@@ -741,7 +727,6 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/components/confirm/footer/footer.test.tsx": {
-      "MetaMask: Background connection not initialized": 2,
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/components/confirm/footer/shield-footer-agreement.test.tsx": {
@@ -892,9 +877,6 @@
       "MetaMask: Background connection not initialized": 114,
       "Reselect: Identity function warnings": 4
     },
-    "ui/pages/confirmations/components/confirm/info/shared/edit-gas-icon/edit-gas-icon-button.test.tsx": {
-      "warn: ⚠️ React Router Future Flag": 2
-    },
     "ui/pages/confirmations/components/confirm/info/shared/gas-fee-token-icon/gas-fee-token-icon.test.tsx": {
       "Reselect: Identity function warnings": 4
     },
@@ -908,7 +890,6 @@
     },
     "ui/pages/confirmations/components/confirm/info/shared/gas-fee-token-toast/gas-fee-token-toast.test.tsx": {
       "MetaMask: Background connection not initialized": 12,
-      "React: Missing key props in lists": 1,
       "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/gas-fees-details.test.tsx": {
@@ -998,26 +979,22 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-permission/total-exposure.test.tsx": {
-      "Reselect: Identity function warnings": 4,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-permission/typed-sign-permission.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 6,
       "Reselect: Identity function warnings": 4,
-      "Test errors: Uncaught Errors": 6,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Test errors: Uncaught Errors": 6
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx": {
       "MetaMask: Background connection not initialized": 4,
       "React: Act warnings (component updates not wrapped)": 4,
-      "React: Missing key props in lists": 1,
       "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/permit-simulation/permit-simulation.test.tsx": {
       "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/typed-sign-v4-simulation.test.tsx": {
-      "React: Missing key props in lists": 1,
       "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/value-display/value-display.test.tsx": {
@@ -1051,7 +1028,6 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/components/confirm/snaps/snaps-section/snaps-section.test.tsx": {
-      "React: Missing key props in lists": 1,
       "Reselect: Identity function warnings": 5
     },
     "ui/pages/confirmations/components/confirm/title/hooks/useCurrentSpendingCap.test.ts": {
@@ -1106,15 +1082,11 @@
     },
     "ui/pages/confirmations/components/rows/claimable-bonus-row/claimable-bonus-row.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 1,
-      "Reselect: Identity function warnings": 3,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/components/rows/enforced-simulations-row/enforced-simulations-row.test.tsx": {
       "Reselect: Identity function warnings": 3
     },
-    "ui/pages/confirmations/components/rows/pay-with-row/pay-with-row.test.tsx": {
-      "warn: ⚠️ React Router Future Flag": 2
-    },
     "ui/pages/confirmations/components/rows/required-tokens-row/required-tokens-row.test.tsx": {
       "Reselect: Identity function warnings": 3
     },
@@ -1156,8 +1128,8 @@
       "Reselect: Identity function warnings": 4
     },
     "ui/pages/confirmations/confirm/confirm.test.tsx": {
-      "MetaMask: Background connection not initialized": 262,
-      "React: Act warnings (component updates not wrapped)": 4,
+      "MetaMask: Background connection not initialized": 235,
+      "React: Act warnings (component updates not wrapped)": 3,
       "Reselect: Identity function warnings": 7
     },
     "ui/pages/confirmations/confirmation/templates/create-snap-account.test.js": {
@@ -1200,7 +1172,6 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.test.tsx": {
-      "MetaMask: Background connection not initialized": 27,
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/alerts/transactions/useGasSponsorshipWarningAlerts.test.ts": {
@@ -1245,8 +1216,7 @@
     },
     "ui/pages/confirmations/hooks/alerts/transactions/useTokenContractAlert.test.ts": {
       "React: Act warnings (component updates not wrapped)": 7,
-      "Reselect: Identity function warnings": 3,
-      "warn: ⚠️ React Router Future Flag": 2
+      "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/alerts/useAddressTrustSignalAlerts.test.ts": {
       "Reselect: Identity function warnings": 3
@@ -1258,7 +1228,7 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/alerts/useNetworkAndOriginSwitchingAlerts.test.ts": {
-      "MetaMask: Background connection not initialized": 7,
+      "MetaMask: Background connection not initialized": 6,
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/alerts/useOriginTrustSignalAlerts.test.ts": {
@@ -1326,11 +1296,7 @@
     "ui/pages/confirmations/hooks/transactions/useEnableShieldCoverageChecks.test.ts": {
       "Reselect: Identity function warnings": 3
     },
-    "ui/pages/confirmations/hooks/transactions/useShieldConfirm.test.ts": {
-      "warn: ⚠️ React Router Future Flag": 2
-    },
     "ui/pages/confirmations/hooks/transactions/useTransactionConfirm.test.ts": {
-      "MetaMask: Background connection not initialized": 96,
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/transactions/useTransactionCustomAmount.test.ts": {
@@ -1343,8 +1309,7 @@
       "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/useAutomaticGasFeeTokenSelect.test.ts": {
-      "Reselect: Identity function warnings": 3,
-      "Test errors: Uncaught TypeErrors": 1
+      "Reselect: Identity function warnings": 3
     },
     "ui/pages/confirmations/hooks/useConfirmActions.test.ts": {
       "Reselect: Identity function warnings": 3
@@ -1354,7 +1319,7 @@
     },
     "ui/pages/confirmations/hooks/useConfirmationAlerts.test.ts": {
       "MetaMask: Background connection not initialized": 7,
-      "React: Act warnings (component updates not wrapped)": 4,
+      "React: Act warnings (component updates not wrapped)": 3,
       "Reselect: Identity function warnings": 6
     },
     "ui/pages/confirmations/hooks/useConfirmationNetworkInfo.test.ts": {
@@ -1415,20 +1380,23 @@
     "ui/pages/contacts/edit-contact-page.test.tsx": {
       "Reselect: Identity function warnings": 1
     },
+    "ui/pages/create-account/connect-hardware/select-hardware.test.tsx": {
+      "warn: ⚠️ React Router Future Flag": 2
+    },
     "ui/pages/defi/components/defi-details-list.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 2,
       "React: State updates on unmounted components": 1,
       "Reselect: Identity function warnings": 2
     },
     "ui/pages/defi/components/defi-details-page.test.tsx": {
-      "React: Act warnings (component updates not wrapped)": 1,
-      "React: State updates on unmounted components": 1,
-      "Reselect: Identity function warnings": 3,
-      "Reselect: Input stability warnings": 1
+      "Reselect: Identity function warnings": 2
     },
     "ui/pages/error-page/error-component.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 2
     },
+    "ui/pages/home/home.container.test.tsx": {
+      "Reselect: Input stability warnings": 1
+    },
     "ui/pages/multichain-accounts/account-list/account-list.test.tsx": {
       "Reselect: Identity function warnings": 1
     },
@@ -1449,8 +1417,7 @@
       "Reselect: Identity function warnings": 1
     },
     "ui/pages/musd/index.test.tsx": {
-      "Reselect: Identity function warnings": 1,
-      "warn: No routes matched location \"/\"": 2
+      "Reselect: Identity function warnings": 1
     },
     "ui/pages/musd/screens/education.test.tsx": {
       "React: Act warnings (component updates not wrapped)": 3
@@ -1479,8 +1446,7 @@
       "MetaMask: Background connection not initialized": 1
     },
     "ui/pages/onboarding-flow/create-password/create-password.test.tsx": {
-      "MetaMask: Background connection not initialized": 1,
-      "React: DOM nesting violations": 1
+      "MetaMask: Background connection not initialized": 1
     },
     "ui/pages/onboarding-flow/import-srp/import-srp.test.tsx": {
       "MetaMask: Background connection not initialized": 1
@@ -1489,8 +1455,7 @@
       "React: Act usage warnings (incorrect await)": 4
     },
     "ui/pages/onboarding-flow/onboarding-flow.test.tsx": {
-      "MetaMask: Background connection not initialized": 13,
-      "warn: No routes matched location \"/\"": 1
+      "MetaMask: Background connection not initialized": 13
     },
     "ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.tsx": {
       "React: componentWill* lifecycle deprecations": 1,
@@ -1510,6 +1475,9 @@
     "ui/pages/perps/perps-order-entry-page.test.tsx": {
       "React: componentWill* lifecycle deprecations": 1
     },
+    "ui/pages/perps/perps-withdraw-page.test.tsx": {
+      "React: Act warnings (component updates not wrapped)": 10
+    },
     "ui/pages/remove-snap-account/remove-snap-account.test.tsx": {
       "Reselect: Identity function warnings": 1
     },
@@ -1517,18 +1485,14 @@
       "Reselect: Identity function warnings": 1
     },
     "ui/pages/routes/routes.component.test.js": {
-      "MetaMask: Background connection not initialized": 8,
-      "MetaMask: Balance not found warnings": 8,
-      "React: Act warnings (component updates not wrapped)": 18,
-      "React: PropTypes validation failures": 2,
-      "Reselect: Identity function warnings": 3,
-      "Reselect: Input stability warnings": 4,
-      "warn: Could not find asset type": 4
+      "React: Act warnings (component updates not wrapped)": 10,
+      "React: PropTypes validation failures": 1,
+      "Reselect: Identity function warnings": 1
     },
     "ui/pages/settings-v2/assets-tab/assets-tab.test.tsx": {
       "React: componentWill* lifecycle deprecations": 1
     },
-    "ui/pages/settings-v2/developer-options-tab/developer-options-tab.test.tsx": {
+    "ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.test.tsx": {
       "React: componentWill* lifecycle deprecations": 1
     },
     "ui/pages/settings-v2/preferences-and-display-tab/account-identicon-item.test.tsx": {
@@ -1616,7 +1580,7 @@
     },
     "ui/pages/settings/security-tab/security-tab.test.js": {
       "MetaMask: Background connection not initialized": 36,
-      "React: PropTypes validation failures": 4,
+      "React: PropTypes validation failures": 3,
       "React: componentWill* lifecycle deprecations": 1,
       "Reselect: Input stability warnings": 1
     },
diff --git a/test/lib/confirmations/render-helpers.tsx b/test/lib/confirmations/render-helpers.tsx
index 63c07ad15b0c..c5e46530e999 100644
--- a/test/lib/confirmations/render-helpers.tsx
+++ b/test/lib/confirmations/render-helpers.tsx
@@ -24,6 +24,7 @@ export function renderWithConfirmContextProvider(
   store: unknown,
   pathname = DEFAULT_ROUTE,
   confirmationId?: string,
+  getMockTrackEvent?: () => jest.Mock,
 ) {
   return renderWithProvider(
     <HardwareWalletErrorProvider>
@@ -35,6 +36,8 @@ export function renderWithConfirmContextProvider(
     </HardwareWalletErrorProvider>,
     store,
     pathname,
+    render,
+    getMockTrackEvent,
   );
 }
 
diff --git a/test/lib/render-helpers-navigate.js b/test/lib/render-helpers-navigate.js
index 6c3c9dfcd3d4..74e2c54123f5 100644
--- a/test/lib/render-helpers-navigate.js
+++ b/test/lib/render-helpers-navigate.js
@@ -87,7 +87,7 @@ export function createMemoryRouterWrapper(options = {}) {
   return Wrapper;
 }
 
-function createProviderWrapper(
+export function createProviderWrapper(
   store,
   pathname = '/',
   getMockTrackEvent = () => jest.fn().mockResolvedValue(undefined),
@@ -133,8 +133,13 @@ export function renderWithProvider(
   store,
   pathname = '/',
   renderer = render,
+  getMockTrackEvent,
 ) {
-  const wrapper = createProviderWrapper(store, pathname);
+  const wrapper = createProviderWrapper(
+    store,
+    pathname,
+    getMockTrackEvent ?? (() => jest.fn().mockResolvedValue(undefined)),
+  );
 
   return renderer(component, { wrapper });
 }
diff --git a/test/unit-global/check-ab-testing-compliance.test.ts b/test/unit-global/check-ab-testing-compliance.test.ts
new file mode 100644
index 000000000000..595d48346d6b
--- /dev/null
+++ b/test/unit-global/check-ab-testing-compliance.test.ts
@@ -0,0 +1,283 @@
+/**
+ * @jest-environment node
+ */
+
+/* eslint-disable import-x/no-nodejs-modules */
+import { spawnSync } from 'child_process';
+import {
+  appendFileSync,
+  mkdtempSync,
+  mkdirSync,
+  rmSync,
+  writeFileSync,
+} from 'fs';
+import { tmpdir } from 'os';
+import path from 'path';
+
+type CommandResult = {
+  status: number;
+  output: string;
+};
+
+const checkerSourcePath = path.resolve(
+  __dirname,
+  '../../.agents/skills/ab-testing-implementation/scripts/check-ab-testing-compliance.ts',
+);
+const tsxLoaderPath = path.resolve(
+  __dirname,
+  '../../node_modules/tsx/dist/loader.mjs',
+);
+
+const tempRepos: string[] = [];
+
+const runCommand = (
+  cwd: string,
+  cmd: string,
+  args: string[],
+): CommandResult => {
+  const result = spawnSync(cmd, args, {
+    cwd,
+    encoding: 'utf8',
+  });
+
+  return {
+    status: result.status ?? -1,
+    output: `${result.stdout ?? ''}${result.stderr ?? ''}`,
+  };
+};
+
+const runGit = (cwd: string, args: string[]) => {
+  const result = runCommand(cwd, 'git', args);
+  if (result.status !== 0) {
+    throw new Error(`git ${args.join(' ')} failed:\n${result.output}`);
+  }
+};
+
+const runChecker = (cwd: string, args: string[]): CommandResult =>
+  runCommand(cwd, process.execPath, [
+    '--import',
+    tsxLoaderPath,
+    checkerSourcePath,
+    ...args,
+  ]);
+
+const createRepo = (): string => {
+  const repo = mkdtempSync(path.join(tmpdir(), 'ab-checker-test-'));
+  tempRepos.push(repo);
+
+  runGit(repo, ['init']);
+  runGit(repo, ['config', 'user.name', 'AB Checker Test']);
+  runGit(repo, ['config', 'user.email', 'ab-checker-test@example.com']);
+  runGit(repo, ['config', 'commit.gpgsign', 'false']);
+
+  mkdirSync(path.join(repo, 'app'), { recursive: true });
+  writeFileSync(path.join(repo, 'app/sample.ts'), 'export const sample = 1;\n');
+
+  runGit(repo, ['add', 'app/sample.ts']);
+  runGit(repo, ['commit', '-m', 'init']);
+
+  return repo;
+};
+
+afterAll(() => {
+  for (const repo of tempRepos) {
+    rmSync(repo, { recursive: true, force: true });
+  }
+});
+
+describe('check-ab-testing-compliance.ts', () => {
+  it('fails with mode conflict', () => {
+    const repo = createRepo();
+    const result = runChecker(repo, ['--staged', '--files', 'app/sample.ts']);
+
+    expect(result.status).toBe(2);
+    expect(result.output).toContain('ERROR: Choose exactly one mode');
+  });
+
+  it('returns no-op success on clean tree in staged mode', () => {
+    const repo = createRepo();
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).toContain(
+      'no staged files and no working-tree changed files to inspect',
+    );
+  });
+
+  it('falls back to worktree files in staged mode', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      'export const changed = 2;\n',
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).toContain(
+      'falling back to working-tree changed files',
+    );
+  });
+
+  it('fails when new ab_tests payload is added', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      "const payload = { ab_tests: { example: 'control' } };\n",
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(1);
+    expect(result.output).toContain("added 'ab_tests' payload");
+  });
+
+  it('fails when literal active_ab_tests object misses key/value fields', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      "const payload = { active_ab_tests: [{ key: 'swapsSWAPS9999AbtestFoo' }] };\n",
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(1);
+    expect(result.output).toContain('malformed literal active_ab_tests object');
+  });
+
+  it('fails when inline useABTest variants object has no control', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      "const assignment = useABTest('swapsSWAPS9999AbtestFoo', { treatment: { label: 'x' } });\n",
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(1);
+    expect(result.output).toContain(
+      'inline useABTest variants object is missing control',
+    );
+  });
+
+  it('passes for by-reference variants with destructured useABTest result', () => {
+    const repo = createRepo();
+    writeFileSync(
+      path.join(repo, 'app/abTestConfig.ts'),
+      [
+        "export const FLAG_KEY = 'swapsSWAPS9999AbtestFoo';",
+        'export const VARIANTS = {',
+        "  control: { label: 'control' },",
+        "  treatment: { label: 'treatment' },",
+        '};',
+        '',
+      ].join('\n'),
+    );
+
+    writeFileSync(
+      path.join(repo, 'app/sample.ts'),
+      [
+        'const { variantName, isActive } = useABTest(FLAG_KEY, VARIANTS);',
+        'const payload = isActive',
+        '  ? { active_ab_tests: [{ key: FLAG_KEY, value: variantName }] }',
+        '  : {};',
+        '',
+      ].join('\n'),
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).not.toContain(
+      'inline useABTest variants object is missing control',
+    );
+  });
+
+  it('ignores invalid A/B examples in test files', () => {
+    const repo = createRepo();
+    writeFileSync(
+      path.join(repo, 'app/sample.test.ts'),
+      [
+        "const payload = { ab_tests: { example: 'control' } };",
+        "const invalidActive = { active_ab_tests: [{ key: 'swapsSWAPS9999AbtestFoo' }] };",
+        "const assignment = useABTest('swapsSWAPS9999AbtestFoo', { treatment: { label: 'x' } });",
+        '',
+      ].join('\n'),
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).not.toContain("added 'ab_tests' payload");
+    expect(result.output).not.toContain(
+      'inline useABTest variants object is missing control',
+    );
+  });
+
+  it('ignores invalid A/B examples in spec files', () => {
+    const repo = createRepo();
+    writeFileSync(
+      path.join(repo, 'app/sample.spec.ts'),
+      [
+        "const payload = { ab_tests: { example: 'control' } };",
+        "const invalidActive = { active_ab_tests: [{ key: 'swapsSWAPS9999AbtestFoo' }] };",
+        "const assignment = useABTest('swapsSWAPS9999AbtestFoo', { treatment: { label: 'x' } });",
+        '',
+      ].join('\n'),
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).not.toContain("added 'ab_tests' payload");
+    expect(result.output).not.toContain(
+      'inline useABTest variants object is missing control',
+    );
+  });
+
+  it('counts spec files as test updates when risky A/B changes are present', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      "const assignment = useABTest('swapsSWAPS9999AbtestFoo', { control: {}, treatment: {} });\n",
+    );
+    writeFileSync(
+      path.join(repo, 'app/sample.spec.ts'),
+      "describe('sample', () => expect(true).toBe(true));\n",
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).not.toContain(
+      'Risky A/B integration changes were detected without any test-file updates',
+    );
+  });
+
+  it('does not warn on regex source that mentions Abtest', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      `const pattern = /['"][^'"]*Abtest[^'"]*['"]/gu;\n`,
+    );
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(0);
+    expect(result.output).not.toContain("Abtest key ']*Abtest[^'");
+  });
+
+  it('still scans staged added lines whose code starts with ++', () => {
+    const repo = createRepo();
+    appendFileSync(
+      path.join(repo, 'app/sample.ts'),
+      "++ab_tests: { example: 'control' }\n",
+    );
+    runGit(repo, ['add', 'app/sample.ts']);
+
+    const result = runChecker(repo, ['--staged']);
+
+    expect(result.status).toBe(1);
+    expect(result.output).toContain("added 'ab_tests' payload");
+  });
+});
diff --git a/types/global.d.ts b/types/global.d.ts
index c858c6e710c1..5648adb46ad2 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -241,10 +241,6 @@ declare class Chrome {
   runtime: Runtime;
 }
 
-type SentryObject = Sentry & {
-  getMetaMetricsEnabled: () => Promise<boolean>;
-};
-
 type StateHooks = {
   getCustomTraces?: () => { [name: string]: number };
   // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
@@ -261,6 +257,9 @@ type StateHooks = {
   getPersistedState: () => Promise<any>;
   // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getBackupState?: () => Promise<any>;
+  // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getSentryAppState?: () => any;
   getSentryState: () => {
     browser: string;
@@ -289,12 +288,38 @@ type StateHooks = {
    * tests.
    */
   reloadExtension?: () => void;
+
+  /**
+   * Initialize Core Web Vitals observers (INP, LCP, CLS).
+   *
+   * @see ui/helpers/utils/web-vitals.ts
+   */
+  initWebVitals?: () => void;
+  /**
+   * Get current Core Web Vitals metrics.
+   * Returns stored INP, FCP, LCP, and CLS values with their ratings.
+   */
+  getWebVitalsMetrics?: () => {
+    inp: number | null;
+    fcp: number | null;
+    lcp: number | null;
+    cls: number | null;
+    inpRating: 'good' | 'needs-improvement' | 'poor' | null;
+    fcpRating: 'good' | 'needs-improvement' | 'poor' | null;
+    lcpRating: 'good' | 'needs-improvement' | 'poor' | null;
+    clsRating: 'good' | 'needs-improvement' | 'poor' | null;
+  };
+  /**
+   * Reset Core Web Vitals metrics to initial null state.
+   * Useful for clearing metrics between benchmark runs.
+   */
+  resetWebVitalsMetrics?: () => void;
 };
 
 export declare global {
   var platform: ExtensionPlatform;
   // Sentry is undefined in dev, so use optional chaining
-  var sentry: SentryObject | undefined;
+  var sentry: Sentry | undefined;
 
   var chrome: Chrome;
 
diff --git a/ui/__mocks__/perps/perps-controller/index.ts b/ui/__mocks__/perps/perps-controller/index.ts
index 2771bd294948..8232bcd320d8 100644
--- a/ui/__mocks__/perps/perps-controller/index.ts
+++ b/ui/__mocks__/perps/perps-controller/index.ts
@@ -490,24 +490,10 @@ export const LEARN_MORE_CONFIG = {
   CtaKey: 'perps.learn_more.cta',
 } as const;
 
-/**
- * Support configuration
- * Contact support button configuration (matches Settings behavior)
- */
-export const SUPPORT_CONFIG = {
-  Url: 'https://support.metamask.io',
-  TitleKey: 'perps.support.title',
-  DescriptionKey: 'perps.support.description',
-} as const;
-
-/**
- * Feedback survey configuration
- * External survey for collecting user feedback on Perps trading experience
- */
-export const FEEDBACK_CONFIG = {
-  Url: 'https://survey.alchemer.com/s3/8649911/MetaMask-Perps-Trading-Feedback',
-  TitleKey: 'perps.feedback.title',
-} as const;
+export {
+  SUPPORT_CONFIG,
+  FEEDBACK_CONFIG,
+} from '../../../../shared/constants/perps';
 
 /**
  * Support article URLs
diff --git a/ui/components/app/api-error-handler/api-error-handler.tsx b/ui/components/app/api-error-handler/api-error-handler.tsx
index 8d5eb5ed5ad7..430de06050d4 100644
--- a/ui/components/app/api-error-handler/api-error-handler.tsx
+++ b/ui/components/app/api-error-handler/api-error-handler.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect } from 'react';
-import browser from 'webextension-polyfill';
 import {
   Box,
   Button,
@@ -15,6 +14,7 @@ import classnames from 'clsx';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { ShieldUnexpectedErrorEventLocationEnum } from '../../../../shared/constants/subscriptions';
 import { useSubscriptionMetrics } from '../../../hooks/shield/metrics/useSubscriptionMetrics';
+import { reloadExtensionFromUi } from '../../../helpers/utils/reload-extension-from-ui';
 
 type ApiErrorHandlerProps = {
   className?: string;
@@ -60,7 +60,9 @@ const ApiErrorHandler = ({
         size={ButtonSize.Lg}
         variant={ButtonVariant.Primary}
         // this reloads the entire extension
-        onClick={() => browser.runtime.reload()}
+        onClick={async () => {
+          await reloadExtensionFromUi();
+        }}
       >
         {t('tryAgain')}
       </Button>
diff --git a/ui/components/app/assets/token-cell/token-cell.test.tsx b/ui/components/app/assets/token-cell/token-cell.test.tsx
index 26a4765d8270..6860a0c0ead7 100644
--- a/ui/components/app/assets/token-cell/token-cell.test.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.test.tsx
@@ -24,6 +24,7 @@ import { getProviderConfig } from '../../../../../shared/lib/selectors/networks'
 import { useIsOriginalTokenSymbol } from '../../../../hooks/useIsOriginalTokenSymbol';
 import { getIntlLocale } from '../../../../ducks/locale/locale';
 import { TokenWithFiatAmount } from '../types';
+import { TOKEN_LIST_CELL_MUSD_OPTIONS } from '../../musd/musd-events';
 import { TokenCellProps } from './token-cell';
 import TokenCell from '.';
 
@@ -160,7 +161,9 @@ describe('Token Cell', () => {
     token: {
       ...propToken,
     },
-    showMerklBadge: true,
+    musd: {
+      merklClaimBonus: TOKEN_LIST_CELL_MUSD_OPTIONS.merklClaimBonus,
+    },
     onClick: jest.fn(),
   };
   const propAnotherToken: Partial<TokenWithFiatAmount> & {
@@ -182,7 +185,9 @@ describe('Token Cell', () => {
     token: {
       ...propAnotherToken,
     },
-    showMerklBadge: true,
+    musd: {
+      merklClaimBonus: TOKEN_LIST_CELL_MUSD_OPTIONS.merklClaimBonus,
+    },
     onClick: jest.fn(),
   };
   const mockProviderConfig = jest.fn().mockReturnValue({
@@ -278,8 +283,8 @@ describe('Token Cell', () => {
     expect(amountElement.textContent).toBe('5.00M TEST');
   });
 
-  describe('showMusdConvertCta', () => {
-    it('does not show the mUSD convert CTA by default', () => {
+  describe('musd.convert', () => {
+    it('does not show the mUSD convert CTA when musd.convert is not passed', () => {
       mockShouldShowTokenListItemCta.mockReturnValue(true);
 
       const { queryByTestId } = renderWithProvider(
@@ -290,22 +295,28 @@ describe('Token Cell', () => {
       expect(queryByTestId('musd-convert-link-mock')).not.toBeInTheDocument();
     });
 
-    it('shows the mUSD convert CTA when showMusdConvertCta is true and token is eligible', () => {
+    it('shows the mUSD convert CTA when musd.convert is set and token is eligible', () => {
       mockShouldShowTokenListItemCta.mockReturnValue(true);
 
       const { queryByTestId } = renderWithProvider(
-        <TokenCell {...(props as TokenCellProps)} showMusdConvertCta />,
+        <TokenCell
+          {...(props as TokenCellProps)}
+          musd={TOKEN_LIST_CELL_MUSD_OPTIONS}
+        />,
         mockStore,
       );
 
       expect(queryByTestId('musd-convert-link-mock')).toBeInTheDocument();
     });
 
-    it('does not show the mUSD convert CTA when showMusdConvertCta is true but token is not eligible', () => {
+    it('does not show the mUSD convert CTA when musd.convert is set but token is not eligible', () => {
       mockShouldShowTokenListItemCta.mockReturnValue(false);
 
       const { queryByTestId } = renderWithProvider(
-        <TokenCell {...(props as TokenCellProps)} showMusdConvertCta />,
+        <TokenCell
+          {...(props as TokenCellProps)}
+          musd={TOKEN_LIST_CELL_MUSD_OPTIONS}
+        />,
         mockStore,
       );
 
diff --git a/ui/components/app/assets/token-cell/token-cell.tsx b/ui/components/app/assets/token-cell/token-cell.tsx
index 8cab9174678c..b17b6ab589f3 100644
--- a/ui/components/app/assets/token-cell/token-cell.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.tsx
@@ -1,11 +1,16 @@
+import type { Hex } from '@metamask/utils';
 import React, { useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import type { Hex } from '@metamask/utils';
-import type { MusdMerklClaimCtaLocation } from '../../musd/musd-events';
-import { MUSD_EVENTS_CONSTANTS } from '../../musd/musd-events';
-import { getBonusAmountRange } from '../../musd/merkl-bonus-analytics';
-import { useTokenDisplayInfo } from '../hooks';
+import { isEvmChainId } from '../../../../../shared/lib/asset-utils';
+import { NETWORKS_ROUTE } from '../../../../helpers/constants/routes';
+import { useMusdBalance, useMusdCtaVisibility } from '../../../../hooks/musd';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import {
+  getSafeNativeCurrencySymbol,
+  type SafeChain,
+} from '../../../../pages/settings/networks-tab/networks-form/use-safe-chains';
+import { setEditedNetwork } from '../../../../store/actions';
 import {
   ButtonSecondary,
   Modal,
@@ -15,38 +20,38 @@ import {
   ModalHeader,
   ModalOverlay,
 } from '../../../component-library';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
-import {
-  getSafeNativeCurrencySymbol,
-  type SafeChain,
-} from '../../../../pages/settings/networks-tab/networks-form/use-safe-chains';
-import { NETWORKS_ROUTE } from '../../../../helpers/constants/routes';
-import { setEditedNetwork } from '../../../../store/actions';
-import { type TokenWithFiatAmount } from '../types';
-import GenericAssetCellLayout from '../asset-list/cells/generic-asset-cell-layout';
+import { ClaimBonusBadge, MusdConvertLink, useMerklRewards } from '../../musd';
+import { getBonusAmountRange } from '../../musd/merkl-bonus-analytics';
+import type {
+  MerklClaimBonusAnalyticsLocation,
+  MusdConvertLinkEntryPoint,
+} from '../../musd/musd-events';
 import { AssetCellBadge } from '../asset-list/cells/asset-cell-badge';
-import { isEvmChainId } from '../../../../../shared/lib/asset-utils';
-import { ClaimBonusBadge, useMerklRewards, MusdConvertLink } from '../../musd';
-import { useMusdCtaVisibility, useMusdBalance } from '../../../../hooks/musd';
+import GenericAssetCellLayout from '../asset-list/cells/generic-asset-cell-layout';
+import { useTokenDisplayInfo } from '../hooks';
+import { type TokenWithFiatAmount } from '../types';
 import {
-  TokenCellTitle,
   TokenCellPercentChange,
   TokenCellPrimaryDisplay,
   TokenCellSecondaryDisplay,
+  TokenCellTitle,
 } from './cells';
 
+export type TokenCellMusdOptions = {
+  /** When set, enables Merkl fetch/badge for this cell. */
+  merklClaimBonus?: { location: MerklClaimBonusAnalyticsLocation };
+  /** When set, enables footer convert link (subject to `useMusdCtaVisibility` / balance rules). */
+  convert?: { entryPoint: MusdConvertLinkEntryPoint };
+};
+
 export type TokenCellProps = {
   token: TokenWithFiatAmount;
   privacyMode?: boolean;
   onClick?: () => void;
   fixCurrencyToUSD?: boolean;
   safeChains?: SafeChain[];
-  /** When true, shows the Merkl "Claim bonus" badge (e.g. on asset detail page). */
-  showMerklBadge?: boolean;
-  /** When true, shows the mUSD convert CTA in the footer (e.g. on the home token list). */
-  showMusdConvertCta?: boolean;
-  /** Analytics: where the Merkl claim CTA is shown (default home/list). */
-  merklClaimCtaLocation?: MusdMerklClaimCtaLocation;
+  /** Merkl claim bonus and/or mUSD convert surfaces; parent must pass explicit analytics locations. */
+  musd?: TokenCellMusdOptions;
 };
 
 // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
@@ -57,9 +62,7 @@ export default function TokenCell({
   onClick,
   fixCurrencyToUSD = false,
   safeChains,
-  showMerklBadge = false,
-  showMusdConvertCta = false,
-  merklClaimCtaLocation = MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.TOKEN_LIST_ITEM,
+  musd,
 }: TokenCellProps) {
   const dispatch = useDispatch();
   const navigate = useNavigate();
@@ -71,6 +74,8 @@ export default function TokenCell({
   );
   const [showScamWarningModal, setShowScamWarningModal] = useState(false);
 
+  const showMerklBadge = Boolean(musd?.merklClaimBonus);
+
   // Check whether there are rewards available for the user
   const {
     hasClaimableReward,
@@ -88,7 +93,7 @@ export default function TokenCell({
   const { hasMusdBalance } = useMusdBalance();
 
   const showMusdCta = useMemo(() => {
-    if (!showMusdConvertCta || !token.address || !token.chainId) {
+    if (!musd?.convert || !token.address || !token.chainId) {
       return false;
     }
     return shouldShowTokenListItemCta(
@@ -100,7 +105,7 @@ export default function TokenCell({
       { hasMusdBalance },
     );
   }, [
-    showMusdConvertCta,
+    musd?.convert,
     token.address,
     token.chainId,
     token.symbol,
@@ -131,24 +136,24 @@ export default function TokenCell({
   };
 
   const renderFooterLeft = () => {
-    if (showMusdCta) {
+    if (showMusdCta && musd?.convert) {
       return (
         <MusdConvertLink
           tokenAddress={token.address as Hex}
           chainId={token.chainId as Hex}
           tokenSymbol={token.symbol}
-          entryPoint="token_list"
+          entryPoint={musd.convert.entryPoint}
         />
       );
     }
-    if (isEligible && hasClaimableReward) {
+    if (musd?.merklClaimBonus && isEligible && hasClaimableReward) {
       return (
         <ClaimBonusBadge
           tokenAddress={token.address as string}
           chainId={token.chainId as Hex}
           label={t('merklRewardsClaimBonus')}
           refetchRewards={refetchMerklRewards}
-          location={merklClaimCtaLocation}
+          analyticsLocation={musd.merklClaimBonus.location}
           assetSymbol={token.symbol}
           bonusAmountRange={merklBonusAmountRange}
           hasClaimedBefore={hasClaimedBefore}
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index 1618dfbac341..19a4d834ddfb 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -33,6 +33,7 @@ import {
 } from '../../../../../shared/lib/asset-utils';
 import { sortAssetsWithPriority } from '../util/sortAssetsWithPriority';
 import { VirtualizedList } from '../../../ui/virtualized-list/virtualized-list';
+import { TOKEN_LIST_CELL_MUSD_OPTIONS } from '../../musd/musd-events';
 
 type TokenListProps = {
   onTokenClick: (chainId: string, address: string) => void;
@@ -167,8 +168,7 @@ function TokenList({ onTokenClick, safeChains }: TokenListProps) {
               privacyMode={privacyMode}
               onClick={isNonEvmTestnet ? undefined : handleTokenClick(token)}
               safeChains={safeChains}
-              showMerklBadge
-              showMusdConvertCta
+              musd={TOKEN_LIST_CELL_MUSD_OPTIONS}
             />
           );
         })}
@@ -195,8 +195,7 @@ function TokenList({ onTokenClick, safeChains }: TokenListProps) {
             privacyMode={privacyMode}
             onClick={isNonEvmTestnet ? undefined : handleTokenClick(token)}
             safeChains={safeChains}
-            showMerklBadge
-            showMusdConvertCta
+            musd={TOKEN_LIST_CELL_MUSD_OPTIONS}
           />
         );
       }}
diff --git a/ui/components/app/connected-status-indicator/connected-status-indicator.js b/ui/components/app/connected-status-indicator/connected-status-indicator.js
deleted file mode 100644
index f3f8081217ff..000000000000
--- a/ui/components/app/connected-status-indicator/connected-status-indicator.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useSelector } from 'react-redux';
-import { WALLET_SNAP_PERMISSION_KEY } from '@metamask/snaps-utils';
-import { isInternalAccountInPermittedAccountIds } from '@metamask/chain-agnostic-permission';
-import {
-  STATUS_CONNECTED,
-  STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
-  STATUS_CONNECTED_TO_SNAP,
-  STATUS_NOT_CONNECTED,
-} from '../../../helpers/constants/connected-sites';
-import {
-  BackgroundColor,
-  Color,
-} from '../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  getAllPermittedAccountsForCurrentTab,
-  getPermissionsForActiveTab,
-} from '../../../selectors';
-import { ConnectedSiteMenu } from '../../multichain/connected-site-menu';
-import {
-  getInternalAccountsFromGroupById,
-  getSelectedAccountGroup,
-} from '../../../selectors/multichain-accounts/account-tree';
-
-export default function ConnectedStatusIndicator({ onClick, disabled }) {
-  const t = useI18nContext();
-  const selectedAccountGroupId = useSelector(getSelectedAccountGroup);
-  const accountGroupInternalAccounts = useSelector((state) =>
-    getInternalAccountsFromGroupById(state, selectedAccountGroupId),
-  );
-
-  const permissionsForActiveTab = useSelector(getPermissionsForActiveTab);
-
-  const activeWalletSnap = permissionsForActiveTab
-    .map((permission) => permission.key)
-    .includes(WALLET_SNAP_PERMISSION_KEY);
-
-  const permittedAccounts = useSelector(getAllPermittedAccountsForCurrentTab);
-
-  const currentTabIsConnectedToAccountGroup =
-    selectedAccountGroupId &&
-    accountGroupInternalAccounts &&
-    accountGroupInternalAccounts.some((account) =>
-      isInternalAccountInPermittedAccountIds(account, permittedAccounts),
-    );
-
-  let status;
-  if (currentTabIsConnectedToAccountGroup) {
-    status = STATUS_CONNECTED;
-  } else if (permittedAccounts.length > 0) {
-    status = STATUS_CONNECTED_TO_ANOTHER_ACCOUNT;
-  } else if (activeWalletSnap) {
-    status = STATUS_CONNECTED_TO_SNAP;
-  } else {
-    status = STATUS_NOT_CONNECTED;
-  }
-
-  let globalMenuColor = Color.iconAlternative;
-  if (status === STATUS_CONNECTED) {
-    globalMenuColor = Color.successDefault;
-  } else if (
-    status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT ||
-    status === STATUS_CONNECTED_TO_SNAP
-  ) {
-    globalMenuColor = BackgroundColor.backgroundDefault;
-  }
-
-  const tooltipText =
-    status === STATUS_CONNECTED
-      ? t('tooltipSatusConnected')
-      : t('tooltipSatusNotConnected');
-
-  return (
-    <ConnectedSiteMenu
-      status={status}
-      globalMenuColor={globalMenuColor}
-      text={tooltipText}
-      as="button"
-      onClick={onClick}
-      disabled={disabled}
-    />
-  );
-}
-
-ConnectedStatusIndicator.propTypes = {
-  onClick: PropTypes.func,
-  disabled: PropTypes.bool,
-};
diff --git a/ui/components/app/connected-status-indicator/connected-status-indicator.test.tsx b/ui/components/app/connected-status-indicator/connected-status-indicator.test.tsx
deleted file mode 100644
index d7169d9c7f4b..000000000000
--- a/ui/components/app/connected-status-indicator/connected-status-indicator.test.tsx
+++ /dev/null
@@ -1,491 +0,0 @@
-import React from 'react';
-import configureStore from 'redux-mock-store';
-import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
-import {
-  Color,
-  BackgroundColor,
-} from '../../../helpers/constants/design-system';
-import {
-  STATUS_CONNECTED,
-  STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
-  STATUS_CONNECTED_TO_SNAP,
-  STATUS_NOT_CONNECTED,
-} from '../../../helpers/constants/connected-sites';
-import { createMockInternalAccount } from '../../../../test/jest/mocks';
-import { CHAIN_IDS } from '../../../../shared/constants/network';
-import ConnectedStatusIndicator from './connected-status-indicator';
-
-// Mock ConnectedSiteMenu to test props passed to it
-jest.mock('../../multichain/connected-site-menu', () => ({
-  ConnectedSiteMenu: jest.fn(({ status, globalMenuColor, text, disabled }) => (
-    <div
-      data-testid="connection-menu"
-      data-status={status}
-      data-global-menu-color={globalMenuColor}
-      data-text={text}
-      className={`multichain-connected-site-menu${disabled ? '--disabled' : ''}`}
-    />
-  )),
-}));
-
-jest.mock('@metamask/chain-agnostic-permission', () => ({
-  ...jest.requireActual('@metamask/chain-agnostic-permission'),
-  isInternalAccountInPermittedAccountIds: jest.fn(),
-  getCaip25PermissionFromSubject: jest.fn(),
-  getCaip25CaveatFromPermission: jest.fn(),
-  getCaipAccountIdsFromCaip25CaveatValue: jest.fn(),
-  getAllScopesFromPermission: jest.fn(),
-  getPermittedEthChainIds: jest.fn(),
-  getEthAccounts: jest.fn(),
-}));
-
-const {
-  isInternalAccountInPermittedAccountIds,
-  getCaip25PermissionFromSubject,
-  getCaip25CaveatFromPermission,
-  getCaipAccountIdsFromCaip25CaveatValue,
-  getAllScopesFromPermission,
-  getPermittedEthChainIds,
-  getEthAccounts,
-} = jest.requireMock('@metamask/chain-agnostic-permission');
-
-describe('ConnectedStatusIndicator', () => {
-  const mockAccount1 = createMockInternalAccount({
-    id: 'account1',
-    address: '0x1234567890123456789012345678901234567890',
-    name: 'Account 1',
-  });
-  const mockAccount2 = createMockInternalAccount({
-    id: 'account2',
-    address: '0x0987654321098765432109876543210987654321',
-    name: 'Account 2',
-  });
-
-  const mockAccountGroup1 = 'entropy:wallet1/0';
-
-  const createMockState = (overrides = {}) => ({
-    activeTab: {
-      origin: 'https://test.dapp',
-    },
-    metamask: {
-      internalAccounts: {
-        accounts: {
-          [mockAccount1.id]: mockAccount1,
-          [mockAccount2.id]: mockAccount2,
-        },
-        selectedAccount: mockAccount1.id,
-      },
-      subjects: {
-        'https://test.dapp': {
-          permissions: {},
-        },
-      },
-      subjectMetadata: {
-        'https://test.dapp': {
-          name: 'Test Dapp',
-          iconUrl: 'https://test.dapp/icon.png',
-        },
-      },
-      permissionHistory: {
-        'https://test.dapp': {
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          eth_accounts: {
-            accounts: {},
-          },
-        },
-      },
-      domainMetadata: {
-        'https://test.dapp': {
-          name: 'Test Dapp',
-          icon: 'https://test.dapp/icon.png',
-        },
-      },
-      keyrings: [],
-      balances: {
-        [mockAccount1.address]: '0x0',
-        [mockAccount2.address]: '0x0',
-      },
-      cachedBalances: {
-        [CHAIN_IDS.MAINNET]: {
-          [mockAccount1.address]: '0x0',
-          [mockAccount2.address]: '0x0',
-        },
-      },
-      networkConfigurations: {
-        [CHAIN_IDS.MAINNET]: {
-          chainId: CHAIN_IDS.MAINNET,
-          rpcUrl: 'https://mainnet.infura.io/v3/test',
-          ticker: 'ETH',
-          nickname: 'Ethereum Mainnet',
-          type: 'custom',
-        },
-      },
-      providerConfig: {
-        chainId: CHAIN_IDS.MAINNET,
-        ticker: 'ETH',
-        nickname: 'Ethereum Mainnet',
-        type: 'mainnet',
-      },
-      tokens: [],
-      allTokens: {},
-      tokenBalances: {},
-      allTokenBalances: {},
-      seedPhraseBackedUp: false,
-      dismissSeedBackUpReminder: false,
-      accountTree: {
-        selectedAccountGroup: mockAccountGroup1,
-        wallets: {
-          'entropy:wallet1': {
-            id: 'entropy:wallet1',
-            type: 'entropy',
-            status: 'ready',
-            groups: {
-              [mockAccountGroup1]: {
-                id: mockAccountGroup1,
-                type: 'multichainAccount',
-                accounts: [mockAccount1.id, mockAccount2.id],
-                metadata: {
-                  name: 'Wallet 1',
-                  entropy: { groupIndex: 0 },
-                  pinned: false,
-                  hidden: false,
-                },
-              },
-            },
-            metadata: {
-              name: 'Wallet 1',
-              entropy: { id: 'wallet1' },
-            },
-          },
-        },
-      },
-      ...overrides,
-    },
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    isInternalAccountInPermittedAccountIds.mockReturnValue(false);
-    getCaip25PermissionFromSubject.mockReturnValue(null);
-    getCaip25CaveatFromPermission.mockReturnValue(null);
-    getCaipAccountIdsFromCaip25CaveatValue.mockReturnValue([]);
-    getAllScopesFromPermission.mockReturnValue({});
-    getPermittedEthChainIds.mockReturnValue([]);
-    getEthAccounts.mockReturnValue([]);
-  });
-
-  const mockStore = configureStore([]);
-
-  describe('Connection status display', () => {
-    it('displays connected status when current account group has permissions', () => {
-      isInternalAccountInPermittedAccountIds
-        .mockReturnValueOnce(true) // First account in group is connected
-        .mockReturnValueOnce(false); // Second account is not
-
-      const mockState = createMockState({
-        permissionHistory: {
-          'https://test.dapp': {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            eth_accounts: {
-              accounts: {
-                [mockAccount1.address]: 1234567890,
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-      expect(menu).toHaveAttribute('data-status', STATUS_CONNECTED);
-      expect(menu).toHaveAttribute(
-        'data-global-menu-color',
-        Color.successDefault,
-      );
-    });
-
-    it('displays connected to another account status when only external accounts have permissions', () => {
-      // Reset the mock for this test to ensure no account is connected
-      isInternalAccountInPermittedAccountIds.mockReturnValue(false);
-
-      const mockPermission = {
-        caveats: [
-          {
-            type: 'authorizedScopes',
-            value: {
-              'eip155:1': {
-                methods: [],
-                notifications: [],
-                accounts: [
-                  'eip155:1:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
-                ],
-              },
-            },
-          },
-        ],
-      };
-      getCaip25PermissionFromSubject.mockReturnValue(mockPermission);
-      getCaip25CaveatFromPermission.mockReturnValue(mockPermission.caveats[0]);
-      getCaipAccountIdsFromCaip25CaveatValue.mockReturnValue([
-        'eip155:1:0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
-      ]);
-
-      const mockState = createMockState({
-        subjects: {
-          'https://test.dapp': {
-            permissions: {
-              'endowment:caip25': mockPermission,
-            },
-          },
-        },
-        permissionHistory: {
-          'https://test.dapp': {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            eth_accounts: {
-              accounts: {
-                '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd': 1234567890,
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-      expect(menu).toHaveAttribute(
-        'data-status',
-        STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
-      );
-      expect(menu).toHaveAttribute(
-        'data-global-menu-color',
-        BackgroundColor.backgroundDefault,
-      );
-    });
-
-    it('displays snap connection status when wallet snap permissions exist', () => {
-      const mockState = createMockState({
-        subjects: {
-          'https://test.dapp': {
-            permissions: {
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              wallet_snap: {
-                caveats: [],
-                date: 1234567890,
-                id: 'test-permission-id',
-                invoker: 'https://test.dapp',
-                parentCapability: 'wallet_snap',
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-      expect(menu).toHaveAttribute('data-status', STATUS_CONNECTED_TO_SNAP);
-      expect(menu).toHaveAttribute(
-        'data-global-menu-color',
-        BackgroundColor.backgroundDefault,
-      );
-    });
-
-    it('displays not connected status when no permissions exist', () => {
-      const mockState = createMockState();
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-      expect(menu).toHaveAttribute('data-status', STATUS_NOT_CONNECTED);
-      expect(menu).toHaveAttribute(
-        'data-global-menu-color',
-        Color.iconAlternative,
-      );
-    });
-  });
-
-  describe('Error handling and edge cases', () => {
-    it('renders correctly when no account group is selected', () => {
-      const mockState = createMockState({
-        accountTree: {
-          selectedAccountGroup: null,
-          wallets: {},
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-    });
-
-    it('renders correctly when account group contains no accounts', () => {
-      const mockState = createMockState({
-        accountTree: {
-          selectedAccountGroup: mockAccountGroup1,
-          wallets: {
-            'entropy:wallet1': {
-              id: 'entropy:wallet1',
-              type: 'entropy',
-              status: 'ready',
-              groups: {
-                [mockAccountGroup1]: {
-                  id: mockAccountGroup1,
-                  type: 'multichainAccount',
-                  accounts: [],
-                  metadata: {
-                    name: 'Wallet 1',
-                    entropy: { groupIndex: 0 },
-                    pinned: false,
-                    hidden: false,
-                  },
-                },
-              },
-              metadata: {
-                name: 'Wallet 1',
-                entropy: { id: 'wallet1' },
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-    });
-
-    it('renders correctly when active tab has no permissions', () => {
-      const mockState = createMockState();
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveClass('multichain-connected-site-menu');
-    });
-
-    it('renders correctly when multiple snap permissions exist', () => {
-      const mockState = createMockState({
-        subjects: {
-          'https://test.dapp': {
-            permissions: {
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              wallet_snap: {
-                caveats: [],
-                date: 1234567890,
-                id: 'test-permission-id',
-                invoker: 'https://test.dapp',
-                parentCapability: 'wallet_snap',
-              },
-              'endowment:network-access': {
-                caveats: [],
-                date: 1234567890,
-                id: 'test-permission-id-2',
-                invoker: 'https://test.dapp',
-                parentCapability: 'endowment:network-access',
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-    });
-
-    it('prioritizes account connection status over snap connection status', () => {
-      isInternalAccountInPermittedAccountIds
-        .mockReturnValueOnce(true) // Account in selected group is connected
-        .mockReturnValueOnce(false);
-
-      const mockState = createMockState({
-        subjects: {
-          'https://test.dapp': {
-            permissions: {
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              wallet_snap: {
-                caveats: [],
-                date: 1234567890,
-                id: 'test-permission-id',
-                invoker: 'https://test.dapp',
-                parentCapability: 'wallet_snap',
-              },
-            },
-          },
-        },
-        permissionHistory: {
-          'https://test.dapp': {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            eth_accounts: {
-              accounts: {
-                [mockAccount1.address]: 1234567890,
-              },
-            },
-          },
-        },
-      });
-
-      const store = mockStore(mockState);
-      const { getByTestId } = renderWithProvider(
-        <ConnectedStatusIndicator />,
-        store,
-      );
-
-      const menu = getByTestId('connection-menu');
-      expect(menu).toBeInTheDocument();
-      expect(menu).toHaveAttribute('data-status', STATUS_CONNECTED);
-      expect(menu).toHaveAttribute(
-        'data-global-menu-color',
-        Color.successDefault,
-      );
-    });
-  });
-});
diff --git a/ui/components/app/connected-status-indicator/index.js b/ui/components/app/connected-status-indicator/index.js
deleted file mode 100644
index 01c4a66ee936..000000000000
--- a/ui/components/app/connected-status-indicator/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './connected-status-indicator';
diff --git a/ui/components/app/download-mobile-modal/download-mobile-modal.stories.tsx b/ui/components/app/download-mobile-modal/download-mobile-modal.stories.tsx
index dd40e430dcb5..7e3c6087cfbf 100644
--- a/ui/components/app/download-mobile-modal/download-mobile-modal.stories.tsx
+++ b/ui/components/app/download-mobile-modal/download-mobile-modal.stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useArgs } from '@storybook/client-api';
-import { Button } from '../../component-library';
+import { Button } from '@metamask/design-system-react';
 import DownloadMobileModal from './download-mobile-modal';
 
 export default {
diff --git a/ui/components/app/download-mobile-modal/download-mobile-modal.tsx b/ui/components/app/download-mobile-modal/download-mobile-modal.tsx
index 0089ae2c3494..0ac1a358ee6b 100644
--- a/ui/components/app/download-mobile-modal/download-mobile-modal.tsx
+++ b/ui/components/app/download-mobile-modal/download-mobile-modal.tsx
@@ -1,22 +1,21 @@
 import React from 'react';
 import {
-  AlignItems,
-  BlockSize,
-  BorderColor,
-  Display,
-  FlexDirection,
-  JustifyContent,
+  Box,
+  BoxAlignItems,
+  BoxBorderColor,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Text,
   TextAlign,
   TextVariant,
-} from '../../../helpers/constants/design-system';
+} from '@metamask/design-system-react';
+import { AlignItems } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  Box,
   Modal,
   ModalContent,
   ModalHeader,
   ModalOverlay,
-  Text,
 } from '../../component-library';
 
 const DownloadMobileAppModal = ({ onClose }: { onClose: () => void }) => {
@@ -37,43 +36,30 @@ const DownloadMobileAppModal = ({ onClose }: { onClose: () => void }) => {
         <Box
           paddingLeft={4}
           paddingRight={4}
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
+          flexDirection={BoxFlexDirection.Column}
           gap={2}
         >
-          <Text variant={TextVariant.bodyMd}>
+          <Text variant={TextVariant.BodyMd}>
             {t('downloadMetaMaskMobileDescription')}
           </Text>
           <Box
-            className="download-mobile-app-modal__qr-code-wrapper"
-            width={BlockSize.Full}
-            display={Display.Flex}
-            justifyContent={JustifyContent.center}
-            alignItems={AlignItems.center}
+            className="mx-auto w-fit rounded-2xl"
+            flexDirection={BoxFlexDirection.Row}
+            justifyContent={BoxJustifyContent.Center}
+            alignItems={BoxAlignItems.Center}
             borderWidth={1}
-            paddingInline={0}
-            paddingTop={3}
-            paddingBottom={3}
-            borderColor={BorderColor.borderMuted}
-            style={{
-              borderRadius: '16px',
-            }}
+            padding={3}
+            borderColor={BoxBorderColor.BorderMuted}
           >
             <img
               src="images/download-mobile-app-qr-code.png"
               width={300}
               height={300}
               alt={t('downloadMetaMaskMobileTitle')}
-              style={{
-                alignSelf: 'center',
-              }}
+              className="block"
             />
           </Box>
-          <Box
-            display={Display.Flex}
-            justifyContent={JustifyContent.center}
-          ></Box>
-          <Text variant={TextVariant.bodyMd} textAlign={TextAlign.Center}>
+          <Text variant={TextVariant.BodyMd} textAlign={TextAlign.Center}>
             {t('downloadMetaMaskMobileQrNote')}
           </Text>
         </Box>
diff --git a/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx b/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx
index 848eec40daaf..8cd3973c265d 100644
--- a/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx
+++ b/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx
@@ -186,6 +186,8 @@ export const BackupAndSyncFeaturesToggles = () => {
     <Box
       marginTop={4}
       marginBottom={4}
+      paddingLeft={4}
+      paddingRight={4}
       className="privacy-settings__setting__wrapper"
       data-testid={backupAndSyncFeaturesTogglesTestIds.container}
     >
@@ -193,7 +195,7 @@ export const BackupAndSyncFeaturesToggles = () => {
         {t('backupAndSyncManageWhatYouSync')}
       </Text>
       <Text
-        variant={TextVariant.bodySm}
+        variant={TextVariant.bodyMd}
         color={TextColor.textAlternative}
         as="div"
         marginBottom={4}
diff --git a/ui/components/app/identity/backup-and-sync-toggle/backup-and-sync-toggle.tsx b/ui/components/app/identity/backup-and-sync-toggle/backup-and-sync-toggle.tsx
index 6b176dd95ca4..6aa300830420 100644
--- a/ui/components/app/identity/backup-and-sync-toggle/backup-and-sync-toggle.tsx
+++ b/ui/components/app/identity/backup-and-sync-toggle/backup-and-sync-toggle.tsx
@@ -192,6 +192,8 @@ export const BackupAndSyncToggle = () => {
     <Box
       marginTop={4}
       marginBottom={4}
+      paddingLeft={4}
+      paddingRight={4}
       className="privacy-settings__setting__wrapper"
       id="backup-and-sync-toggle"
       data-testid={backupAndSyncToggleTestIds.container}
@@ -225,14 +227,14 @@ export const BackupAndSyncToggle = () => {
       </Box>
       <div className="privacy-settings__setting__description">
         <Text
-          variant={TextVariant.bodySm}
+          variant={TextVariant.bodyMd}
           color={TextColor.textAlternative}
           as="div"
         >
           {t('backupAndSyncEnableDescription', [
             <Text
               as="a"
-              variant={TextVariant.bodySm}
+              variant={TextVariant.bodyMd}
               href={ZENDESK_URLS.PROFILE_PRIVACY}
               target="_blank"
               rel="noopener noreferrer"
diff --git a/ui/components/app/modals/add-funds-modal/add-funds-modal.test.tsx b/ui/components/app/modals/add-funds-modal/add-funds-modal.test.tsx
index c55b8691fc57..0aa6733422ad 100644
--- a/ui/components/app/modals/add-funds-modal/add-funds-modal.test.tsx
+++ b/ui/components/app/modals/add-funds-modal/add-funds-modal.test.tsx
@@ -10,9 +10,9 @@ describe('Add funds modal Component', () => {
   const defaultState = {
     metamask: {
       ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
+      selectedAccountGroup: null,
       accountTree: {
         wallets: {},
-        selectedAccountGroup: null,
       },
       enabledNetworkMap: {
         eip155: {
diff --git a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap
index 6610f8035658..18a9a4e52bd9 100644
--- a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap
+++ b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap
@@ -19,7 +19,7 @@ exports[`Confirm Reset Account should match snapshot 1`] = `
         <div
           class="modal-content__description"
         >
-          This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.
+          Resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.
         </div>
       </div>
     </div>
diff --git a/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.test.tsx b/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.test.tsx
index 05d87c1b641a..90d56afdca31 100644
--- a/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.test.tsx
+++ b/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.test.tsx
@@ -1,10 +1,29 @@
 import React from 'react';
 import { render, fireEvent, waitFor, act } from '@testing-library/react';
-import { ErrorCode, type HardwareWalletError } from '@metamask/hw-wallet-sdk';
+import { Provider } from 'react-redux';
+import {
+  MemoryRouter,
+  type MemoryRouterProps,
+  Route,
+  Routes,
+} from 'react-router-dom';
+import {
+  Category,
+  ErrorCode,
+  HardwareWalletError,
+  Severity,
+  type HardwareWalletError as HardwareWalletErrorType,
+} from '@metamask/hw-wallet-sdk';
+import { getMockContractInteractionConfirmState } from '../../../../../test/data/confirmations/helper';
+import { MetaMetricsEventName } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import { createHardwareWalletError } from '../../../../contexts/hardware-wallets/errors';
 import { HardwareWalletType } from '../../../../contexts/hardware-wallets/types';
+import configureStore from '../../../../store/store';
 import { HardwareWalletErrorModal } from './hardware-wallet-error-modal';
 
+const mockTrackEvent = jest.fn();
+
 const mockHideModal = jest.fn();
 jest.mock('../../../../hooks/useModalProps', () => ({
   useModalProps: () => ({
@@ -36,7 +55,7 @@ const createTestError = (
   code: ErrorCode,
   message: string,
   userMessage?: string,
-): HardwareWalletError => {
+): HardwareWalletErrorType => {
   return createHardwareWalletError(
     code,
     'ledger' as HardwareWalletType,
@@ -44,6 +63,56 @@ const createTestError = (
   );
 };
 
+const metricsProviderValue = {
+  trackEvent: mockTrackEvent,
+  bufferedTrace: jest.fn(),
+  bufferedEndTrace: jest.fn(),
+  onboardingParentContext: { current: null },
+};
+
+const memoryRouterFuture = {
+  ['v7_startTransition' as keyof NonNullable<MemoryRouterProps['future']>]:
+    true,
+  ['v7_relativeSplatPath' as keyof NonNullable<MemoryRouterProps['future']>]:
+    true,
+} as NonNullable<MemoryRouterProps['future']>;
+
+/**
+ * `HardwareWalletErrorModal` uses {@link useHardwareWalletRecoveryLocation}, which needs
+ * React Router and Redux. Default route `/` yields `Send`, matching prior mock behavior.
+ * @param store
+ * @param ui
+ */
+function wrapHardwareWalletModalTree(
+  store: ReturnType<typeof configureStore>,
+  ui: React.ReactElement,
+) {
+  return (
+    <Provider store={store}>
+      <MemoryRouter initialEntries={['/']} future={memoryRouterFuture}>
+        <Routes>
+          <Route
+            path="*"
+            element={
+              <MetaMetricsContext.Provider value={metricsProviderValue}>
+                {ui}
+              </MetaMetricsContext.Provider>
+            }
+          />
+        </Routes>
+      </MemoryRouter>
+    </Provider>
+  );
+}
+
+function renderWithMetrics(ui: React.ReactElement) {
+  const store = configureStore(getMockContractInteractionConfirmState());
+  return {
+    store,
+    ...render(wrapHardwareWalletModalTree(store, ui)),
+  };
+}
+
 describe('HardwareWalletErrorModal', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -61,7 +130,9 @@ describe('HardwareWalletErrorModal', () => {
         'Your Ledger device is locked. Please unlock it to continue.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleDeviceLocked]'),
@@ -76,7 +147,7 @@ describe('HardwareWalletErrorModal', () => {
 
     it('renders nothing when error is not provided', () => {
       const onClose = jest.fn();
-      const { container } = render(
+      const { container } = renderWithMetrics(
         <HardwareWalletErrorModal onClose={onClose} />,
       );
 
@@ -95,13 +166,80 @@ describe('HardwareWalletErrorModal', () => {
         walletType: null,
       });
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleDeviceLocked]'),
       ).toBeInTheDocument();
     });
 
+    it('renders modal but skips tracking when wallet type is unknown', async () => {
+      const error = new HardwareWalletError('Device is locked', {
+        code: ErrorCode.AuthenticationDeviceLocked,
+        severity: Severity.Info,
+        category: Category.Unknown,
+        userMessage: 'Your device is locked.',
+      });
+      mockUseHardwareWalletConfig.mockReturnValue({
+        walletType: HardwareWalletType.Unknown,
+      });
+
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
+
+      expect(
+        getByText('[hardwareWalletErrorTitleDeviceLocked]'),
+      ).toBeInTheDocument();
+
+      await waitFor(() => {
+        expect(mockTrackEvent).not.toHaveBeenCalled();
+      });
+    });
+
+    it('tracks modal viewed if wallet type becomes known after initial unknown render', async () => {
+      const error = new HardwareWalletError('Device is locked', {
+        code: ErrorCode.AuthenticationDeviceLocked,
+        severity: Severity.Info,
+        category: Category.Unknown,
+        userMessage: 'Your device is locked.',
+      });
+      mockUseHardwareWalletConfig.mockReturnValue({
+        walletType: HardwareWalletType.Unknown,
+      });
+
+      const { rerender, store } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
+
+      await waitFor(() => {
+        expect(mockTrackEvent).not.toHaveBeenCalled();
+      });
+
+      mockUseHardwareWalletConfig.mockReturnValue({
+        walletType: HardwareWalletType.Ledger,
+      });
+
+      rerender(
+        wrapHardwareWalletModalTree(
+          store,
+          <HardwareWalletErrorModal error={error} />,
+        ),
+      );
+
+      await waitFor(() => {
+        const modalViewed = mockTrackEvent.mock.calls.filter(
+          (call) =>
+            call[0].event ===
+            MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+        );
+        expect(modalViewed).toHaveLength(1);
+        expect(modalViewed[0][0].properties.error_type_view_count).toBe(1);
+      });
+    });
+
     it('renders nothing for user-rejected errors', () => {
       const error = createTestError(
         ErrorCode.UserCancelled,
@@ -109,7 +247,7 @@ describe('HardwareWalletErrorModal', () => {
         'You cancelled the operation.',
       );
       const onCancel = jest.fn();
-      const { container } = render(
+      const { container } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} onCancel={onCancel} />,
       );
 
@@ -128,7 +266,9 @@ describe('HardwareWalletErrorModal', () => {
         'Your device is locked.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleDeviceLocked]'),
@@ -148,7 +288,9 @@ describe('HardwareWalletErrorModal', () => {
         'Blind sign not supported.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleBlindSignNotSupported]'),
@@ -172,7 +314,9 @@ describe('HardwareWalletErrorModal', () => {
         'Please open the Ethereum app.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletTitleEthAppNotOpen]'),
@@ -189,7 +333,9 @@ describe('HardwareWalletErrorModal', () => {
         'Device not found.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleConnectYourDevice]'),
@@ -212,7 +358,9 @@ describe('HardwareWalletErrorModal', () => {
         'Connection lost.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleConnectYourDevice]'),
@@ -232,7 +380,9 @@ describe('HardwareWalletErrorModal', () => {
         'Unknown error.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorUnknownErrorDescription]'),
@@ -250,7 +400,7 @@ describe('HardwareWalletErrorModal', () => {
       const onRetry = jest.fn();
       const onCancel = jest.fn();
 
-      const { getByText, queryByText } = render(
+      const { getByText, queryByText } = renderWithMetrics(
         <HardwareWalletErrorModal
           error={error}
           onRetry={onRetry}
@@ -272,7 +422,7 @@ describe('HardwareWalletErrorModal', () => {
       );
       const onCancel = jest.fn();
 
-      const { getByText, queryByText } = render(
+      const { getByText, queryByText } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} onCancel={onCancel} />,
       );
 
@@ -290,7 +440,7 @@ describe('HardwareWalletErrorModal', () => {
       );
       const onCancel = jest.fn();
 
-      const { getByText, queryByText } = render(
+      const { getByText, queryByText } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} onCancel={onCancel} />,
       );
 
@@ -309,7 +459,7 @@ describe('HardwareWalletErrorModal', () => {
       const onRetry = jest.fn();
       const onCancel = jest.fn();
 
-      const { getByText } = render(
+      const { getByText } = renderWithMetrics(
         <HardwareWalletErrorModal
           error={error}
           onRetry={onRetry}
@@ -328,6 +478,88 @@ describe('HardwareWalletErrorModal', () => {
       expect(mockSetConnectionReady).toHaveBeenCalledTimes(1);
     });
 
+    it('tracks incremented modal view count when reconnect fails', async () => {
+      mockEnsureDeviceReady.mockResolvedValue(false);
+      const error = createTestError(
+        ErrorCode.DeviceDisconnected,
+        'Device disconnected',
+        'Device not found.',
+      );
+
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
+
+      await waitFor(() => {
+        const modalViewed = mockTrackEvent.mock.calls.filter(
+          (call) =>
+            call[0].event ===
+            MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+        );
+        expect(modalViewed).toHaveLength(1);
+        expect(modalViewed[0][0].properties.error_type_view_count).toBe(1);
+      });
+
+      await act(async () => {
+        fireEvent.click(getByText('[hardwareWalletErrorContinueButton]'));
+      });
+
+      await waitFor(() => {
+        const modalViewed = mockTrackEvent.mock.calls.filter(
+          (call) =>
+            call[0].event ===
+            MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+        );
+        expect(modalViewed.length).toBeGreaterThanOrEqual(2);
+        expect(
+          modalViewed[modalViewed.length - 1][0].properties
+            .error_type_view_count,
+        ).toBe(2);
+      });
+    });
+
+    it('tracks modal viewed again after error clears and is shown again', async () => {
+      const error = createTestError(
+        ErrorCode.DeviceDisconnected,
+        'Device disconnected',
+        'Device not found.',
+      );
+
+      const { rerender, store } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
+
+      await waitFor(() => {
+        expect(
+          mockTrackEvent.mock.calls.some(
+            (call) =>
+              call[0].event ===
+              MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+          ),
+        ).toBe(true);
+      });
+
+      rerender(
+        wrapHardwareWalletModalTree(store, <HardwareWalletErrorModal />),
+      );
+
+      rerender(
+        wrapHardwareWalletModalTree(
+          store,
+          <HardwareWalletErrorModal error={error} />,
+        ),
+      );
+
+      await waitFor(() => {
+        const modalViewed = mockTrackEvent.mock.calls.filter(
+          (call) =>
+            call[0].event ===
+            MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+        );
+        expect(modalViewed.length).toBeGreaterThanOrEqual(2);
+      });
+    });
+
     it('handles Confirm button click for non-retryable errors', async () => {
       const error = createTestError(
         ErrorCode.Unknown,
@@ -336,7 +568,7 @@ describe('HardwareWalletErrorModal', () => {
       );
       const onCancel = jest.fn();
 
-      const { getByText } = render(
+      const { getByText } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} onCancel={onCancel} />,
       );
 
@@ -360,7 +592,7 @@ describe('HardwareWalletErrorModal', () => {
 
       mockEnsureDeviceReady.mockResolvedValueOnce(true);
 
-      const { getByText, rerender } = render(
+      const { getByText, rerender, store } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} />,
       );
 
@@ -368,7 +600,12 @@ describe('HardwareWalletErrorModal', () => {
         fireEvent.click(getByText('[hardwareWalletErrorReconnectButton]'));
       });
 
-      rerender(<HardwareWalletErrorModal error={error} />);
+      rerender(
+        wrapHardwareWalletModalTree(
+          store,
+          <HardwareWalletErrorModal error={error} />,
+        ),
+      );
 
       expect(getByText('[hardwareWalletTypeConnected]')).toBeInTheDocument();
       expect(mockSetConnectionReady).toHaveBeenCalledTimes(1);
@@ -383,7 +620,7 @@ describe('HardwareWalletErrorModal', () => {
 
       mockEnsureDeviceReady.mockResolvedValueOnce(true);
 
-      const { getByText, getByLabelText } = render(
+      const { getByText, getByLabelText } = renderWithMetrics(
         <HardwareWalletErrorModal error={error} />,
       );
 
@@ -411,7 +648,9 @@ describe('HardwareWalletErrorModal', () => {
 
       mockEnsureDeviceReady.mockResolvedValueOnce(true);
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       await act(async () => {
         fireEvent.click(getByText('[hardwareWalletErrorReconnectButton]'));
@@ -438,7 +677,9 @@ describe('HardwareWalletErrorModal', () => {
         'Your device is locked.',
       );
 
-      const { getByText } = render(<HardwareWalletErrorModal error={error} />);
+      const { getByText } = renderWithMetrics(
+        <HardwareWalletErrorModal error={error} />,
+      );
 
       expect(
         getByText('[hardwareWalletErrorTitleDeviceLocked]'),
diff --git a/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.tsx b/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.tsx
index 71e47d8218ab..dc35dd995883 100644
--- a/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.tsx
+++ b/ui/components/app/modals/hardware-wallet-error-modal/hardware-wallet-error-modal.tsx
@@ -1,4 +1,11 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { ErrorCode, type HardwareWalletError } from '@metamask/hw-wallet-sdk';
 import {
   Text,
@@ -29,14 +36,26 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useModalProps } from '../../../../hooks/useModalProps';
+import { useHardwareWalletRecoveryLocation } from '../../../../hooks/useHardwareWalletRecoveryLocation';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
+import {
+  buildHardwareWalletRecoverySegmentProperties,
+  getHardwareWalletMetricDeviceModel,
+  mapHardwareWalletRecoveryErrorType,
+  mapHardwareWalletTypeToMetricDeviceType,
+} from '../../../../../shared/lib/hardware-wallet-recovery-metrics';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   HardwareWalletType,
+  getHardwareWalletErrorCode,
   isUserRejectedHardwareWalletError,
   isRetryableHardwareWalletError,
   useHardwareWalletActions,
   useHardwareWalletConfig,
 } from '../../../../contexts/hardware-wallets';
-// HardwareWalletType is used as a default fallback when walletType cannot be extracted
 import { buildErrorContent } from './error-content-builder';
 
 type HardwareWalletErrorModalProps = {
@@ -57,26 +76,162 @@ const RECOVERY_SUCCESS_AUTO_DISMISS_MS = 3000;
 export const HardwareWalletErrorModal: React.FC<HardwareWalletErrorModalProps> =
   React.memo((props) => {
     const t = useI18nContext();
+    const { trackEvent } = useContext(MetaMetricsContext);
+    const recoveryLocation = useHardwareWalletRecoveryLocation();
     const { hideModal, props: modalProps } = useModalProps();
     const [isLoading, setIsLoading] = useState(false);
     const [recovered, setRecovered] = useState(false);
     const recoveredDismissTimeoutRef = useRef<ReturnType<
       typeof setTimeout
     > | null>(null);
+    const errorTypeViewCountRef = useRef(0);
+    const lastTrackedErrorKeyRef = useRef<string | null>(null);
+    const prevNonNullErrorIdentityKeyRef = useRef<string | null>(null);
+    const successModalMetricSentRef = useRef(false);
     const { error, onClose, onCancel, onRetry } = { ...modalProps, ...props };
 
     const { walletType: selectedAccountWalletType } = useHardwareWalletConfig();
     const { ensureDeviceReady, clearError, setConnectionReady } =
       useHardwareWalletActions();
 
+    // Prefer `walletType` from error metadata first (e.g. signature flows where the signing
+    // account may differ from the selected account). Read both top-level `metadata` and RPC-style
+    // `data.metadata`. Then selected account, then Ledger so copy/icons still resolve if metadata is missing.
+    const errorMetadata =
+      error === undefined
+        ? undefined
+        : ((error as { metadata?: { walletType?: HardwareWalletType } })
+            .metadata ??
+          (
+            error as {
+              data?: { metadata?: { walletType?: HardwareWalletType } };
+            }
+          ).data?.metadata);
+    const errorWalletType = errorMetadata?.walletType;
+    const displayWalletType = useMemo(
+      () =>
+        errorWalletType ??
+        selectedAccountWalletType ??
+        HardwareWalletType.Ledger,
+      [errorWalletType, selectedAccountWalletType],
+    );
+    const trackableMetricDeviceType = useMemo(
+      () =>
+        mapHardwareWalletTypeToMetricDeviceType(
+          errorWalletType ?? selectedAccountWalletType,
+        ),
+      [errorWalletType, selectedAccountWalletType],
+    );
+
+    const isUserRejectedError =
+      error !== undefined && isUserRejectedHardwareWalletError(error);
+
+    const errorIdentityKey = useMemo(() => {
+      if (!error) {
+        return null;
+      }
+      const code = getHardwareWalletErrorCode(error);
+      return `${recoveryLocation}:${String(code)}:${mapHardwareWalletRecoveryErrorType(error)}`;
+    }, [error, recoveryLocation]);
+
+    useEffect(() => {
+      setRecovered(false);
+      successModalMetricSentRef.current = false;
+
+      if (errorIdentityKey === null) {
+        prevNonNullErrorIdentityKeyRef.current = null;
+        return;
+      }
+
+      if (
+        prevNonNullErrorIdentityKeyRef.current !== null &&
+        prevNonNullErrorIdentityKeyRef.current !== errorIdentityKey
+      ) {
+        errorTypeViewCountRef.current = 0;
+      }
+      prevNonNullErrorIdentityKeyRef.current = errorIdentityKey;
+    }, [errorIdentityKey]);
+
+    useEffect(() => {
+      if (error) {
+        return;
+      }
+      lastTrackedErrorKeyRef.current = null;
+    }, [error]);
+
+    useEffect(() => {
+      if (!error || isUserRejectedError || !errorIdentityKey) {
+        return;
+      }
+      if (!trackableMetricDeviceType) {
+        return;
+      }
+      if (lastTrackedErrorKeyRef.current === errorIdentityKey) {
+        return;
+      }
+      lastTrackedErrorKeyRef.current = errorIdentityKey;
+      errorTypeViewCountRef.current += 1;
+      const deviceModel = getHardwareWalletMetricDeviceModel(error);
+      trackEvent({
+        category: MetaMetricsEventCategory.Accounts,
+        event: MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+        properties: buildHardwareWalletRecoverySegmentProperties({
+          location: recoveryLocation,
+          deviceType: trackableMetricDeviceType,
+          deviceModel,
+          errorType: mapHardwareWalletRecoveryErrorType(error),
+          errorTypeViewCount: errorTypeViewCountRef.current,
+          error,
+        }),
+      });
+    }, [
+      error,
+      errorIdentityKey,
+      isUserRejectedError,
+      recoveryLocation,
+      trackableMetricDeviceType,
+      trackEvent,
+    ]);
+
     const handleRetry = async () => {
       onRetry?.();
+      if (error && trackableMetricDeviceType) {
+        const deviceModel = getHardwareWalletMetricDeviceModel(error);
+        trackEvent({
+          category: MetaMetricsEventCategory.Accounts,
+          event: MetaMetricsEventName.HardwareWalletRecoveryCtaClicked,
+          properties: buildHardwareWalletRecoverySegmentProperties({
+            location: recoveryLocation,
+            deviceType: trackableMetricDeviceType,
+            deviceModel,
+            errorType: mapHardwareWalletRecoveryErrorType(error),
+            errorTypeViewCount: errorTypeViewCountRef.current,
+            error,
+          }),
+        });
+      }
+
       setIsLoading(true);
       try {
         const result = await ensureDeviceReady();
         if (result) {
           setConnectionReady();
           setRecovered(true);
+        } else if (error && trackableMetricDeviceType) {
+          errorTypeViewCountRef.current += 1;
+          const deviceModel = getHardwareWalletMetricDeviceModel(error);
+          trackEvent({
+            category: MetaMetricsEventCategory.Accounts,
+            event: MetaMetricsEventName.HardwareWalletRecoveryModalViewed,
+            properties: buildHardwareWalletRecoverySegmentProperties({
+              location: recoveryLocation,
+              deviceType: trackableMetricDeviceType,
+              deviceModel,
+              errorType: mapHardwareWalletRecoveryErrorType(error),
+              errorTypeViewCount: errorTypeViewCountRef.current,
+              error,
+            }),
+          });
         }
       } finally {
         setIsLoading(false);
@@ -112,8 +267,37 @@ export const HardwareWalletErrorModal: React.FC<HardwareWalletErrorModalProps> =
       };
     }, [handleRecoveredClose, recovered]);
 
-    const isUserRejectedError =
-      error !== undefined && isUserRejectedHardwareWalletError(error);
+    useEffect(() => {
+      if (!recovered || !error || successModalMetricSentRef.current) {
+        return;
+      }
+      if (!trackableMetricDeviceType) {
+        return;
+      }
+      successModalMetricSentRef.current = true;
+      const deviceModel = getHardwareWalletMetricDeviceModel(error);
+      trackEvent({
+        category: MetaMetricsEventCategory.Accounts,
+        event: MetaMetricsEventName.HardwareWalletRecoverySuccessModalViewed,
+        properties: buildHardwareWalletRecoverySegmentProperties({
+          location: recoveryLocation,
+          deviceType: trackableMetricDeviceType,
+          deviceModel,
+          errorType: mapHardwareWalletRecoveryErrorType(error),
+          errorTypeViewCount: errorTypeViewCountRef.current,
+          error,
+        }),
+      });
+      lastTrackedErrorKeyRef.current = null;
+      errorTypeViewCountRef.current = 0;
+      prevNonNullErrorIdentityKeyRef.current = null;
+    }, [
+      error,
+      recovered,
+      recoveryLocation,
+      trackEvent,
+      trackableMetricDeviceType,
+    ]);
 
     useEffect(() => {
       if (!isUserRejectedError) {
@@ -141,22 +325,6 @@ export const HardwareWalletErrorModal: React.FC<HardwareWalletErrorModalProps> =
       return null;
     }
 
-    // Get wallet type from error metadata first (for signature flows where
-    // the signing account may differ from the selected account), then fall
-    // back to the selected account's wallet type.
-    // Handle both direct metadata and RPC error format (data.metadata)
-    const errorMetadata =
-      (error as { metadata?: { walletType?: HardwareWalletType } }).metadata ??
-      (error as { data?: { metadata?: { walletType?: HardwareWalletType } } })
-        .data?.metadata;
-    const errorWalletType = errorMetadata?.walletType;
-
-    // Use errorWalletType, then selectedAccountWalletType, then default to Ledger
-    // as a fallback since most hardware wallet users are Ledger users.
-    // This ensures the modal always shows rather than silently closing.
-    const displayWalletType =
-      errorWalletType ?? selectedAccountWalletType ?? HardwareWalletType.Ledger;
-
     const errorContent = buildErrorContent(
       error,
       displayWalletType,
diff --git a/ui/components/app/musd/claim-bonus-badge.test.tsx b/ui/components/app/musd/claim-bonus-badge.test.tsx
index 11d45eae56a9..0bf5853dd1c5 100644
--- a/ui/components/app/musd/claim-bonus-badge.test.tsx
+++ b/ui/components/app/musd/claim-bonus-badge.test.tsx
@@ -65,6 +65,7 @@ jest.mock('../../../contexts/metametrics', () => {
     __mockTrackEvent: _trackEvent,
   };
 });
+
 const { __mockTrackEvent: mockTrackEvent } = jest.requireMock<{
   // eslint-disable-next-line @typescript-eslint/naming-convention
   __mockTrackEvent: jest.Mock;
@@ -75,7 +76,7 @@ const defaultProps = {
   tokenAddress: '0xabc123',
   chainId: '0x1' as const,
   refetchRewards: jest.fn(),
-  location: 'token_list_item' as const,
+  analyticsLocation: 'token_list_item' as const,
   assetSymbol: 'MUSD',
   bonusAmountRange: '10.00 - 99.99',
   hasClaimedBefore: false,
@@ -155,6 +156,38 @@ describe('ClaimBonusBadge', () => {
     expect(mockClaimRewards).toHaveBeenCalledTimes(1);
   });
 
+  it('tracks claim click with token_list_item location', () => {
+    render(<ClaimBonusBadge {...defaultProps} />);
+
+    fireEvent.click(screen.getByRole('button'));
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          location: 'token_list_item',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          network_chain_id: '0x1',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          network_name: 'Ethereum Mainnet',
+        }),
+      }),
+    );
+  });
+
+  it('tracks claim click with asset_overview location when provided', () => {
+    render(
+      <ClaimBonusBadge {...defaultProps} analyticsLocation="asset_overview" />,
+    );
+
+    fireEvent.click(screen.getByRole('button'));
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({ location: 'asset_overview' }),
+      }),
+    );
+  });
+
   it('renders spinner when isClaiming is true', () => {
     mockUseMerklClaim.mockReturnValue({
       claimRewards: mockClaimRewards,
diff --git a/ui/components/app/musd/claim-bonus-badge.tsx b/ui/components/app/musd/claim-bonus-badge.tsx
index bd9afcaef422..1ec32dd8269c 100644
--- a/ui/components/app/musd/claim-bonus-badge.tsx
+++ b/ui/components/app/musd/claim-bonus-badge.tsx
@@ -1,30 +1,29 @@
-import React, { useCallback, useContext, useEffect, useRef } from 'react';
-import type { Hex } from '@metamask/utils';
-import { useSelector } from 'react-redux';
 import {
-  Text,
-  TextVariant,
-  TextColor,
   FontWeight,
   Icon,
+  IconColor,
   IconName,
   IconSize,
-  IconColor,
+  Text,
+  TextColor,
+  TextVariant,
 } from '@metamask/design-system-react';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
+import type { Hex } from '@metamask/utils';
+import React, { useCallback, useContext, useEffect, useRef } from 'react';
+import { useSelector } from 'react-redux';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getMultichainNetworkConfigurationsByChainId } from '../../../selectors/multichain';
 import { useMerklClaim } from './hooks/useMerklClaim';
 import { useOnMerklClaimConfirmed } from './hooks/useOnMerklClaimConfirmed';
 import {
-  MUSD_EVENTS_CONSTANTS,
+  type MerklClaimBonusAnalyticsLocation,
   type MusdClaimBonusButtonClickedEventProperties,
   type MusdClaimBonusCtaDisplayedEventProperties,
-  type MusdMerklClaimCtaLocation,
 } from './musd-events';
 
 export const ClaimBonusBadge = ({
@@ -32,7 +31,7 @@ export const ClaimBonusBadge = ({
   tokenAddress,
   chainId,
   refetchRewards,
-  location,
+  analyticsLocation,
   assetSymbol,
   bonusAmountRange,
   hasClaimedBefore,
@@ -41,7 +40,7 @@ export const ClaimBonusBadge = ({
   tokenAddress: string;
   chainId: Hex;
   refetchRewards: () => void;
-  location: MusdMerklClaimCtaLocation;
+  analyticsLocation: MerklClaimBonusAnalyticsLocation;
   assetSymbol: string;
   bonusAmountRange: string;
   hasClaimedBefore: boolean;
@@ -78,7 +77,7 @@ export const ClaimBonusBadge = ({
 
     /* eslint-disable @typescript-eslint/naming-convention */
     const impressionProperties: MusdClaimBonusCtaDisplayedEventProperties = {
-      location,
+      location: analyticsLocation,
       view_trigger: 'component_mounted',
       button_text: label,
       network_chain_id: chainId,
@@ -102,7 +101,7 @@ export const ClaimBonusBadge = ({
     hasClaimedBefore,
     isClaiming,
     label,
-    location,
+    analyticsLocation,
     networkName,
     trackEvent,
   ]);
@@ -114,8 +113,7 @@ export const ClaimBonusBadge = ({
 
       /* eslint-disable @typescript-eslint/naming-convention */
       const eventProperties: MusdClaimBonusButtonClickedEventProperties = {
-        location:
-          MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.CLAIM_BONUS_BOTTOM_SHEET,
+        location: analyticsLocation,
         claim_amount: label,
         network_chain_id: chainId,
         network_name: networkName,
@@ -131,7 +129,7 @@ export const ClaimBonusBadge = ({
 
       claimRewards();
     },
-    [claimRewards, trackEvent, label, chainId, networkName],
+    [claimRewards, trackEvent, label, chainId, networkName, analyticsLocation],
   );
 
   if (isClaiming) {
diff --git a/ui/components/app/musd/hooks/useMerklRewards.test.ts b/ui/components/app/musd/hooks/useMerklRewards.test.ts
index 4613f34602b5..32ef58f39fce 100644
--- a/ui/components/app/musd/hooks/useMerklRewards.test.ts
+++ b/ui/components/app/musd/hooks/useMerklRewards.test.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderHook, act, cleanup } from '@testing-library/react-hooks';
+import { renderHook, cleanup } from '@testing-library/react-hooks';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import * as merklClient from '../merkl-client';
 import {
@@ -114,13 +114,7 @@ describe('useMerklRewards', () => {
       typeof merklClient.getClaimedAmountFromContract
     >;
 
-  afterEach(async () => {
-    // Flush pending TanStack Query observer notification microtasks BEFORE
-    // the testing library unmounts hooks, preventing "state update on
-    // unmounted component" warnings from deferred scheduleMicrotask calls.
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
+  afterEach(() => {
     cleanup();
     queryClient.clear();
     jest.restoreAllMocks();
@@ -210,7 +204,7 @@ describe('useMerklRewards', () => {
     // On-chain read returns null → fallback to API claimed value (0)
     mockGetClaimedAmountFromContract.mockResolvedValueOnce(null);
 
-    const { result, waitForNextUpdate } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -220,11 +214,10 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await waitForNextUpdate();
+    await waitFor(() => {
+      expect(result.current.hasClaimableReward).toBe(true);
     });
 
-    expect(result.current.hasClaimableReward).toBe(true);
     expect(result.current.rewardAmountFiat).toBe(10.5);
     expect(result.current.hasClaimedBefore).toBe(false);
     expect(result.current.claimableRewardDisplay).toBe('10.50');
@@ -248,7 +241,7 @@ describe('useMerklRewards', () => {
     // On-chain read says 5.5 MUSD already claimed
     mockGetClaimedAmountFromContract.mockResolvedValueOnce('5500000');
 
-    const { result, waitForNextUpdate } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -258,12 +251,11 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await waitForNextUpdate();
+    // 10.5 - 5.5 = 5.0 MUSD claimable
+    await waitFor(() => {
+      expect(result.current.hasClaimableReward).toBe(true);
     });
 
-    // 10.5 - 5.5 = 5.0 MUSD claimable
-    expect(result.current.hasClaimableReward).toBe(true);
     expect(result.current.rewardAmountFiat).toBe(5.0);
     expect(result.current.hasClaimedBefore).toBe(true);
     expect(result.current.claimableRewardDisplay).toBe('5.00');
@@ -291,7 +283,7 @@ describe('useMerklRewards', () => {
     // On-chain says all claimed
     mockGetClaimedAmountFromContract.mockResolvedValueOnce('1000000');
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -301,20 +293,19 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+    await waitFor(() => {
+      expect(result.current.hasClaimedBefore).toBe(true);
     });
 
     expect(result.current.hasClaimableReward).toBe(false);
     expect(result.current.rewardAmountFiat).toBeNull();
-    expect(result.current.hasClaimedBefore).toBe(true);
     expect(result.current.claimableRewardDisplay).toBeNull();
   });
 
   it('returns false when API returns no matching reward', async () => {
     mockFetchMerklRewardsForAsset.mockResolvedValueOnce(null);
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -324,12 +315,10 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    // Allow the query to execute and resolve
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+    await waitFor(() => {
+      expect(mockFetchMerklRewardsForAsset).toHaveBeenCalled();
     });
 
-    expect(mockFetchMerklRewardsForAsset).toHaveBeenCalled();
     expect(result.current.hasClaimableReward).toBe(false);
     expect(result.current.rewardAmountFiat).toBeNull();
     expect(result.current.hasClaimedBefore).toBe(false);
@@ -352,7 +341,7 @@ describe('useMerklRewards', () => {
       recipient: MOCK_ADDRESS,
     });
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -362,12 +351,11 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+    await waitFor(() => {
+      expect(result.current.hasClaimedBefore).toBe(true);
     });
 
     expect(result.current.hasClaimableReward).toBe(false);
-    expect(result.current.hasClaimedBefore).toBe(true);
     expect(result.current.claimableRewardDisplay).toBeNull();
   });
 
@@ -377,7 +365,7 @@ describe('useMerklRewards', () => {
       new Error('Network error'),
     );
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -387,8 +375,10 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+    // Wait for the rejected promise to be processed — the mock being called
+    // proves react-query ran the queryFn and settled (not just default state).
+    await waitFor(() => {
+      expect(mockFetchMerklRewardsForAsset).toHaveBeenCalled();
     });
 
     expect(result.current.hasClaimableReward).toBe(false);
@@ -432,7 +422,7 @@ describe('useMerklRewards', () => {
     });
     mockGetClaimedAmountFromContract.mockResolvedValueOnce(null);
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -442,8 +432,8 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
+    await waitFor(() => {
+      expect(mockFetchMerklRewardsForAsset).toHaveBeenCalled();
     });
 
     expect(result.current.hasClaimableReward).toBe(false);
@@ -468,7 +458,7 @@ describe('useMerklRewards', () => {
     });
     mockGetClaimedAmountFromContract.mockResolvedValueOnce(null);
 
-    const { result, waitForNextUpdate } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -478,23 +468,24 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await waitForNextUpdate();
+    await waitFor(() => {
+      expect(result.current.hasClaimableReward).toBe(true);
     });
 
-    expect(result.current.hasClaimableReward).toBe(true);
     expect(result.current.rewardAmountFiat).toBe(0.01);
     expect(result.current.hasClaimedBefore).toBe(false);
     expect(result.current.claimableRewardDisplay).toBe('0.01');
   });
 
-  it('returns false and skips API call when user is geoblocked', async () => {
+  it('returns false and skips API call when user is geoblocked', () => {
     useMusdGeoBlocking.mockReturnValue({
       isBlocked: true,
       userCountry: 'GB',
       isLoading: false,
     });
 
+    // Query is disabled when geoblocked (enabled: false), so state is
+    // synchronous — no async cycle to wait for.
     const { result } = renderHook(
       () =>
         useMerklRewards({
@@ -505,10 +496,6 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-
     expect(result.current.hasClaimableReward).toBe(false);
     expect(result.current.hasClaimedBefore).toBe(false);
     expect(result.current.claimableRewardDisplay).toBeNull();
@@ -533,7 +520,7 @@ describe('useMerklRewards', () => {
       recipient: MOCK_ADDRESS,
     });
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -543,12 +530,11 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    // Falls back to API value (claimed=0), so full amount is claimable
+    await waitFor(() => {
+      expect(result.current.hasClaimableReward).toBe(true);
     });
 
-    // Falls back to API value (claimed=0), so full amount is claimable
-    expect(result.current.hasClaimableReward).toBe(true);
     expect(result.current.rewardAmountFiat).toBe(10.5);
     expect(result.current.hasClaimedBefore).toBe(false);
     expect(result.current.claimableRewardDisplay).toBe('10.50');
@@ -571,7 +557,7 @@ describe('useMerklRewards', () => {
     });
     mockGetClaimedAmountFromContract.mockResolvedValueOnce(null);
 
-    const { result } = renderHook(
+    const { result, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -581,11 +567,10 @@ describe('useMerklRewards', () => {
       { wrapper: createWrapper() },
     );
 
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    await waitFor(() => {
+      expect(result.current.hasClaimableReward).toBe(true);
     });
 
-    expect(result.current.hasClaimableReward).toBe(true);
     expect(result.current.rewardAmountFiat).toBeNull();
     expect(result.current.hasClaimedBefore).toBe(false);
     expect(result.current.claimableRewardDisplay).toBe('10.50');
@@ -617,16 +602,16 @@ describe('useMerklRewards', () => {
     const wrapper = createWrapper();
 
     // First mount — fetches from API
-    const { result: firstResult, unmount } = renderHook(
-      () => useMerklRewards(hookArgs),
-      { wrapper },
-    );
-
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    const {
+      result: firstResult,
+      unmount,
+      waitFor,
+    } = renderHook(() => useMerklRewards(hookArgs), { wrapper });
+
+    await waitFor(() => {
+      expect(firstResult.current.hasClaimableReward).toBe(true);
     });
 
-    expect(firstResult.current.hasClaimableReward).toBe(true);
     expect(firstResult.current.claimableRewardDisplay).toBe('10.50');
     expect(mockFetchMerklRewardsForAsset).toHaveBeenCalledTimes(1);
 
@@ -665,7 +650,7 @@ describe('useMerklRewards', () => {
     const wrapper = createWrapper();
 
     // First render with showMerklBadge=true — populates the cache
-    const { result: firstResult, waitForNextUpdate } = renderHook(
+    const { result: firstResult, waitFor } = renderHook(
       () =>
         useMerklRewards({
           tokenAddress: MUSD_TOKEN_ADDRESS,
@@ -675,12 +660,10 @@ describe('useMerklRewards', () => {
       { wrapper },
     );
 
-    await act(async () => {
-      await waitForNextUpdate();
+    await waitFor(() => {
+      expect(firstResult.current.hasClaimableReward).toBe(true);
     });
 
-    expect(firstResult.current.hasClaimableReward).toBe(true);
-
     // Second render with showMerklBadge=false — same queryKey, cache is warm
     const { result: secondResult } = renderHook(
       () =>
diff --git a/ui/components/app/musd/index.ts b/ui/components/app/musd/index.ts
index ddc1379e9c81..98012032f70b 100644
--- a/ui/components/app/musd/index.ts
+++ b/ui/components/app/musd/index.ts
@@ -5,6 +5,12 @@ export {
 } from './hooks/useMerklRewards';
 export { useOnMerklClaimConfirmed } from './hooks/useOnMerklClaimConfirmed';
 export { ELIGIBLE_TOKENS, MERKL_FEATURE_FLAG_KEY } from './constants';
+export {
+  ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS,
+  TOKEN_LIST_CELL_MUSD_OPTIONS,
+  type AssetOverviewTokenCellMusdOptions,
+  type TokenListCellMusdOptions,
+} from './musd-events';
 export { ClaimBonusBadge } from './claim-bonus-badge';
 export { MerklClaimToast } from './merkl-claim-toast';
 export { MusdConversionToast } from './musd-conversion-toast';
diff --git a/ui/components/app/musd/musd-asset-cta.test.tsx b/ui/components/app/musd/musd-asset-cta.test.tsx
index bf3c8710d737..f8c2378c624b 100644
--- a/ui/components/app/musd/musd-asset-cta.test.tsx
+++ b/ui/components/app/musd/musd-asset-cta.test.tsx
@@ -56,10 +56,13 @@ const { __mockTrackEvent: mockTrackEvent } = jest.requireMock<{
 
 // Mock useMusdConversion
 const mockStartConversionFlow = jest.fn();
+let mockEducationSeen = false;
 jest.mock('../../../hooks/musd', () => ({
   useMusdConversion: () => ({
     startConversionFlow: mockStartConversionFlow,
-    educationSeen: false,
+    get educationSeen() {
+      return mockEducationSeen;
+    },
   }),
   useMusdGeoBlocking: () => ({
     isBlocked: false,
@@ -110,6 +113,7 @@ const mockToken = {
 describe('MusdAssetCta', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockEducationSeen = false;
   });
 
   describe('card variant', () => {
@@ -177,9 +181,35 @@ describe('MusdAssetCta', () => {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             cta_type: 'musd_conversion_tertiary_cta',
             // eslint-disable-next-line @typescript-eslint/naming-convention
-            chain_id: '0x1',
+            redirects_to: 'conversion_education_screen',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            network_chain_id: '0x1',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            network_name: 'Ethereum Mainnet',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            asset_symbol: 'USDC',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            cta_click_target: 'cta_button',
+          }),
+        }),
+      );
+    });
+
+    it('tracks redirects_to custom_amount_screen when conversion education was seen', () => {
+      mockEducationSeen = true;
+      const store = createMockStore();
+      renderWithProvider(
+        <MusdAssetCta token={mockToken} variant="card" />,
+        store,
+      );
+
+      fireEvent.click(screen.getByTestId('musd-asset-cta'));
+
+      expect(mockTrackEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          properties: expect.objectContaining({
             // eslint-disable-next-line @typescript-eslint/naming-convention
-            token_symbol: 'USDC',
+            redirects_to: 'custom_amount_screen',
           }),
         }),
       );
diff --git a/ui/components/app/musd/musd-asset-cta.tsx b/ui/components/app/musd/musd-asset-cta.tsx
index 756552452781..e83560190738 100644
--- a/ui/components/app/musd/musd-asset-cta.tsx
+++ b/ui/components/app/musd/musd-asset-cta.tsx
@@ -11,7 +11,7 @@
  */
 
 import React, { useCallback, useContext } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import type { Hex } from '@metamask/utils';
 import {
   Box,
@@ -36,8 +36,13 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useMusdConversion } from '../../../hooks/musd';
 import { addMusdConversionDismissedCtaKey } from '../../../store/actions';
+import { getMultichainNetworkConfigurationsByChainId } from '../../../selectors/multichain';
 import { MUSD_CONVERSION_APY } from './constants';
-import { MUSD_EVENTS_CONSTANTS } from './musd-events';
+import {
+  createMusdCtaClickedEventProperties,
+  MUSD_EVENTS_CONSTANTS,
+  resolveMusdConversionCtaRedirectsTo,
+} from './musd-events';
 
 // Runtime path: app/images/ is copied to images/ in the build (see development/build/static.js)
 const MUSD_EDUCATION_COIN_IMAGE = './images/musd-icon-no-background-2x.png';
@@ -91,7 +96,13 @@ export const MusdAssetCta: React.FC<MusdAssetCtaProps> = ({
   const t = useI18nContext();
   const dispatch = useDispatch();
   const { trackEvent } = useContext(MetaMetricsContext);
-  const { startConversionFlow } = useMusdConversion();
+  const { startConversionFlow, educationSeen } = useMusdConversion();
+  const networkConfigurationsByChainId = useSelector(
+    getMultichainNetworkConfigurationsByChainId,
+  );
+  const networkName =
+    networkConfigurationsByChainId[token.chainId as Hex]?.name ??
+    'Unknown Network';
 
   /**
    * Generate CTA key for dismissal tracking
@@ -102,23 +113,27 @@ export const MusdAssetCta: React.FC<MusdAssetCtaProps> = ({
    * Handle convert button click
    */
   const handleConvert = useCallback(async () => {
-    // Track analytics event
+    const ctaDisplayText = t('musdBoostTitle', [String(MUSD_CONVERSION_APY)]);
+    const redirectsTo = resolveMusdConversionCtaRedirectsTo({
+      intent: 'conversion',
+      educationSeen,
+    });
+
     trackEvent({
       event: MetaMetricsEventName.MusdConversionCtaClicked,
       category: MetaMetricsEventCategory.Tokens,
-      properties: {
+      properties: createMusdCtaClickedEventProperties({
         location: MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.ASSET_OVERVIEW,
-        /* eslint-disable @typescript-eslint/naming-convention */
-        cta_type: MUSD_EVENTS_CONSTANTS.MUSD_CTA_TYPES.TERTIARY,
-        cta_text: t('musdBoostTitle', [String(MUSD_CONVERSION_APY)]),
-        cta_click_target: MUSD_EVENTS_CONSTANTS.CTA_CLICK_TARGETS.CTA_BUTTON,
-        chain_id: token.chainId,
-        token_symbol: token.symbol,
-        /* eslint-enable @typescript-eslint/naming-convention */
-      },
+        redirectsTo,
+        ctaType: MUSD_EVENTS_CONSTANTS.MUSD_CTA_TYPES.TERTIARY,
+        ctaText: String(ctaDisplayText),
+        chainId: token.chainId,
+        chainName: networkName,
+        assetSymbol: token.symbol,
+        clickTarget: MUSD_EVENTS_CONSTANTS.CTA_CLICK_TARGETS.CTA_BUTTON,
+      }),
     });
 
-    // Start conversion flow with this token
     await startConversionFlow({
       preferredToken: {
         address: token.address as Hex,
@@ -126,7 +141,7 @@ export const MusdAssetCta: React.FC<MusdAssetCtaProps> = ({
       },
       entryPoint: 'asset_overview',
     });
-  }, [token, trackEvent, startConversionFlow, t]);
+  }, [token, trackEvent, startConversionFlow, t, educationSeen, networkName]);
 
   /**
    * Handle dismiss button click
diff --git a/ui/components/app/musd/musd-buy-get-cta.test.tsx b/ui/components/app/musd/musd-buy-get-cta.test.tsx
index 79f5f6749aa7..c73e44cbf903 100644
--- a/ui/components/app/musd/musd-buy-get-cta.test.tsx
+++ b/ui/components/app/musd/musd-buy-get-cta.test.tsx
@@ -6,7 +6,8 @@ import { fireEvent, screen } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../store/store';
 import { BuyGetMusdCtaVariant } from '../../../hooks/musd/useMusdCtaVisibility';
-import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
+import { enLocale as messages, tEn } from '../../../../test/lib/i18n-helpers';
+import { MUSD_CONVERSION_APY } from './constants';
 import { MusdBuyGetCta } from './musd-buy-get-cta';
 
 // Mock useI18nContext
@@ -15,10 +16,8 @@ jest.mock('../../../hooks/useI18nContext', () => ({
     const translations: Record<string, string> = {
       musdBuyMusd: 'Buy mUSD',
       musdGetMusd: 'Get mUSD',
-      musdBoostTitle: `Get ${values?.[0] || '3'}% on your stablecoins`,
-      musdBoostDescription: `Convert your stablecoins to mUSD and get a ${
-        values?.[0] || '3'
-      }% annualized bonus.`,
+      musdMetaMaskUsd: 'MetaMask USD',
+      musdEarnBonusPercentage: `Earn a ${values?.[0] || '3'}% bonus`,
     };
     return translations[key] || key;
   },
@@ -133,7 +132,7 @@ describe('MusdBuyGetCta', () => {
   });
 
   describe('GET variant', () => {
-    it('renders "Get mUSD" text for GET variant', () => {
+    it('renders MetaMask USD headline and Get mUSD button', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -143,11 +142,15 @@ describe('MusdBuyGetCta', () => {
         store,
       );
 
-      const elements = screen.getAllByText(messages.musdGetMusd.message);
-      expect(elements.length).toBeGreaterThanOrEqual(1);
+      expect(
+        screen.getByText(messages.musdMetaMaskUsd.message),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('button', { name: messages.musdGetMusd.message }),
+      ).toBeInTheDocument();
     });
 
-    it('calls startConversionFlow when clicked', () => {
+    it('calls startConversionFlow when row is clicked', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -169,6 +172,29 @@ describe('MusdBuyGetCta', () => {
       });
     });
 
+    it('calls startConversionFlow when inner CTA button is clicked', () => {
+      const store = createMockStore();
+      renderWithProvider(
+        <MusdBuyGetCta
+          variant={BuyGetMusdCtaVariant.GET}
+          selectedChainId="0x1"
+        />,
+        store,
+      );
+
+      fireEvent.click(
+        screen.getByRole('button', { name: messages.musdGetMusd.message }),
+      );
+
+      expect(mockStartConversionFlow).toHaveBeenCalledWith({
+        entryPoint: 'home',
+        preferredToken: {
+          address: mockDefaultPaymentToken.address,
+          chainId: mockDefaultPaymentToken.chainId,
+        },
+      });
+    });
+
     it('tracks analytics event with GET variant', () => {
       const store = createMockStore();
       renderWithProvider(
@@ -199,7 +225,7 @@ describe('MusdBuyGetCta', () => {
   });
 
   describe('BUY variant', () => {
-    it('renders "Buy mUSD" text for BUY variant', () => {
+    it('renders MetaMask USD headline and Buy mUSD button', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -209,11 +235,15 @@ describe('MusdBuyGetCta', () => {
         store,
       );
 
-      const elements = screen.getAllByText(messages.musdBuyMusd.message);
-      expect(elements.length).toBeGreaterThanOrEqual(1);
+      expect(
+        screen.getByText(messages.musdMetaMaskUsd.message),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('button', { name: messages.musdBuyMusd.message }),
+      ).toBeInTheDocument();
     });
 
-    it('opens buy crypto page when clicked for BUY variant', () => {
+    it('opens buy crypto page when row is clicked for BUY variant', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -232,6 +262,61 @@ describe('MusdBuyGetCta', () => {
         }),
       );
     });
+
+    it('opens buy crypto page when inner CTA button is clicked for BUY variant', () => {
+      const store = createMockStore();
+      renderWithProvider(
+        <MusdBuyGetCta
+          variant={BuyGetMusdCtaVariant.BUY}
+          selectedChainId="0x1"
+        />,
+        store,
+      );
+
+      fireEvent.click(
+        screen.getByRole('button', { name: messages.musdBuyMusd.message }),
+      );
+
+      expect(mockOpenTab).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: expect.stringContaining('/buy'),
+        }),
+      );
+    });
+  });
+
+  describe('CTA button', () => {
+    it('renders a native button labeled with GET copy', () => {
+      const store = createMockStore();
+      renderWithProvider(
+        <MusdBuyGetCta
+          variant={BuyGetMusdCtaVariant.GET}
+          selectedChainId="0x1"
+        />,
+        store,
+      );
+
+      const button = screen.getByRole('button', {
+        name: messages.musdGetMusd.message,
+      });
+      expect(button).toHaveClass('musd-buy-get-cta__button');
+    });
+
+    it('renders a native button labeled with BUY copy', () => {
+      const store = createMockStore();
+      renderWithProvider(
+        <MusdBuyGetCta
+          variant={BuyGetMusdCtaVariant.BUY}
+          selectedChainId="0x1"
+        />,
+        store,
+      );
+
+      const button = screen.getByRole('button', {
+        name: messages.musdBuyMusd.message,
+      });
+      expect(button).toHaveClass('musd-buy-get-cta__button');
+    });
   });
 
   describe('icon', () => {
@@ -280,7 +365,7 @@ describe('MusdBuyGetCta', () => {
   });
 
   describe('bonus text', () => {
-    it('displays boost title and description aligned with asset CTA copy', () => {
+    it('displays MetaMask USD headline and earn-bonus subtitle', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -291,18 +376,18 @@ describe('MusdBuyGetCta', () => {
       );
 
       expect(
-        screen.getByText('Get 3% on your stablecoins'),
+        screen.getByText(messages.musdMetaMaskUsd.message),
       ).toBeInTheDocument();
       expect(
         screen.getByText(
-          'Convert your stablecoins to mUSD and get a 3% annualized bonus.',
+          tEn('musdEarnBonusPercentage', [String(MUSD_CONVERSION_APY)]),
         ),
       ).toBeInTheDocument();
     });
   });
 
   describe('accessibility', () => {
-    it('renders as a clickable anchor element with hover styling', () => {
+    it('renders row as clickable div with hover styling and inner button', () => {
       const store = createMockStore();
       renderWithProvider(
         <MusdBuyGetCta
@@ -315,6 +400,9 @@ describe('MusdBuyGetCta', () => {
       const ctaElement = screen.getByTestId('multichain-token-list-button');
       expect(ctaElement.tagName).toBe('DIV');
       expect(ctaElement.className).toContain('hover:bg-hover');
+      expect(
+        screen.getByRole('button', { name: messages.musdGetMusd.message }),
+      ).toBeInTheDocument();
     });
   });
 
diff --git a/ui/components/app/musd/musd-buy-get-cta.tsx b/ui/components/app/musd/musd-buy-get-cta.tsx
index e2669005e82a..9ba529abb906 100644
--- a/ui/components/app/musd/musd-buy-get-cta.tsx
+++ b/ui/components/app/musd/musd-buy-get-cta.tsx
@@ -2,7 +2,7 @@
  * MusdBuyGetCta Component
  *
  * Primary banner CTA that appears above the token list.
- * Shows "Buy mUSD" for empty wallets or "Get mUSD" for users with convertible tokens.
+ * Headline shows the MetaMask USD product name; the button shows "Buy mUSD" or "Get mUSD" by variant.
  *
  * Based on mobile's MusdConversionAssetListCta component.
  */
@@ -17,7 +17,6 @@ import {
   Button,
   ButtonSize,
   ButtonVariant,
-  FontWeight,
   Text,
   TextColor,
   TextVariant,
@@ -56,7 +55,7 @@ import {
 import {
   createMusdCtaClickedEventProperties,
   MUSD_EVENTS_CONSTANTS,
-  type MusdCtaClickedEventProperties,
+  resolveMusdConversionCtaRedirectsTo,
 } from './musd-events';
 
 // ============================================================================
@@ -77,7 +76,7 @@ export type MusdBuyGetCtaProps = {
 /**
  * Primary banner CTA for mUSD acquisition
  *
- * Shows different content based on variant:
+ * Shows different button labels and destinations based on variant:
  * - BUY: For empty wallets, routes to Ramp to buy mUSD
  * - GET: For users with convertible tokens, routes to conversion flow
  *
@@ -120,7 +119,7 @@ export const MusdBuyGetCta: React.FC<MusdBuyGetCtaProps> = ({
   /**
    * CTA text based on variant
    */
-  const ctaText = useMemo(() => {
+  const ctaButtonText = useMemo(() => {
     switch (variant) {
       case BuyGetMusdCtaVariant.BUY:
         return t('musdBuyMusd');
@@ -131,25 +130,24 @@ export const MusdBuyGetCta: React.FC<MusdBuyGetCtaProps> = ({
     }
   }, [variant, t]);
 
+  // Product name line (same for BUY and GET); action copy is ctaButtonText.
+  const ctaText = t('musdMetaMaskUsd');
+
   /**
    * Handle CTA click
    */
   const handleClick = useCallback(() => {
-    const { REDIRECT_DESTINATIONS } = MUSD_EVENTS_CONSTANTS;
-    let redirectsTo: MusdCtaClickedEventProperties['redirects_to'];
-    if (variant === BuyGetMusdCtaVariant.BUY) {
-      redirectsTo = REDIRECT_DESTINATIONS.BUY_SCREEN;
-    } else if (educationSeen) {
-      redirectsTo = REDIRECT_DESTINATIONS.CUSTOM_AMOUNT_SCREEN;
-    } else {
-      redirectsTo = REDIRECT_DESTINATIONS.CONVERSION_EDUCATION_SCREEN;
-    }
+    const redirectsTo = resolveMusdConversionCtaRedirectsTo(
+      variant === BuyGetMusdCtaVariant.BUY
+        ? { intent: 'buy' }
+        : { intent: 'conversion', educationSeen },
+    );
 
     const eventProperties = createMusdCtaClickedEventProperties({
       location: MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.HOME_SCREEN,
       redirectsTo,
       ctaType: MUSD_EVENTS_CONSTANTS.MUSD_CTA_TYPES.PRIMARY,
-      ctaText,
+      ctaText: ctaButtonText,
       chainId: selectedChainId,
       chainName: networkName,
       clickTarget: MUSD_EVENTS_CONSTANTS.CTA_CLICK_TARGETS.CTA_BUTTON,
@@ -182,7 +180,7 @@ export const MusdBuyGetCta: React.FC<MusdBuyGetCtaProps> = ({
     variant,
     selectedChainId,
     networkName,
-    ctaText,
+    ctaButtonText,
     educationSeen,
     trackEvent,
     openBuyCryptoInPdapp,
@@ -234,20 +232,16 @@ export const MusdBuyGetCta: React.FC<MusdBuyGetCtaProps> = ({
         flexDirection={BoxFlexDirection.Column}
         className="musd-buy-get-cta__text"
       >
-        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
-          {t('musdBoostTitle', [String(MUSD_CONVERSION_APY)])}
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextDefault}>
+          {ctaText}
         </Text>
-        <Text
-          variant={TextVariant.BodySm}
-          fontWeight={FontWeight.Medium}
-          color={TextColor.TextDefault}
-        >
-          {t('musdBoostDescription', [String(MUSD_CONVERSION_APY)])}
+        <Text variant={TextVariant.BodySm} color={TextColor.PrimaryDefault}>
+          {t('musdEarnBonusPercentage', [String(MUSD_CONVERSION_APY)])}
         </Text>
       </Box>
 
       <Button
-        variant={ButtonVariant.Primary}
+        variant={ButtonVariant.Secondary}
         size={ButtonSize.Sm}
         onClick={(e: React.MouseEvent) => {
           e.stopPropagation();
@@ -256,7 +250,7 @@ export const MusdBuyGetCta: React.FC<MusdBuyGetCtaProps> = ({
         }}
         className="musd-buy-get-cta__button"
       >
-        {ctaText}
+        {ctaButtonText}
       </Button>
     </Box>
   );
diff --git a/ui/components/app/musd/musd-convert-link.test.tsx b/ui/components/app/musd/musd-convert-link.test.tsx
index 848de6844811..3ee7adf7cbcc 100644
--- a/ui/components/app/musd/musd-convert-link.test.tsx
+++ b/ui/components/app/musd/musd-convert-link.test.tsx
@@ -53,10 +53,13 @@ const { __mockTrackEvent: mockTrackEvent } = jest.requireMock<{
 
 // Mock useMusdConversion
 const mockStartConversionFlow = jest.fn();
+let mockEducationSeen = false;
 jest.mock('../../../hooks/musd', () => ({
   useMusdConversion: () => ({
     startConversionFlow: mockStartConversionFlow,
-    educationSeen: false,
+    get educationSeen() {
+      return mockEducationSeen;
+    },
   }),
   useMusdGeoBlocking: () => ({
     isBlocked: false,
@@ -88,6 +91,7 @@ const mockStore = configureStore({
 describe('MusdConvertLink', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockEducationSeen = false;
   });
 
   it('renders the CTA text correctly', () => {
@@ -171,15 +175,47 @@ describe('MusdConvertLink', () => {
         properties: expect.objectContaining({
           location: 'token_list_item',
           // eslint-disable-next-line @typescript-eslint/naming-convention
-          chain_id: '0x1',
+          redirects_to: 'conversion_education_screen',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          network_chain_id: '0x1',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          network_name: 'Ethereum Mainnet',
           // eslint-disable-next-line @typescript-eslint/naming-convention
-          token_symbol: 'USDC',
+          asset_symbol: 'USDC',
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          cta_click_target: 'cta_text_link',
         }),
       }),
     );
   });
 
-  it('uses custom entry point when provided', async () => {
+  it('tracks redirects_to custom_amount_screen when conversion education was seen', async () => {
+    mockEducationSeen = true;
+    renderWithProvider(
+      <MusdConvertLink
+        tokenAddress="0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
+        chainId="0x1"
+        tokenSymbol="USDC"
+      />,
+      mockStore,
+    );
+
+    const ctaButton = screen.getByTestId('musd-convert-link-0x1');
+    await act(async () => {
+      fireEvent.click(ctaButton);
+    });
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          redirects_to: 'custom_amount_screen',
+        }),
+      }),
+    );
+  });
+
+  it('uses asset_overview entry point and matching analytics location when provided', async () => {
     renderWithProvider(
       <MusdConvertLink
         tokenAddress="0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
@@ -200,6 +236,13 @@ describe('MusdConvertLink', () => {
         entryPoint: 'asset_overview',
       }),
     );
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          location: 'asset_overview',
+        }),
+      }),
+    );
   });
 
   it('renders with custom CTA text when provided', () => {
diff --git a/ui/components/app/musd/musd-convert-link.tsx b/ui/components/app/musd/musd-convert-link.tsx
index 8c5d23592dd4..9c4532279532 100644
--- a/ui/components/app/musd/musd-convert-link.tsx
+++ b/ui/components/app/musd/musd-convert-link.tsx
@@ -12,6 +12,7 @@ import React, {
   useRef,
   useState,
 } from 'react';
+import { useSelector } from 'react-redux';
 import type { Hex } from '@metamask/utils';
 import {
   FontWeight,
@@ -26,8 +27,15 @@ import {
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useMusdConversion } from '../../../hooks/musd';
+import { getMultichainNetworkConfigurationsByChainId } from '../../../selectors/multichain';
 import { MUSD_CONVERSION_APY } from './constants';
-import { MUSD_EVENTS_CONSTANTS } from './musd-events';
+import {
+  createMusdCtaClickedEventProperties,
+  musdConversionFlowEntryPointToCtaEventLocation,
+  MUSD_EVENTS_CONSTANTS,
+  resolveMusdConversionCtaRedirectsTo,
+  type MusdConvertLinkEntryPoint,
+} from './musd-events';
 
 // ============================================================================
 // Types
@@ -43,7 +51,7 @@ export type MusdConvertLinkProps = {
   /** Optional custom CTA text to display */
   ctaText?: string;
   /** Entry point for analytics tracking */
-  entryPoint?: 'token_list' | 'asset_overview';
+  entryPoint?: MusdConvertLinkEntryPoint;
 };
 
 // ============================================================================
@@ -69,7 +77,12 @@ export const MusdConvertLink: React.FC<MusdConvertLinkProps> = ({
 }) => {
   const t = useI18nContext();
   const { trackEvent } = useContext(MetaMetricsContext);
-  const { startConversionFlow } = useMusdConversion();
+  const { startConversionFlow, educationSeen } = useMusdConversion();
+  const networkConfigurationsByChainId = useSelector(
+    getMultichainNetworkConfigurationsByChainId,
+  );
+  const networkName =
+    networkConfigurationsByChainId[chainId as Hex]?.name ?? 'Unknown Network';
   const [isLoading, setIsLoading] = useState(false);
   const isMountedRef = useRef(true);
 
@@ -94,21 +107,26 @@ export const MusdConvertLink: React.FC<MusdConvertLinkProps> = ({
 
       setIsLoading(true);
 
-      /* eslint-disable @typescript-eslint/naming-convention */
-      const eventProperties = {
-        location: MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.TOKEN_LIST_ITEM,
-        cta_type: MUSD_EVENTS_CONSTANTS.MUSD_CTA_TYPES.SECONDARY,
-        cta_text: displayText,
-        cta_click_target: MUSD_EVENTS_CONSTANTS.CTA_CLICK_TARGETS.CTA_TEXT_LINK,
-        chain_id: chainId,
-        token_symbol: tokenSymbol,
-      };
-      /* eslint-enable @typescript-eslint/naming-convention */
+      const redirectsTo = resolveMusdConversionCtaRedirectsTo({
+        intent: 'conversion',
+        educationSeen,
+      });
+      const eventLocation =
+        musdConversionFlowEntryPointToCtaEventLocation(entryPoint);
 
       trackEvent({
         event: MetaMetricsEventName.MusdConversionCtaClicked,
         category: MetaMetricsEventCategory.Tokens,
-        properties: eventProperties,
+        properties: createMusdCtaClickedEventProperties({
+          location: eventLocation,
+          redirectsTo,
+          ctaType: MUSD_EVENTS_CONSTANTS.MUSD_CTA_TYPES.SECONDARY,
+          ctaText: displayText,
+          chainId,
+          chainName: networkName,
+          assetSymbol: tokenSymbol,
+          clickTarget: MUSD_EVENTS_CONSTANTS.CTA_CLICK_TARGETS.CTA_TEXT_LINK,
+        }),
       });
 
       try {
@@ -132,6 +150,8 @@ export const MusdConvertLink: React.FC<MusdConvertLinkProps> = ({
       tokenSymbol,
       displayText,
       entryPoint,
+      educationSeen,
+      networkName,
       trackEvent,
       startConversionFlow,
     ],
diff --git a/ui/components/app/musd/musd-events.test.ts b/ui/components/app/musd/musd-events.test.ts
new file mode 100644
index 000000000000..78331d4ff78b
--- /dev/null
+++ b/ui/components/app/musd/musd-events.test.ts
@@ -0,0 +1,70 @@
+import {
+  ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS,
+  MUSD_EVENTS_CONSTANTS,
+  musdConversionFlowEntryPointToCtaEventLocation,
+  resolveMusdConversionCtaRedirectsTo,
+  TOKEN_LIST_CELL_MUSD_OPTIONS,
+} from './musd-events';
+
+describe('resolveMusdConversionCtaRedirectsTo', () => {
+  it('returns buy_screen for buy intent', () => {
+    expect(resolveMusdConversionCtaRedirectsTo({ intent: 'buy' })).toBe(
+      MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.BUY_SCREEN,
+    );
+  });
+
+  it('returns conversion_education_screen when conversion and education not seen', () => {
+    expect(
+      resolveMusdConversionCtaRedirectsTo({
+        intent: 'conversion',
+        educationSeen: false,
+      }),
+    ).toBe(
+      MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.CONVERSION_EDUCATION_SCREEN,
+    );
+  });
+
+  it('returns custom_amount_screen when conversion and education seen', () => {
+    expect(
+      resolveMusdConversionCtaRedirectsTo({
+        intent: 'conversion',
+        educationSeen: true,
+      }),
+    ).toBe(MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.CUSTOM_AMOUNT_SCREEN);
+  });
+});
+
+describe('musdConversionFlowEntryPointToCtaEventLocation', () => {
+  it('maps home to home_screen', () => {
+    expect(musdConversionFlowEntryPointToCtaEventLocation('home')).toBe(
+      MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.HOME_SCREEN,
+    );
+  });
+
+  it('maps token_list to token_list_item', () => {
+    expect(musdConversionFlowEntryPointToCtaEventLocation('token_list')).toBe(
+      MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.TOKEN_LIST_ITEM,
+    );
+  });
+
+  it('maps asset_overview to asset_overview', () => {
+    expect(
+      musdConversionFlowEntryPointToCtaEventLocation('asset_overview'),
+    ).toBe(MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.ASSET_OVERVIEW);
+  });
+});
+
+describe('TokenCell musd presets', () => {
+  it('TOKEN_LIST_CELL_MUSD_OPTIONS matches home token list surfaces', () => {
+    expect(TOKEN_LIST_CELL_MUSD_OPTIONS).toStrictEqual({
+      merklClaimBonus: { location: 'token_list_item' },
+      convert: { entryPoint: 'token_list' },
+    });
+  });
+
+  it('ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS matches asset overview Merkl surface', () => {
+    expect(ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS).toStrictEqual({
+      merklClaimBonus: { location: 'asset_overview' },
+    });
+  });
+});
diff --git a/ui/components/app/musd/musd-events.ts b/ui/components/app/musd/musd-events.ts
index 9bd0ec4bd307..b14bc831aacc 100644
--- a/ui/components/app/musd/musd-events.ts
+++ b/ui/components/app/musd/musd-events.ts
@@ -24,7 +24,6 @@ export const MUSD_EVENTS_CONSTANTS = {
     HOME_SCREEN: 'home_screen',
     TOKEN_LIST_ITEM: 'token_list_item',
     ASSET_OVERVIEW: 'asset_overview',
-    CLAIM_BONUS_BOTTOM_SHEET: 'claim_bonus_bottom_sheet',
     CONVERSION_EDUCATION_SCREEN: 'conversion_education_screen',
     CUSTOM_AMOUNT_SCREEN: 'custom_amount_screen',
     BUY_SCREEN: 'buy_screen',
@@ -70,11 +69,7 @@ export const MUSD_EVENTS_CONSTANTS = {
  */
 export type MusdCtaClickedEventProperties = {
   /** Where the CTA was displayed */
-  location:
-    | 'home_screen'
-    | 'token_list_item'
-    | 'asset_overview'
-    | 'claim_bonus_bottom_sheet';
+  location: 'home_screen' | 'token_list_item' | 'asset_overview';
   /** Where the user will be redirected */
   // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
   // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -111,6 +106,58 @@ export type MusdCtaClickedEventProperties = {
   asset_symbol?: string;
 };
 
+/**
+ * Resolves `redirects_to` for `MusdConversionCtaClicked` so it matches where
+ * the user lands: buy (ramps) vs conversion, and education vs custom amount.
+ * @param params
+ */
+export function resolveMusdConversionCtaRedirectsTo(
+  params: { intent: 'buy' } | { intent: 'conversion'; educationSeen: boolean },
+): MusdCtaClickedEventProperties['redirects_to'] {
+  if (params.intent === 'buy') {
+    return MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.BUY_SCREEN;
+  }
+  return params.educationSeen
+    ? MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.CUSTOM_AMOUNT_SCREEN
+    : MUSD_EVENTS_CONSTANTS.REDIRECT_DESTINATIONS.CONVERSION_EDUCATION_SCREEN;
+}
+
+/**
+ * Argument to {@link musdConversionFlowEntryPointToCtaEventLocation}; maps to
+ * {@link MusdCtaClickedEventProperties} `location`.
+ */
+export type MusdConversionFlowEntryPoint =
+  | 'home'
+  | 'token_list'
+  | 'asset_overview';
+
+/**
+ * Subset of {@link MusdConversionFlowEntryPoint} for conversion CTAs on token rows
+ * (e.g. `MusdConvertLink` in the token cell).
+ */
+export type MusdConvertLinkEntryPoint = Exclude<
+  MusdConversionFlowEntryPoint,
+  'home'
+>;
+
+/**
+ * Maps `startConversionFlow` entry points to `MusdConversionCtaClicked.location`.
+ * @param entryPoint
+ */
+export function musdConversionFlowEntryPointToCtaEventLocation(
+  entryPoint: MusdConversionFlowEntryPoint,
+): MusdCtaClickedEventProperties['location'] {
+  switch (entryPoint) {
+    case 'home':
+      return MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.HOME_SCREEN;
+    case 'asset_overview':
+      return MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.ASSET_OVERVIEW;
+    case 'token_list':
+    default:
+      return MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.TOKEN_LIST_ITEM;
+  }
+}
+
 /**
  * Properties for MUSD_BONUS_TERMS_OF_USE_PRESSED event
  */
@@ -182,12 +229,43 @@ export type MusdConversionStatusUpdatedEventProperties = {
   amount_hex: string;
 };
 
+/** Analytics `location` for Merkl claim bonus in the extension (no mobile bottom sheet). */
+export type MerklClaimBonusAnalyticsLocation =
+  | 'token_list_item'
+  | 'asset_overview';
+
+/**
+ * Stable `musd` prop preset for home token list rows. Single module-level object so
+ * parents do not allocate new references each render (see TokenCell `showMusdCta` memo).
+ */
+export type TokenListCellMusdOptions = {
+  merklClaimBonus: { location: MerklClaimBonusAnalyticsLocation };
+  convert: { entryPoint: MusdConvertLinkEntryPoint };
+};
+
+export const TOKEN_LIST_CELL_MUSD_OPTIONS: TokenListCellMusdOptions = {
+  merklClaimBonus: { location: 'token_list_item' },
+  convert: { entryPoint: 'token_list' },
+};
+
+/**
+ * Stable `musd` prop preset for the asset overview token cell (Merkl only; no list convert link).
+ */
+export type AssetOverviewTokenCellMusdOptions = {
+  merklClaimBonus: { location: 'asset_overview' };
+};
+
+export const ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS: AssetOverviewTokenCellMusdOptions =
+  {
+    merklClaimBonus: { location: 'asset_overview' },
+  };
+
 /**
  * Properties for MUSD_CLAIM_BONUS_BUTTON_CLICKED event
  */
 export type MusdClaimBonusButtonClickedEventProperties = {
   /** Where the button was displayed */
-  location: 'claim_bonus_bottom_sheet';
+  location: MerklClaimBonusAnalyticsLocation;
   /** Claim amount in mUSD */
   // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
   // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -202,14 +280,11 @@ export type MusdClaimBonusButtonClickedEventProperties = {
   network_name: string;
 };
 
-/** Where the Merkl claim bonus CTA can appear (impression + click context) */
-export type MusdMerklClaimCtaLocation = 'token_list_item' | 'asset_overview';
-
 /**
  * Properties for mUSD Claim Bonus CTA Displayed (Merkl claim CTA impression)
  */
 export type MusdClaimBonusCtaDisplayedEventProperties = {
-  location: MusdMerklClaimCtaLocation;
+  location: MerklClaimBonusAnalyticsLocation;
   // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
   // eslint-disable-next-line @typescript-eslint/naming-convention
   view_trigger: 'component_mounted';
diff --git a/ui/components/app/password-form/password-form.test.tsx b/ui/components/app/password-form/password-form.test.tsx
new file mode 100644
index 000000000000..6344d25d54a2
--- /dev/null
+++ b/ui/components/app/password-form/password-form.test.tsx
@@ -0,0 +1,388 @@
+import React from 'react';
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import PasswordForm from './password-form';
+
+const VALID_PASSWORD = 'a]2$GHvw&W';
+const SHORT_PASSWORD = 'abc';
+
+const mockT = (key: string) => key;
+
+jest.mock('../../../hooks/useI18nContext', () => ({
+  useI18nContext: () => mockT,
+}));
+
+describe('PasswordForm', () => {
+  let onChange: jest.Mock;
+
+  const getPasswordInput = () =>
+    screen.getByTestId('create-password-new-input');
+
+  const getConfirmPasswordInput = () =>
+    screen.getByTestId('create-password-confirm-input');
+
+  const getShowPasswordButton = () => screen.getByTestId('show-password');
+
+  const getShowConfirmPasswordButton = () =>
+    screen.getByTestId('show-confirm-password');
+
+  const getPasswordTextField = () =>
+    getPasswordInput().closest('.mm-text-field');
+
+  const typePassword = (value: string) => {
+    fireEvent.change(getPasswordInput(), { target: { value } });
+  };
+
+  const typeConfirmPassword = (value: string) => {
+    fireEvent.change(getConfirmPasswordInput(), { target: { value } });
+  };
+
+  beforeEach(() => {
+    onChange = jest.fn();
+  });
+
+  describe('rendering', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('renders password and confirm password fields', () => {
+      expect(getPasswordInput()).toBeInTheDocument();
+      expect(getConfirmPasswordInput()).toBeInTheDocument();
+    });
+
+    it('renders labels for both fields', () => {
+      expect(screen.getByText('newPasswordCreate')).toBeInTheDocument();
+      expect(screen.getByText('confirmPassword')).toBeInTheDocument();
+    });
+
+    it('renders password help text', () => {
+      expect(screen.getByText('passwordNotLongEnough')).toBeInTheDocument();
+    });
+
+    it('renders show/hide toggle buttons for both fields', () => {
+      expect(getShowPasswordButton()).toBeInTheDocument();
+      expect(getShowConfirmPasswordButton()).toBeInTheDocument();
+    });
+
+    it('uses password input type by default', () => {
+      expect(getPasswordInput()).toHaveAttribute('type', 'password');
+      expect(getConfirmPasswordInput()).toHaveAttribute('type', 'password');
+    });
+  });
+
+  describe('custom test IDs', () => {
+    it('uses custom password input test id when provided', () => {
+      render(
+        <PasswordForm onChange={onChange} pwdInputTestId="custom-pwd-id" />,
+      );
+
+      expect(screen.getByTestId('custom-pwd-id')).toBeInTheDocument();
+    });
+
+    it('uses custom confirm password input test id when provided', () => {
+      render(
+        <PasswordForm
+          onChange={onChange}
+          confirmPwdInputTestId="custom-confirm-id"
+        />,
+      );
+
+      expect(screen.getByTestId('custom-confirm-id')).toBeInTheDocument();
+    });
+  });
+
+  describe('disabled state', () => {
+    it('disables both fields when disabled prop is true', () => {
+      render(<PasswordForm onChange={onChange} disabled />);
+
+      expect(getPasswordInput()).toBeDisabled();
+      expect(getConfirmPasswordInput()).toBeDisabled();
+    });
+
+    it('does not disable fields by default', () => {
+      render(<PasswordForm onChange={onChange} />);
+
+      expect(getPasswordInput()).not.toBeDisabled();
+      expect(getConfirmPasswordInput()).not.toBeDisabled();
+    });
+  });
+
+  describe('onChange callback', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('calls onChange with empty string on initial render', () => {
+      expect(onChange).toHaveBeenCalledWith('');
+    });
+
+    it('calls onChange with password when both fields match and meet minimum length', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword(VALID_PASSWORD);
+      });
+
+      expect(onChange).toHaveBeenCalledWith(VALID_PASSWORD);
+    });
+
+    it('calls onChange with empty string when passwords do not match', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword('different_password');
+      });
+
+      expect(onChange).toHaveBeenLastCalledWith('');
+    });
+
+    it('calls onChange with empty string when password is too short', () => {
+      act(() => {
+        typePassword(SHORT_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword(SHORT_PASSWORD);
+      });
+
+      expect(onChange).toHaveBeenLastCalledWith('');
+    });
+
+    it('calls onChange with empty string when only password is entered', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+
+      expect(onChange).toHaveBeenLastCalledWith('');
+    });
+
+    it('calls onChange with empty string when only confirm password is entered', () => {
+      act(() => {
+        typeConfirmPassword(VALID_PASSWORD);
+      });
+
+      expect(onChange).toHaveBeenLastCalledWith('');
+    });
+  });
+
+  describe('password length validation', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('shows length error when password is too short on blur', () => {
+      act(() => {
+        typePassword(SHORT_PASSWORD);
+      });
+      act(() => {
+        fireEvent.blur(getPasswordInput());
+      });
+
+      expect(getPasswordTextField()).toHaveClass('mm-text-field--error');
+    });
+
+    it('does not show length error for empty password on blur', () => {
+      act(() => {
+        fireEvent.blur(getPasswordInput());
+      });
+
+      expect(getPasswordTextField()).not.toHaveClass('mm-text-field--error');
+    });
+
+    it('does not show length error when password meets minimum length', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        fireEvent.blur(getPasswordInput());
+      });
+
+      expect(getPasswordTextField()).not.toHaveClass('mm-text-field--error');
+    });
+
+    it('clears length error when user types after seeing the error', () => {
+      act(() => {
+        typePassword(SHORT_PASSWORD);
+      });
+      act(() => {
+        fireEvent.blur(getPasswordInput());
+      });
+
+      expect(getPasswordTextField()).toHaveClass('mm-text-field--error');
+
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+
+      expect(getPasswordTextField()).not.toHaveClass('mm-text-field--error');
+    });
+  });
+
+  describe('confirm password mismatch validation', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('shows mismatch error when passwords differ', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword('mismatch_pw');
+      });
+
+      expect(screen.getByTestId('confirm-password-error')).toHaveTextContent(
+        'passwordsDontMatch',
+      );
+    });
+
+    it('does not show mismatch error when confirm field is empty', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword('');
+      });
+
+      expect(screen.queryByText('passwordsDontMatch')).not.toBeInTheDocument();
+    });
+
+    it('clears mismatch error when passwords match', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword('mismatch_pw');
+      });
+
+      expect(screen.getByText('passwordsDontMatch')).toBeInTheDocument();
+
+      act(() => {
+        typeConfirmPassword(VALID_PASSWORD);
+      });
+
+      expect(screen.queryByText('passwordsDontMatch')).not.toBeInTheDocument();
+    });
+
+    it('shows mismatch error when password field is changed to differ from confirm', () => {
+      act(() => {
+        typePassword(VALID_PASSWORD);
+      });
+      act(() => {
+        typeConfirmPassword(VALID_PASSWORD);
+      });
+
+      expect(screen.queryByText('passwordsDontMatch')).not.toBeInTheDocument();
+
+      act(() => {
+        typePassword('changed_password');
+      });
+
+      expect(screen.getByText('passwordsDontMatch')).toBeInTheDocument();
+    });
+  });
+
+  describe('show/hide password toggle', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('toggles password field back to password type on second toggle click', () => {
+      fireEvent.click(getShowPasswordButton());
+      expect(getPasswordInput()).toHaveAttribute('type', 'text');
+
+      fireEvent.click(getShowPasswordButton());
+      expect(getPasswordInput()).toHaveAttribute('type', 'password');
+    });
+
+    it('toggles confirm password field back to password type on second toggle click', () => {
+      fireEvent.click(getShowConfirmPasswordButton());
+      expect(getConfirmPasswordInput()).toHaveAttribute('type', 'text');
+
+      fireEvent.click(getShowConfirmPasswordButton());
+      expect(getConfirmPasswordInput()).toHaveAttribute('type', 'password');
+    });
+
+    it('toggles password and confirm password visibility independently', () => {
+      fireEvent.click(getShowPasswordButton());
+
+      expect(getPasswordInput()).toHaveAttribute('type', 'text');
+      expect(getConfirmPasswordInput()).toHaveAttribute('type', 'password');
+
+      fireEvent.click(getShowConfirmPasswordButton());
+
+      expect(getPasswordInput()).toHaveAttribute('type', 'text');
+      expect(getConfirmPasswordInput()).toHaveAttribute('type', 'text');
+    });
+  });
+
+  describe('keyboard navigation', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('moves focus from password to confirm password on Enter key', () => {
+      const passwordInput = getPasswordInput();
+      const confirmInput = getConfirmPasswordInput();
+
+      act(() => {
+        passwordInput.focus();
+      });
+
+      fireEvent.keyDown(passwordInput, { key: 'Enter' });
+
+      expect(confirmInput).toHaveFocus();
+    });
+
+    it('does not move focus on non-Enter key presses', () => {
+      const passwordInput = getPasswordInput();
+
+      act(() => {
+        passwordInput.focus();
+      });
+
+      fireEvent.keyDown(passwordInput, { key: 'Tab' });
+
+      expect(getConfirmPasswordInput()).not.toHaveFocus();
+    });
+  });
+
+  describe('toggle button accessibility', () => {
+    beforeEach(() => {
+      render(<PasswordForm onChange={onChange} />);
+    });
+
+    it('has correct aria-label for show password button', () => {
+      expect(getShowPasswordButton()).toHaveAttribute(
+        'aria-label',
+        'passwordToggleShow',
+      );
+    });
+
+    it('updates aria-label when password is visible', () => {
+      fireEvent.click(getShowPasswordButton());
+
+      expect(getShowPasswordButton()).toHaveAttribute(
+        'aria-label',
+        'passwordToggleHide',
+      );
+    });
+
+    it('has correct aria-label for show confirm password button', () => {
+      expect(getShowConfirmPasswordButton()).toHaveAttribute(
+        'aria-label',
+        'passwordToggleShow',
+      );
+    });
+
+    it('updates aria-label when confirm password is visible', () => {
+      fireEvent.click(getShowConfirmPasswordButton());
+
+      expect(getShowConfirmPasswordButton()).toHaveAttribute(
+        'aria-label',
+        'passwordToggleHide',
+      );
+    });
+  });
+});
diff --git a/ui/components/app/password-form/password-form.tsx b/ui/components/app/password-form/password-form.tsx
index d29951cce6c1..63988a178bf0 100644
--- a/ui/components/app/password-form/password-form.tsx
+++ b/ui/components/app/password-form/password-form.tsx
@@ -1,15 +1,12 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Box, ButtonIcon, IconName } from '@metamask/design-system-react';
 import {
-  Box,
-  ButtonIcon,
   FormTextField,
   FormTextFieldSize,
-  IconName,
   InputType,
 } from '../../component-library';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { PASSWORD_MIN_LENGTH } from '../../../helpers/constants/common';
-import { TextColor } from '../../../helpers/constants/design-system';
 
 type PasswordFormProps = {
   onChange: (password: string) => void;
@@ -36,6 +33,18 @@ export default function PasswordForm({
   const [confirmPasswordError, setConfirmPasswordError] = useState('');
   const [passwordLengthError, setPasswordLengthError] = useState(false);
 
+  const confirmPasswordRef = useRef<HTMLInputElement>(null);
+
+  const handlePasswordKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        confirmPasswordRef.current?.focus();
+      }
+    },
+    [],
+  );
+
   const handlePasswordChange = useCallback(
     (passwordInput: string) => {
       const confirmError =
@@ -98,12 +107,13 @@ export default function PasswordForm({
         inputProps={{
           'data-testid': pwdInputTestId || 'create-password-new-input',
           type: showPassword ? InputType.Text : InputType.Password,
+          onKeyDown: handlePasswordKeyDown,
         }}
         onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
           handlePasswordChange(e.target.value);
         }}
         helpTextProps={{
-          color: TextColor.textAlternative,
+          className: 'text-alternative',
           'data-testid': 'short-password-error',
         }}
         helpText={t('passwordNotLongEnough')}
@@ -138,6 +148,7 @@ export default function PasswordForm({
         }}
         helpText={confirmPasswordError}
         value={confirmPassword}
+        inputRef={confirmPasswordRef}
         inputProps={{
           'data-testid':
             confirmPwdInputTestId || 'create-password-confirm-input',
diff --git a/ui/components/app/password-outdated-modal/password-outdated-modal.tsx b/ui/components/app/password-outdated-modal/password-outdated-modal.tsx
index 249b7bbef61f..f51d26ecb8b5 100644
--- a/ui/components/app/password-outdated-modal/password-outdated-modal.tsx
+++ b/ui/components/app/password-outdated-modal/password-outdated-modal.tsx
@@ -1,28 +1,29 @@
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  AlignItems,
-  Display,
   IconColor,
-  JustifyContent,
   TextAlign,
   TextVariant,
-} from '../../../helpers/constants/design-system';
-import {
   Box,
-  Modal,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
   Text,
   ButtonSize,
   Button,
   Icon,
   IconSize,
   IconName,
+  BoxJustifyContent,
+  BoxFlexDirection,
+  BoxAlignItems,
+} from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
 } from '../../component-library';
+import { AlignItems } from '../../../helpers/constants/design-system';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { lockMetamask } from '../../../store/actions';
 import { setShowPasswordChangeToast } from '../toast-master/utils';
@@ -60,42 +61,48 @@ export default function PasswordOutdatedModal() {
       <ModalOverlay />
       <ModalContent alignItems={AlignItems.center}>
         <ModalHeader>
-          <Box>
-            <Box display={Display.Flex} justifyContent={JustifyContent.center}>
-              <Icon
-                name={IconName.Danger}
-                size={IconSize.Xl}
-                color={IconColor.warningDefault}
-              />
-            </Box>
-            <Text
-              variant={TextVariant.headingMd}
-              textAlign={TextAlign.Center}
-              marginTop={4}
-            >
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            gap={4}
+          >
+            <Icon
+              name={IconName.Danger}
+              size={IconSize.Xl}
+              color={IconColor.WarningDefault}
+            />
+
+            <Text variant={TextVariant.HeadingMd} textAlign={TextAlign.Center}>
               {t('passwordChangedRecently')}
             </Text>
-            <Text variant={TextVariant.bodySm} marginTop={4}>
+
+            <Text variant={TextVariant.BodySm}>
               {t('passwordChangedRecentlyDescription')}
             </Text>
           </Box>
         </ModalHeader>
-        <Box paddingLeft={4} paddingRight={4}>
-          <Box display={Display.Flex} marginTop={2} gap={4}>
-            <Button
-              data-testid="password-changed"
-              size={ButtonSize.Lg}
-              block
-              onClick={async () => {
-                // remove the password change toast from the app state
-                await dispatch(setShowPasswordChangeToast(null));
-                await dispatch(lockMetamask());
-                navigate(DEFAULT_ROUTE);
-              }}
-            >
-              {t('continue')}
-            </Button>
-          </Box>
+
+        <Box
+          paddingLeft={4}
+          paddingRight={4}
+          marginTop={2}
+          gap={4}
+          className="w-full"
+        >
+          <Button
+            data-testid="password-changed"
+            size={ButtonSize.Lg}
+            className="w-full"
+            onClick={async () => {
+              // remove the password change toast from the app state
+              await dispatch(setShowPasswordChangeToast(null));
+              await dispatch(lockMetamask());
+              navigate(DEFAULT_ROUTE);
+            }}
+          >
+            {t('continue')}
+          </Button>
         </Box>
       </ModalContent>
     </Modal>
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 c502a7b952e7..1021fc5d3471 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
@@ -146,7 +146,12 @@ export default class PermissionPageContainerContent extends PureComponent {
                 ? permissionDiffRequestedChainIds
                 : requestedChainIds
             }
-            caipChainIds={selectedCaipChainIds}
+            // Incremental permission requests (permissionDiffMap present) are
+            // EVM-only (wallet_switchEthereumChain). Passing null here lets
+            // PermissionCell fall back to the EVM-only display via
+            // requestedChainIds, instead of showing pre-existing non-EVM
+            // chains (Bitcoin/Solana/Tron) from the full permission set.
+            caipChainIds={permissionDiffMap ? null : selectedCaipChainIds}
           />
         </Box>
       </Box>
diff --git a/ui/components/app/perps/close-position/close-position-modal.test.tsx b/ui/components/app/perps/close-position/close-position-modal.test.tsx
new file mode 100644
index 000000000000..28299819226a
--- /dev/null
+++ b/ui/components/app/perps/close-position/close-position-modal.test.tsx
@@ -0,0 +1,176 @@
+import React from 'react';
+import { screen, waitFor, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import configureStore from '../../../../store/store';
+import mockState from '../../../../../test/data/mock-state.json';
+import { mockPositions } from '../mocks';
+import { ClosePositionModal } from './close-position-modal';
+
+/** Matches rendered `perpsClosePartialMinNotional` after $1 is replaced with a formatted USD amount */
+const PARTIAL_MIN_NOTIONAL_PATTERN =
+  /Partial closes must be at least \$[\d,.]+ in USD value\. Increase the close amount or set the slider to 100%\./u;
+
+const mockSubmitRequestToBackground = jest.fn();
+
+jest.mock('../../../../store/background-connection', () => ({
+  submitRequestToBackground: (...args: unknown[]) =>
+    mockSubmitRequestToBackground(...args),
+}));
+
+const mockStore = configureStore({
+  metamask: {
+    ...mockState.metamask,
+  },
+});
+
+const basePosition = mockPositions[0];
+
+describe('ClosePositionModal', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockSubmitRequestToBackground.mockResolvedValue({ success: true });
+  });
+
+  describe('ORDER_SIZE_MIN from background', () => {
+    it('shows localized min-notional message when close rejects with ORDER_SIZE_MIN', async () => {
+      const user = userEvent.setup();
+      mockSubmitRequestToBackground.mockRejectedValue(
+        new Error('ORDER_SIZE_MIN'),
+      );
+
+      renderWithProvider(
+        <ClosePositionModal
+          isOpen
+          onClose={jest.fn()}
+          position={basePosition}
+          currentPrice={2900}
+        />,
+        mockStore,
+      );
+
+      await user.click(screen.getByTestId('perps-close-position-modal-submit'));
+
+      await waitFor(() => {
+        expect(
+          screen.getByText(PARTIAL_MIN_NOTIONAL_PATTERN),
+        ).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('invalid current price', () => {
+    it('disables submit when currentPrice is zero even at 100% close', () => {
+      renderWithProvider(
+        <ClosePositionModal
+          isOpen
+          onClose={jest.fn()}
+          position={basePosition}
+          currentPrice={0}
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.getByTestId('perps-close-position-modal-submit'),
+      ).toBeDisabled();
+    });
+
+    it('disables submit when currentPrice is NaN', async () => {
+      const user = userEvent.setup();
+      renderWithProvider(
+        <ClosePositionModal
+          isOpen
+          onClose={jest.fn()}
+          position={basePosition}
+          currentPrice={NaN}
+        />,
+        mockStore,
+      );
+
+      const slider = within(
+        screen.getByTestId('close-amount-slider'),
+      ).getByRole('slider');
+      slider.focus();
+      await user.keyboard('{ArrowLeft}');
+
+      expect(
+        screen.getByTestId('perps-close-position-modal-submit'),
+      ).toBeDisabled();
+    });
+  });
+
+  describe('partial close below minimum USD notional', () => {
+    it('disables submit when partial notional is just under $10 even if rounded to cents it would be $10', async () => {
+      const user = userEvent.setup();
+      const positionOneUnit = {
+        ...basePosition,
+        size: '1',
+      };
+
+      renderWithProvider(
+        <ClosePositionModal
+          isOpen
+          onClose={jest.fn()}
+          position={positionOneUnit}
+          currentPrice={19.992}
+        />,
+        mockStore,
+      );
+
+      const slider = within(
+        screen.getByTestId('close-amount-slider'),
+      ).getByRole('slider');
+      slider.focus();
+      await user.keyboard(
+        Array.from({ length: 50 }, () => '{ArrowLeft}').join(''),
+      );
+
+      await waitFor(() => {
+        expect(
+          screen.getByText(PARTIAL_MIN_NOTIONAL_PATTERN),
+        ).toBeInTheDocument();
+        expect(
+          screen.getByTestId('perps-close-position-modal-submit'),
+        ).toBeDisabled();
+      });
+    });
+
+    it('disables submit and shows warning when partial notional is under $10', async () => {
+      const user = userEvent.setup();
+      const smallPosition = {
+        ...basePosition,
+        size: '0.01',
+      };
+
+      renderWithProvider(
+        <ClosePositionModal
+          isOpen
+          onClose={jest.fn()}
+          position={smallPosition}
+          currentPrice={500}
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.getByTestId('perps-close-position-modal-submit'),
+      ).not.toBeDisabled();
+
+      const slider = within(
+        screen.getByTestId('close-amount-slider'),
+      ).getByRole('slider');
+      slider.focus();
+      await user.keyboard('{ArrowLeft}');
+
+      await waitFor(() => {
+        expect(
+          screen.getByText(PARTIAL_MIN_NOTIONAL_PATTERN),
+        ).toBeInTheDocument();
+        expect(
+          screen.getByTestId('perps-close-position-modal-submit'),
+        ).toBeDisabled();
+      });
+    });
+  });
+});
diff --git a/ui/components/app/perps/close-position/close-position-modal.tsx b/ui/components/app/perps/close-position/close-position-modal.tsx
index 91c95c9c60fb..5a9b36f429f7 100644
--- a/ui/components/app/perps/close-position/close-position-modal.tsx
+++ b/ui/components/app/perps/close-position/close-position-modal.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import {
   Box,
+  BoxBackgroundColor,
   BoxFlexDirection,
   BoxJustifyContent,
   BoxAlignItems,
@@ -27,7 +28,10 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useFormatters } from '../../../../hooks/useFormatters';
 import { submitRequestToBackground } from '../../../../store/background-connection';
 import { getDisplayName } from '../utils';
-import { PERPS_MARKET_ORDER_FEE_RATE } from '../constants';
+import {
+  PERPS_MARKET_ORDER_FEE_RATE,
+  PERPS_MIN_MARKET_ORDER_USD,
+} from '../constants';
 import { CloseAmountSection } from '../order-entry';
 import type { Position } from '../types';
 
@@ -45,8 +49,7 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
   currentPrice,
 }) => {
   const t = useI18nContext();
-  const { formatCurrencyWithMinThreshold, formatTokenQuantity } =
-    useFormatters();
+  const { formatCurrencyWithMinThreshold } = useFormatters();
 
   const [closePercent, setClosePercent] = useState(100);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -87,12 +90,36 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
     [closeSize, currentPrice],
   );
 
+  /** HyperLiquid requires ≥ $10 notional for partial closes; full close omits size and skips this. */
+  const closeNotionalUsd = useMemo(
+    () => closeSize * currentPrice,
+    [closeSize, currentPrice],
+  );
+
+  const isPriceValid = useMemo(
+    () => Number.isFinite(currentPrice) && currentPrice > 0,
+    [currentPrice],
+  );
+
+  const isPartialCloseBelowMinNotional = useMemo(() => {
+    if (closePercent >= 100) {
+      return false;
+    }
+    // Compare unrounded notional: rounding to cents can lift e.g. $9.995 to $10.00 and wrongly allow submit.
+    return closeNotionalUsd < PERPS_MIN_MARKET_ORDER_USD;
+  }, [closePercent, closeNotionalUsd]);
+
   const youWillReceive = useMemo(
     () => margin + unrealizedPnl - estimatedFees,
     [margin, unrealizedPnl, estimatedFees],
   );
 
-  const isSubmitDisabled = closePercent <= 0 || isSubmitting || closeSize <= 0;
+  const isSubmitDisabled =
+    !isPriceValid ||
+    closePercent <= 0 ||
+    isSubmitting ||
+    closeSize <= 0 ||
+    isPartialCloseBelowMinNotional;
 
   const handleClose = useCallback(async () => {
     if (isSubmitDisabled) {
@@ -106,10 +133,12 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
       const params: {
         symbol: string;
         orderType: 'market';
+        currentPrice: number;
         size?: string;
       } = {
         symbol: position.symbol,
         orderType: 'market',
+        currentPrice,
       };
 
       if (closePercent < 100) {
@@ -125,13 +154,30 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
       }
       onClose();
     } catch (err) {
-      setError(
-        err instanceof Error ? err.message : 'An unknown error occurred',
-      );
+      if (err instanceof Error && err.message === 'ORDER_SIZE_MIN') {
+        setError(
+          t('perpsClosePartialMinNotional', [
+            formatCurrencyWithMinThreshold(PERPS_MIN_MARKET_ORDER_USD, 'USD'),
+          ]),
+        );
+      } else {
+        setError(
+          err instanceof Error ? err.message : 'An unknown error occurred',
+        );
+      }
     } finally {
       setIsSubmitting(false);
     }
-  }, [isSubmitDisabled, position.symbol, closePercent, closeSize, onClose]);
+  }, [
+    isSubmitDisabled,
+    position.symbol,
+    closePercent,
+    closeSize,
+    currentPrice,
+    onClose,
+    t,
+    formatCurrencyWithMinThreshold,
+  ]);
 
   const handlePercentChange = useCallback((percent: number) => {
     setClosePercent(percent);
@@ -149,23 +195,6 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
         <ModalHeader onClose={onClose}>{t('perpsClosePosition')}</ModalHeader>
         <ModalBody>
           <Box flexDirection={BoxFlexDirection.Column} gap={4}>
-            {/* Available to close */}
-            <Box
-              flexDirection={BoxFlexDirection.Row}
-              justifyContent={BoxJustifyContent.Between}
-              alignItems={BoxAlignItems.Center}
-            >
-              <Text
-                variant={TextVariant.BodySm}
-                color={TextColor.TextAlternative}
-              >
-                {t('perpsAvailableToClose')}
-              </Text>
-              <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-                {formatTokenQuantity(positionSize, displayName)}
-              </Text>
-            </Box>
-
             {/* Close Amount Section (input + slider) */}
             <CloseAmountSection
               positionSize={position.size}
@@ -175,6 +204,34 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
               currentPrice={currentPrice}
             />
 
+            {isPartialCloseBelowMinNotional ? (
+              <Box
+                backgroundColor={BoxBackgroundColor.WarningMuted}
+                className="rounded-lg"
+                padding={3}
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                gap={2}
+              >
+                <Icon
+                  name={IconName.Warning}
+                  size={IconSize.Sm}
+                  color={IconColor.WarningDefault}
+                />
+                <Text
+                  variant={TextVariant.BodySm}
+                  color={TextColor.WarningDefault}
+                >
+                  {t('perpsClosePartialMinNotional', [
+                    formatCurrencyWithMinThreshold(
+                      PERPS_MIN_MARKET_ORDER_USD,
+                      'USD',
+                    ),
+                  ])}
+                </Text>
+              </Box>
+            ) : null}
+
             {/* Summary rows */}
             <Box flexDirection={BoxFlexDirection.Column} gap={2}>
               {/* Margin */}
@@ -206,10 +263,23 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
                     textAlign={TextAlign.Right}
                   >
                     {t('perpsIncludesPnl', [
-                      `${unrealizedPnl >= 0 ? '+' : '-'}${formatCurrencyWithMinThreshold(
-                        Math.abs(unrealizedPnl),
-                        'USD',
-                      )}`,
+                      <Text
+                        key="perps-close-margin-pnl"
+                        variant={TextVariant.BodyXs}
+                        color={
+                          unrealizedPnl >= 0
+                            ? TextColor.SuccessDefault
+                            : TextColor.ErrorDefault
+                        }
+                        asChild
+                      >
+                        <span>
+                          {`${unrealizedPnl >= 0 ? '+' : '-'}${formatCurrencyWithMinThreshold(
+                            Math.abs(unrealizedPnl),
+                            'USD',
+                          )}`}
+                        </span>
+                      </Text>,
                     ])}
                   </Text>
                 </Box>
@@ -262,7 +332,8 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
             {/* Error */}
             {error && (
               <Box
-                className="bg-error-muted rounded-lg"
+                backgroundColor={BoxBackgroundColor.ErrorMuted}
+                className="rounded-lg"
                 padding={3}
                 flexDirection={BoxFlexDirection.Row}
                 alignItems={BoxAlignItems.Center}
@@ -284,12 +355,7 @@ export const ClosePositionModal: React.FC<ClosePositionModalProps> = ({
           </Box>
         </ModalBody>
         <ModalFooter
-          onCancel={onClose}
           onSubmit={handleClose}
-          cancelButtonProps={{
-            'data-testid': 'perps-close-position-modal-cancel',
-            children: t('cancel'),
-          }}
           submitButtonProps={{
             'data-testid': 'perps-close-position-modal-submit',
             children: t('perpsClosePosition'),
diff --git a/ui/components/app/perps/constants.test.ts b/ui/components/app/perps/constants.test.ts
new file mode 100644
index 000000000000..b49d68365eb1
--- /dev/null
+++ b/ui/components/app/perps/constants.test.ts
@@ -0,0 +1,15 @@
+import { isValidPerpsWithdrawAmount } from './constants';
+
+describe('isValidPerpsWithdrawAmount', () => {
+  it('returns true for empty and well-formed amounts up to six decimal places', () => {
+    ['', '0', '1', '0.1', '1.01', '100.123456', '.5'].forEach((value) => {
+      expect(isValidPerpsWithdrawAmount(value)).toBe(true);
+    });
+  });
+
+  it('returns false for more than six fractional digits and non-numeric input', () => {
+    ['1.1234567', 'abc', '1..2', '1e6', '-1'].forEach((value) => {
+      expect(isValidPerpsWithdrawAmount(value)).toBe(false);
+    });
+  });
+});
diff --git a/ui/components/app/perps/constants.ts b/ui/components/app/perps/constants.ts
index 93b1632e448f..6b561da2a4f8 100644
--- a/ui/components/app/perps/constants.ts
+++ b/ui/components/app/perps/constants.ts
@@ -18,6 +18,15 @@ export const PERPS_LIST_ITEM_HEIGHT = 62;
 export const HYPERLIQUID_ASSET_ICONS_BASE_URL =
   'https://app.hyperliquid.xyz/coins/';
 
+/**
+ * Perps withdraw amount input: digits with optional decimal, max six fractional digits
+ * (aligned with HyperLiquid / controller expectations).
+ */
+export const PERPS_WITHDRAW_AMOUNT_REGEX = /^\d*\.?\d{0,6}$/u;
+
+export const isValidPerpsWithdrawAmount = (amount: string): boolean =>
+  PERPS_WITHDRAW_AMOUNT_REGEX.test(amount);
+
 /**
  * General perps display constants
  * Fallback values for when data is unavailable or invalid
@@ -37,6 +46,14 @@ export const PERPS_CONSTANTS = {
  */
 export const PERPS_MARKET_ORDER_FEE_RATE = 0.0001;
 
+/**
+ * Minimum USD notional for market / reduce-only orders on HyperLiquid (mainnet and testnet).
+ * Partial closes below this amount fail with ORDER_SIZE_MIN; full closes omit this check.
+ * Duplicates TRADING_DEFAULTS.amount in @metamask/perps-controller until a shared export exists.
+ * @see TRADING_DEFAULTS.amount in @metamask/perps-controller hyperLiquidConfig
+ */
+export const PERPS_MIN_MARKET_ORDER_USD = 10;
+
 /**
  * Market sorting configuration
  * Controls sorting behavior for the markets view
diff --git a/ui/components/app/perps/edit-margin/edit-margin-expandable.test.tsx b/ui/components/app/perps/edit-margin/edit-margin-expandable.test.tsx
index 1682316b5154..d077bb4bd018 100644
--- a/ui/components/app/perps/edit-margin/edit-margin-expandable.test.tsx
+++ b/ui/components/app/perps/edit-margin/edit-margin-expandable.test.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
-import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-import configureStore from '../../../../store/store';
+import React from 'react';
+
 import mockState from '../../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import configureStore from '../../../../store/store';
 import { mockPositions, mockAccountState } from '../mocks';
 import { EditMarginExpandable } from './edit-margin-expandable';
 
@@ -71,16 +72,16 @@ describe('EditMarginExpandable', () => {
       ).toBeInTheDocument();
     });
 
-    it('renders amount input and preset buttons when expanded', () => {
+    it('renders amount input and margin slider when expanded', () => {
       renderWithProvider(
         <EditMarginExpandable {...defaultProps} isExpanded />,
         mockStore,
       );
 
       expect(screen.getByPlaceholderText('0.00')).toBeInTheDocument();
-      expect(screen.getByText('25%')).toBeInTheDocument();
-      expect(screen.getByText('50%')).toBeInTheDocument();
-      expect(screen.getByText(messages.max.message)).toBeInTheDocument();
+      expect(
+        screen.getByTestId('perps-margin-amount-slider'),
+      ).toBeInTheDocument();
     });
 
     it('renders confirm button with Add Margin when in add mode', () => {
@@ -93,18 +94,18 @@ describe('EditMarginExpandable', () => {
       expect(buttons.length).toBeGreaterThanOrEqual(1);
     });
 
-    it('shows Available balance in add mode', () => {
+    it('shows Available to add label in add mode', () => {
       renderWithProvider(
         <EditMarginExpandable {...defaultProps} isExpanded />,
         mockStore,
       );
 
       expect(
-        screen.getByText(messages.perpsAvailableBalance.message),
+        screen.getByText(messages.perpsAvailableToAdd.message),
       ).toBeInTheDocument();
     });
 
-    it('shows Max removable when Remove is selected', () => {
+    it('shows Available to subtract when Remove is selected', () => {
       renderWithProvider(
         <EditMarginExpandable {...defaultProps} isExpanded />,
         mockStore,
@@ -113,7 +114,7 @@ describe('EditMarginExpandable', () => {
       fireEvent.click(screen.getByText(messages.perpsRemoveMargin.message));
 
       expect(
-        screen.getByText(messages.perpsMaxRemovable.message),
+        screen.getByText(messages.perpsAvailableToSubtract.message),
       ).toBeInTheDocument();
     });
   });
@@ -128,7 +129,7 @@ describe('EditMarginExpandable', () => {
       fireEvent.click(screen.getByText(messages.perpsRemoveMargin.message));
 
       expect(
-        screen.getByText(messages.perpsMaxRemovable.message),
+        screen.getByText(messages.perpsAvailableToSubtract.message),
       ).toBeInTheDocument();
     });
 
@@ -142,23 +143,52 @@ describe('EditMarginExpandable', () => {
       fireEvent.click(screen.getByText(messages.perpsAddMargin.message));
 
       expect(
-        screen.getByText(messages.perpsAvailableBalance.message),
+        screen.getByText(messages.perpsAvailableToAdd.message),
       ).toBeInTheDocument();
     });
   });
 
-  describe('preset buttons', () => {
-    it('sets amount when a preset is clicked', () => {
+  describe('slider', () => {
+    it('does not underflow at max slider value for IEEE-754 edge balances', () => {
       renderWithProvider(
-        <EditMarginExpandable {...defaultProps} isExpanded />,
+        <EditMarginExpandable
+          {...defaultProps}
+          account={{ ...mockAccountState, availableBalance: '1.15' }}
+          isExpanded
+        />,
+        mockStore,
+      );
+
+      fireEvent.keyDown(screen.getByRole('slider'), {
+        key: 'End',
+        code: 'End',
+      });
+
+      expect(screen.getByPlaceholderText('0.00')).toHaveValue('1.15');
+      expect(
+        screen.getByRole('button', { name: /Add Margin/iu }),
+      ).not.toBeDisabled();
+    });
+
+    it('keeps add margin submit enabled when max slider value floors to 2dp', () => {
+      renderWithProvider(
+        <EditMarginExpandable
+          {...defaultProps}
+          account={{ ...mockAccountState, availableBalance: '3.066' }}
+          isExpanded
+        />,
         mockStore,
       );
 
-      fireEvent.click(screen.getByText('25%'));
+      fireEvent.keyDown(screen.getByRole('slider'), {
+        key: 'End',
+        code: 'End',
+      });
 
-      const input = screen.getByPlaceholderText('0.00');
-      expect(input).toHaveValue();
-      expect(parseFloat((input as HTMLInputElement).value)).toBeGreaterThan(0);
+      expect(screen.getByPlaceholderText('0.00')).toHaveValue('3.06');
+      expect(
+        screen.getByRole('button', { name: /Add Margin/iu }),
+      ).not.toBeDisabled();
     });
   });
 
diff --git a/ui/components/app/perps/edit-margin/edit-margin-modal-content.tsx b/ui/components/app/perps/edit-margin/edit-margin-modal-content.tsx
index 4022e44fefd8..f59443c6987b 100644
--- a/ui/components/app/perps/edit-margin/edit-margin-modal-content.tsx
+++ b/ui/components/app/perps/edit-margin/edit-margin-modal-content.tsx
@@ -1,4 +1,3 @@
-import React, { useState, useCallback, useEffect } from 'react';
 import {
   Box,
   BoxFlexDirection,
@@ -17,20 +16,23 @@ import {
   IconColor,
 } from '@metamask/design-system-react';
 import type { Position as PerpsPosition } from '@metamask/perps-controller';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { TextField, TextFieldSize } from '../../../component-library';
+import React, { useState, useCallback, useEffect, useMemo } from 'react';
+
 import {
   BorderRadius,
   BackgroundColor,
 } from '../../../../helpers/constants/design-system';
-import { submitRequestToBackground } from '../../../../store/background-connection';
-import { getPerpsStreamManager } from '../../../../providers/perps';
-import { useFormatters } from '../../../../hooks/useFormatters';
 import { usePerpsEligibility } from '../../../../hooks/perps';
+import { MARGIN_ADJUSTMENT_CONFIG } from '../../../../hooks/perps/marginUtils';
 import { usePerpsMarginCalculations } from '../../../../hooks/perps/usePerpsMarginCalculations';
+import { useFormatters } from '../../../../hooks/useFormatters';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { getPerpsStreamManager } from '../../../../providers/perps';
+import { submitRequestToBackground } from '../../../../store/background-connection';
+import { TextField, TextFieldSize } from '../../../component-library';
+import { PerpsSlider } from '../perps-slider';
 import type { Position, AccountState } from '../types';
-
-const MARGIN_PRESETS = [25, 50, 100] as const;
+import { floorToDecimals } from '../utils/number';
 
 export type EditMarginModalContentProps = {
   position: Position;
@@ -50,7 +52,7 @@ export type EditMarginModalContentProps = {
 };
 
 /**
- * Shared margin form content: amount input, presets, liquidation info, risk warning, save.
+ * Shared margin form content: available line, slider + USD amount, new liquidation info, save.
  * Used inside EditMarginModal (and optionally EditMarginExpandable) with a fixed mode.
  * @param options0
  * @param options0.position
@@ -75,7 +77,7 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
   onSavingChange,
 }) => {
   const t = useI18nContext();
-  const { formatNumber } = useFormatters();
+  const { formatNumber, formatCurrencyWithMinThreshold } = useFormatters();
   const { isEligible } = usePerpsEligibility();
 
   const [marginAmount, setMarginAmount] = useState<string>('');
@@ -92,48 +94,153 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
 
   const {
     maxAmount,
-    newLiquidationPrice,
-    currentLiquidationDistance,
-    newLiquidationDistance,
+    anchorLiquidationPrice,
+    estimatedLiquidationPrice,
+    anchorLiquidationDistance,
+    estimatedLiquidationDistance,
     riskAssessment,
-    isValid,
   } = calculations;
+  const flooredMaxAmount = floorToDecimals(maxAmount);
+  const parsedAmount = useMemo(
+    () => Number.parseFloat(marginAmount.replaceAll(',', '')) || 0,
+    [marginAmount],
+  );
+  const currentMargin = Number.parseFloat(position.marginUsed) || 0;
+  const isAmountValid =
+    parsedAmount >= MARGIN_ADJUSTMENT_CONFIG.MinAdjustmentAmount &&
+    parsedAmount <= flooredMaxAmount &&
+    (marginMode === 'add' || parsedAmount <= currentMargin);
+
+  const showLiquidationComparison = parsedAmount > 0;
+
+  const liquidationPriceDisplay = useMemo(() => {
+    if (
+      anchorLiquidationPrice === null ||
+      !Number.isFinite(anchorLiquidationPrice)
+    ) {
+      return (
+        <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
+          -
+        </Text>
+      );
+    }
+    if (
+      showLiquidationComparison &&
+      estimatedLiquidationPrice !== null &&
+      Number.isFinite(estimatedLiquidationPrice)
+    ) {
+      return (
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          gap={1}
+          className="max-w-[65%] flex-wrap justify-end"
+        >
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            $
+            {formatNumber(anchorLiquidationPrice, {
+              minimumFractionDigits: 2,
+              maximumFractionDigits: 2,
+            })}
+          </Text>
+          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+            →
+          </Text>
+          <Text
+            variant={TextVariant.BodySm}
+            color={TextColor.TextDefault}
+            fontWeight={FontWeight.Medium}
+          >
+            $
+            {formatNumber(estimatedLiquidationPrice, {
+              minimumFractionDigits: 2,
+              maximumFractionDigits: 2,
+            })}
+          </Text>
+        </Box>
+      );
+    }
+    return (
+      <Text
+        variant={TextVariant.BodySm}
+        color={TextColor.TextDefault}
+        fontWeight={FontWeight.Medium}
+      >
+        $
+        {formatNumber(estimatedLiquidationPrice ?? anchorLiquidationPrice, {
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        })}
+      </Text>
+    );
+  }, [
+    anchorLiquidationPrice,
+    estimatedLiquidationPrice,
+    showLiquidationComparison,
+    formatNumber,
+  ]);
+
+  const formatAmount = useCallback(
+    (value: number): string =>
+      formatNumber(value, {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
+    [formatNumber],
+  );
+
+  const marginPercent = useMemo(() => {
+    if (maxAmount <= 0) {
+      return 0;
+    }
+    return Math.min(100, Math.round((parsedAmount / maxAmount) * 100));
+  }, [parsedAmount, maxAmount]);
 
   const handleAmountChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = e.target;
       if (value === '' || /^[\d,]*\.?\d{0,2}$/u.test(value)) {
-        let cleaned = value.replace(/,/gu, '');
-        if (marginMode === 'remove' && maxAmount > 0) {
-          const num = parseFloat(cleaned) || 0;
-          if (num > maxAmount) {
-            cleaned = maxAmount.toFixed(2);
+        let cleaned = value.replaceAll(',', '');
+        if (marginMode === 'remove' && flooredMaxAmount > 0) {
+          const num = Number.parseFloat(cleaned) || 0;
+          if (num > flooredMaxAmount) {
+            cleaned = flooredMaxAmount.toFixed(2);
           }
         }
         setMarginAmount(cleaned);
       }
     },
-    [marginMode, maxAmount],
+    [marginMode, flooredMaxAmount],
   );
 
-  const handlePresetClick = useCallback(
-    (percent: number) => {
+  const handleSliderChange = useCallback(
+    (_event: React.ChangeEvent<unknown>, value: number | number[]) => {
       if (maxAmount <= 0) {
         return;
       }
-      const value = (maxAmount * percent) / 100;
-      setMarginAmount(value.toFixed(2));
+      const percent = Array.isArray(value) ? value[0] : value;
+      if (percent === 0) {
+        setMarginAmount('');
+        return;
+      }
+      const raw = (maxAmount * percent) / 100;
+      const floored = floorToDecimals(raw);
+      if (floored <= 0) {
+        setMarginAmount('');
+        return;
+      }
+      setMarginAmount(formatAmount(floored));
     },
-    [maxAmount],
+    [maxAmount, formatAmount],
   );
 
   const handleSaveMargin = useCallback(async () => {
-    if (!isEligible || !isValid) {
+    if (!isEligible || !isAmountValid) {
       return;
     }
 
-    const amountNum = parseFloat(marginAmount) || 0;
-    if (amountNum <= 0) {
+    const rawMarginAmount = marginAmount.replaceAll(',', '');
+    if (parsedAmount <= 0) {
       return;
     }
 
@@ -143,7 +250,7 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
 
     try {
       const signedAmount =
-        marginMode === 'add' ? marginAmount : `-${marginAmount}`;
+        marginMode === 'add' ? rawMarginAmount : `-${rawMarginAmount}`;
 
       const result = await submitRequestToBackground<{
         success: boolean;
@@ -180,16 +287,13 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
     isEligible,
     marginMode,
     marginAmount,
-    isValid,
+    isAmountValid,
+    parsedAmount,
     position.symbol,
     onClose,
     onSavingChange,
   ]);
 
-  const currentLiqPrice = position.liquidationPrice
-    ? parseFloat(position.liquidationPrice)
-    : null;
-
   const showRiskWarning =
     marginMode === 'remove' &&
     riskAssessment &&
@@ -197,7 +301,7 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
       riskAssessment.riskLevel === 'danger');
 
   const confirmDisabled =
-    !isEligible || !isValid || isSaving || parseFloat(marginAmount) <= 0;
+    !isEligible || !isAmountValid || isSaving || parsedAmount <= 0;
 
   useEffect(() => {
     if (onSaveRef) {
@@ -214,124 +318,152 @@ export const EditMarginModalContent: React.FC<EditMarginModalContentProps> = ({
   };
 
   const availableLabel =
-    marginMode === 'add' ? t('perpsAvailableBalance') : t('perpsMaxRemovable');
+    marginMode === 'add'
+      ? t('perpsAvailableToAdd')
+      : t('perpsAvailableToSubtract');
 
   return (
     <Box flexDirection={BoxFlexDirection.Column} gap={4}>
-      {/* Amount input */}
-      <Box flexDirection={BoxFlexDirection.Column} gap={2}>
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        justifyContent={BoxJustifyContent.Between}
+        alignItems={BoxAlignItems.Center}
+      >
+        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+          {availableLabel}
+        </Text>
         <Text
           variant={TextVariant.BodySm}
-          color={TextColor.TextAlternative}
           fontWeight={FontWeight.Medium}
+          color={TextColor.TextAlternative}
         >
-          {t('perpsMargin')}
+          {`${formatCurrencyWithMinThreshold(maxAmount, 'USD')} USDC`}
         </Text>
-        <TextField
-          size={TextFieldSize.Md}
-          value={marginAmount}
-          onChange={handleAmountChange}
-          placeholder="0.00"
-          borderRadius={BorderRadius.MD}
-          borderWidth={0}
-          backgroundColor={BackgroundColor.backgroundMuted}
-          className="w-full"
-          disabled={isSaving}
-          startAccessory={
-            <Text
-              variant={TextVariant.BodyMd}
-              color={TextColor.TextAlternative}
-            >
-              $
-            </Text>
-          }
-        />
       </Box>
 
-      {/* Preset buttons: 25%, 50%, Max */}
-      <Box flexDirection={BoxFlexDirection.Row} gap={2}>
-        {MARGIN_PRESETS.map((preset) => (
-          <Box
-            key={`margin-preset-${preset}`}
-            onClick={isSaving ? undefined : () => handlePresetClick(preset)}
-            className={`flex-1 py-1.5 rounded-lg bg-background-default cursor-pointer text-center hover:bg-muted-hover active:bg-muted-pressed border border-muted transition-colors duration-150${
-              isSaving
-                ? ' opacity-50 cursor-not-allowed pointer-events-none'
-                : ''
-            }`}
-          >
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
-            >
-              {preset === 100 ? t('perpsMax') : `${preset}%`}
-            </Text>
-          </Box>
-        ))}
-      </Box>
-
-      {/* Info rows */}
       <Box flexDirection={BoxFlexDirection.Column} gap={2}>
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextAlternative}
+          fontWeight={FontWeight.Medium}
+        >
+          {t('perpsMargin')}
+        </Text>
         <Box
           flexDirection={BoxFlexDirection.Row}
-          justifyContent={BoxJustifyContent.Between}
           alignItems={BoxAlignItems.Center}
+          gap={2}
         >
-          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-            {availableLabel}
-          </Text>
-          <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-            $
-            {formatNumber(maxAmount, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}
-          </Text>
+          <Box
+            className="min-w-0 flex-1 px-3"
+            data-testid="perps-margin-amount-slider"
+          >
+            <PerpsSlider
+              min={0}
+              max={100}
+              step={1}
+              value={marginPercent}
+              onChange={handleSliderChange}
+              disabled={maxAmount <= 0 || isSaving}
+            />
+          </Box>
+          <Box className="w-[5.5rem] shrink-0">
+            <TextField
+              size={TextFieldSize.Md}
+              value={marginAmount}
+              onChange={handleAmountChange}
+              placeholder="0.00"
+              borderRadius={BorderRadius.MD}
+              borderWidth={0}
+              backgroundColor={BackgroundColor.backgroundMuted}
+              className="w-full"
+              disabled={isSaving}
+              inputProps={{ inputMode: 'decimal' }}
+              startAccessory={
+                <Text
+                  variant={TextVariant.BodyMd}
+                  color={TextColor.TextAlternative}
+                >
+                  $
+                </Text>
+              }
+            />
+          </Box>
         </Box>
+      </Box>
 
+      <Box flexDirection={BoxFlexDirection.Column} gap={2}>
         <Box
           flexDirection={BoxFlexDirection.Row}
           justifyContent={BoxJustifyContent.Between}
           alignItems={BoxAlignItems.Center}
+          gap={2}
         >
           <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
             {t('perpsLiquidationPrice')}
           </Text>
-          <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-            {currentLiqPrice === null
-              ? '-'
-              : `$${formatNumber(currentLiqPrice, {
-                  minimumFractionDigits: 2,
-                  maximumFractionDigits: 2,
-                })}`}
-            {newLiquidationPrice !== null &&
-              ` → $${formatNumber(newLiquidationPrice, {
-                minimumFractionDigits: 2,
-                maximumFractionDigits: 2,
-              })}`}
-          </Text>
+          {liquidationPriceDisplay}
         </Box>
 
         <Box
           flexDirection={BoxFlexDirection.Row}
           justifyContent={BoxJustifyContent.Between}
           alignItems={BoxAlignItems.Center}
+          gap={2}
         >
           <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
             {t('perpsLiquidationDistance')}
           </Text>
-          <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
-            {formatNumber(currentLiquidationDistance, {
-              minimumFractionDigits: 1,
-              maximumFractionDigits: 1,
-            })}
-            %
-            {newLiquidationDistance !== null &&
-              ` → ${formatNumber(newLiquidationDistance, {
+          {showLiquidationComparison &&
+          estimatedLiquidationDistance !== null &&
+          Number.isFinite(estimatedLiquidationDistance) ? (
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              gap={1}
+              className="max-w-[65%] flex-wrap justify-end"
+            >
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+              >
+                {formatNumber(anchorLiquidationDistance, {
+                  minimumFractionDigits: 1,
+                  maximumFractionDigits: 1,
+                })}
+                %
+              </Text>
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+              >
+                →
+              </Text>
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextDefault}
+                fontWeight={FontWeight.Medium}
+              >
+                {formatNumber(estimatedLiquidationDistance, {
+                  minimumFractionDigits: 1,
+                  maximumFractionDigits: 1,
+                })}
+                %
+              </Text>
+            </Box>
+          ) : (
+            <Text
+              variant={TextVariant.BodySm}
+              color={TextColor.TextDefault}
+              fontWeight={FontWeight.Medium}
+            >
+              {formatNumber(anchorLiquidationDistance, {
                 minimumFractionDigits: 1,
                 maximumFractionDigits: 1,
-              })}%`}
-          </Text>
+              })}
+              %
+            </Text>
+          )}
         </Box>
       </Box>
 
diff --git a/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.test.ts b/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.test.ts
new file mode 100644
index 000000000000..a1167bbb48ad
--- /dev/null
+++ b/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.test.ts
@@ -0,0 +1,136 @@
+import { act } from '@testing-library/react-hooks';
+import mockState from '../../../../../test/data/mock-state.json';
+import { renderHookWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import { PERPS_WITHDRAW_ROUTE } from '../../../../helpers/constants/routes';
+import { usePerpsWithdrawNavigation } from './usePerpsWithdrawNavigation';
+
+const mockNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
+
+describe('usePerpsWithdrawNavigation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('navigates to perps withdraw route by default', async () => {
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation(),
+      mockState,
+    );
+
+    let triggerResult: Awaited<ReturnType<typeof result.current.trigger>> =
+      null;
+    await act(async () => {
+      triggerResult = await result.current.trigger();
+    });
+
+    expect(mockNavigate).toHaveBeenCalledWith(PERPS_WITHDRAW_ROUTE);
+    expect(triggerResult).toStrictEqual({ route: PERPS_WITHDRAW_ROUTE });
+  });
+
+  it('does not navigate when navigateOnTrigger is false', async () => {
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation({ navigateOnTrigger: false }),
+      mockState,
+    );
+
+    let triggerResult: Awaited<ReturnType<typeof result.current.trigger>> =
+      null;
+    await act(async () => {
+      triggerResult = await result.current.trigger();
+    });
+
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(triggerResult).toStrictEqual({ route: PERPS_WITHDRAW_ROUTE });
+  });
+
+  it('invokes onNavigated with route', async () => {
+    const onNavigated = jest.fn();
+
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation({ onNavigated }),
+      mockState,
+    );
+
+    await act(async () => {
+      await result.current.trigger();
+    });
+
+    expect(onNavigated).toHaveBeenCalledWith(PERPS_WITHDRAW_ROUTE);
+  });
+
+  it('returns null when there is no selected account', async () => {
+    const stateWithoutSelectedAccount = {
+      ...mockState,
+      metamask: {
+        ...mockState.metamask,
+        internalAccounts: {
+          ...mockState.metamask.internalAccounts,
+          selectedAccount: '',
+        },
+      },
+    };
+
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation(),
+      stateWithoutSelectedAccount,
+    );
+
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+    let triggerResult: Awaited<ReturnType<typeof result.current.trigger>> =
+      null;
+    await act(async () => {
+      triggerResult = await result.current.trigger();
+    });
+
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(triggerResult).toBeNull();
+    consoleErrorSpy.mockRestore();
+  });
+
+  it('allows sequential triggers after each completes', async () => {
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation(),
+      mockState,
+    );
+
+    await act(async () => {
+      await result.current.trigger();
+    });
+    await act(async () => {
+      await result.current.trigger();
+    });
+
+    expect(mockNavigate).toHaveBeenCalledTimes(2);
+  });
+
+  it('returns null and logs when navigate throws', async () => {
+    mockNavigate.mockImplementationOnce(() => {
+      throw new Error('nav failed');
+    });
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+
+    const { result } = renderHookWithProvider(
+      () => usePerpsWithdrawNavigation(),
+      mockState,
+    );
+
+    let triggerResult: Awaited<ReturnType<typeof result.current.trigger>> =
+      null;
+    await act(async () => {
+      triggerResult = await result.current.trigger();
+    });
+
+    expect(triggerResult).toBeNull();
+    expect(consoleErrorSpy).toHaveBeenCalled();
+    consoleErrorSpy.mockRestore();
+  });
+});
diff --git a/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.ts b/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.ts
new file mode 100644
index 000000000000..5dd0c1064f6e
--- /dev/null
+++ b/ui/components/app/perps/hooks/usePerpsWithdrawNavigation.ts
@@ -0,0 +1,86 @@
+import { useCallback, useRef, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+
+import { getSelectedInternalAccount } from '../../../../selectors';
+import { PERPS_WITHDRAW_ROUTE } from '../../../../helpers/constants/routes';
+
+export type PerpsWithdrawNavigationResponse = {
+  /** Route opened (or that would be opened) for the withdraw flow */
+  route: string;
+};
+
+export type PerpsWithdrawNavigationOptions = {
+  /** When false, `trigger` still succeeds but does not call `navigate` */
+  navigateOnTrigger?: boolean;
+  onNavigated?: (route: string) => void;
+};
+
+export type PerpsWithdrawNavigationResult = {
+  trigger: () => Promise<PerpsWithdrawNavigationResponse | null>;
+  isLoading: boolean;
+};
+
+/**
+ * Perps-owned entrypoint for opening the withdraw flow (dedicated route).
+ *
+ * Sibling to {@link usePerpsDepositConfirmation}: same `trigger` / `isLoading` shape.
+ * Deposit confirmation is backed by `depositWithConfirmation`, which builds an EVM
+ * transaction and submits it through `TransactionController` (`perpsDeposit`).
+ * Withdraw is API-only (`perpsWithdraw`) with no staged `TransactionMeta`, so it
+ * cannot reuse that confirmations path without new controller support. Completion
+ * feedback on the wallet home uses `PerpsWithdrawToast` and `lastWithdrawResult`.
+ *
+ * @param options
+ */
+export function usePerpsWithdrawNavigation(
+  options: PerpsWithdrawNavigationOptions = {},
+): PerpsWithdrawNavigationResult {
+  const { navigateOnTrigger = true, onNavigated } = options;
+  const navigate = useNavigate();
+  const selectedAccount = useSelector(getSelectedInternalAccount);
+  const [isLoading, setIsLoading] = useState(false);
+
+  const isInFlightRef = useRef(false);
+
+  const trigger = useCallback(async () => {
+    if (isInFlightRef.current || isLoading) {
+      return null;
+    }
+
+    if (!selectedAccount?.address) {
+      console.error('No selected account');
+      return null;
+    }
+
+    isInFlightRef.current = true;
+    setIsLoading(true);
+
+    try {
+      if (navigateOnTrigger) {
+        navigate(PERPS_WITHDRAW_ROUTE);
+      }
+
+      onNavigated?.(PERPS_WITHDRAW_ROUTE);
+
+      return { route: PERPS_WITHDRAW_ROUTE };
+    } catch (error) {
+      console.error('Failed to open perps withdraw flow', error);
+      return null;
+    } finally {
+      isInFlightRef.current = false;
+      setIsLoading(false);
+    }
+  }, [
+    isLoading,
+    navigate,
+    navigateOnTrigger,
+    onNavigated,
+    selectedAccount?.address,
+  ]);
+
+  return {
+    trigger,
+    isLoading,
+  };
+}
diff --git a/ui/components/app/perps/index.ts b/ui/components/app/perps/index.ts
index b552739d5d96..c0c674f7901d 100644
--- a/ui/components/app/perps/index.ts
+++ b/ui/components/app/perps/index.ts
@@ -53,6 +53,7 @@ export { UpdateTPSLModal, UpdateTPSLModalContent } from './update-tpsl';
 export type {
   UpdateTPSLModalProps,
   UpdateTPSLModalContentProps,
+  UpdateTPSLSubmitState,
 } from './update-tpsl';
 
 // Order Entry components
diff --git a/ui/components/app/perps/order-entry/components/amount-input/amount-input.test.tsx b/ui/components/app/perps/order-entry/components/amount-input/amount-input.test.tsx
index 1cef87d64492..da7e8d60f85a 100644
--- a/ui/components/app/perps/order-entry/components/amount-input/amount-input.test.tsx
+++ b/ui/components/app/perps/order-entry/components/amount-input/amount-input.test.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
 import { screen, fireEvent } from '@testing-library/react';
-import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
+import React from 'react';
+
+import mockState from '../../../../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../../../../store/store';
-import mockState from '../../../../../../../test/data/mock-state.json';
 import { AmountInput } from './amount-input';
 
 const mockStore = configureStore({
@@ -160,7 +161,7 @@ describe('AmountInput', () => {
       expect(onAmountChange).not.toHaveBeenCalled();
     });
 
-    it('allows formatted numbers with commas', () => {
+    it('rejects numbers with comma grouping', () => {
       const onAmountChange = jest.fn();
       renderWithProvider(
         <AmountInput {...defaultProps} onAmountChange={onAmountChange} />,
@@ -174,7 +175,98 @@ describe('AmountInput', () => {
         target: { value: '1,000' },
       });
 
-      expect(onAmountChange).toHaveBeenCalledWith('1,000');
+      expect(onAmountChange).not.toHaveBeenCalled();
+    });
+
+    it('rejects non-en-US locale-formatted input', () => {
+      const onAmountChange = jest.fn();
+      const deLocaleStore = configureStore({
+        metamask: {
+          ...mockState.metamask,
+        },
+        localeMessages: {
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <AmountInput {...defaultProps} onAmountChange={onAmountChange} />,
+        deLocaleStore,
+      );
+
+      const container = screen.getByTestId('amount-input-field');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.focus(input as HTMLInputElement);
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '1.000,50' },
+      });
+
+      expect(onAmountChange).not.toHaveBeenCalled();
+    });
+
+    it('keeps raw dot-decimal value in de locale', () => {
+      const deLocaleStore = configureStore({
+        metamask: {
+          ...mockState.metamask,
+        },
+        localeMessages: {
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <AmountInput {...defaultProps} amount="1000.50" />,
+        deLocaleStore,
+      );
+
+      const container = screen.getByTestId('amount-input-field');
+      const input = container.querySelector('input');
+      expect(input).toHaveValue('1000.50');
+    });
+
+    it('floors amount to 2 decimals on blur', () => {
+      const onAmountChange = jest.fn();
+      renderWithProvider(
+        <AmountInput
+          {...defaultProps}
+          amount="3.067"
+          onAmountChange={onAmountChange}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('amount-input-field');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onAmountChange).toHaveBeenCalledWith('3.06');
+    });
+  });
+
+  describe('token input', () => {
+    it('floors converted USD amount to 2 decimals', () => {
+      const onAmountChange = jest.fn();
+      renderWithProvider(
+        <AmountInput
+          {...defaultProps}
+          onAmountChange={onAmountChange}
+          availableBalance={3.066}
+          currentPrice={1}
+          leverage={1}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('amount-input-token-field');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '3.067' },
+      });
+
+      expect(onAmountChange).toHaveBeenCalledWith('3.06');
     });
   });
 
@@ -185,4 +277,79 @@ describe('AmountInput', () => {
       expect(screen.getByTestId('amount-slider')).toBeInTheDocument();
     });
   });
+
+  describe('percent input', () => {
+    it('does not underflow at 100% for IEEE-754 edge values', () => {
+      const onAmountChange = jest.fn();
+      const onBalancePercentChange = jest.fn();
+      renderWithProvider(
+        <AmountInput
+          {...defaultProps}
+          onAmountChange={onAmountChange}
+          onBalancePercentChange={onBalancePercentChange}
+          availableBalance={1.15}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('balance-percent-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '100' },
+      });
+
+      expect(onBalancePercentChange).toHaveBeenCalledWith(100);
+      expect(onAmountChange).toHaveBeenCalledWith('1.15');
+    });
+
+    it('floors generated 100% amount to 2 decimals', () => {
+      const onAmountChange = jest.fn();
+      const onBalancePercentChange = jest.fn();
+      renderWithProvider(
+        <AmountInput
+          {...defaultProps}
+          onAmountChange={onAmountChange}
+          onBalancePercentChange={onBalancePercentChange}
+          availableBalance={3.066}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('balance-percent-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '100' },
+      });
+
+      expect(onBalancePercentChange).toHaveBeenCalledWith(100);
+      expect(onAmountChange).toHaveBeenCalledWith('3.06');
+    });
+
+    it('floors clamped amount when percent input is above 100 on blur', () => {
+      const onAmountChange = jest.fn();
+      const onBalancePercentChange = jest.fn();
+      renderWithProvider(
+        <AmountInput
+          {...defaultProps}
+          onAmountChange={onAmountChange}
+          onBalancePercentChange={onBalancePercentChange}
+          availableBalance={3.066}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('balance-percent-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '101' },
+      });
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onBalancePercentChange).toHaveBeenCalledWith(100);
+      expect(onAmountChange).toHaveBeenCalledWith('3.06');
+    });
+  });
 });
diff --git a/ui/components/app/perps/order-entry/components/amount-input/amount-input.tsx b/ui/components/app/perps/order-entry/components/amount-input/amount-input.tsx
index 95cecb2e45fa..d739d42f10ae 100644
--- a/ui/components/app/perps/order-entry/components/amount-input/amount-input.tsx
+++ b/ui/components/app/perps/order-entry/components/amount-input/amount-input.tsx
@@ -1,4 +1,3 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   Box,
   Text,
@@ -12,15 +11,19 @@ import {
   IconSize,
   IconColor,
 } from '@metamask/design-system-react';
-import { TextField, TextFieldSize } from '../../../../../component-library';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+
 import {
   BorderRadius,
   BackgroundColor,
 } from '../../../../../../helpers/constants/design-system';
-import { PerpsSlider } from '../../../perps-slider';
-import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { useFormatters } from '../../../../../../hooks/useFormatters';
+import { useI18nContext } from '../../../../../../hooks/useI18nContext';
+import { TextField, TextFieldSize } from '../../../../../component-library';
+import { PerpsSlider } from '../../../perps-slider';
+import { formatFlooredDecimals } from '../../../utils/number';
 import type { AmountInputProps } from '../../order-entry.types';
+import { isDigitsOnlyInput, isUnsignedDecimalInput } from '../../utils';
 
 /**
  * AmountInput - Size section with dual USD/token inputs and percentage slider
@@ -60,8 +63,7 @@ export const AmountInput: React.FC<AmountInputProps> = ({
   }, [balancePercent]);
 
   const tokenAmount = useMemo(() => {
-    const cleanAmount = amount.replace(/,/gu, '');
-    const numAmount = parseFloat(cleanAmount) || 0;
+    const numAmount = Number.parseFloat(amount) || 0;
     if (numAmount === 0 || currentPrice === 0) {
       return null;
     }
@@ -82,53 +84,52 @@ export const AmountInput: React.FC<AmountInputProps> = ({
   const handleAmountChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^[\d,]*\.?\d*$/u.test(value)) {
-        onAmountChange(value);
-        const cleanValue = value.replace(/,/gu, '');
-        if (cleanValue && availableBalance > 0) {
-          const numValue = parseFloat(cleanValue);
-          if (!isNaN(numValue) && numValue > 0) {
-            const pct = Math.min(
-              Math.round((numValue / availableBalance) * 100),
-              100,
-            );
-            onBalancePercentChange(pct);
-            setPercentInputValue(String(pct));
-          } else {
-            onBalancePercentChange(0);
-            setPercentInputValue('0');
-          }
+      if (!(value === '' || isUnsignedDecimalInput(value))) {
+        return;
+      }
+
+      onAmountChange(value);
+
+      if (value && availableBalance > 0) {
+        const numValue = Number.parseFloat(value);
+        if (!Number.isNaN(numValue) && numValue > 0) {
+          const pct = Math.min(
+            Math.round((numValue / availableBalance) * 100),
+            100,
+          );
+          onBalancePercentChange(pct);
+          setPercentInputValue(String(pct));
         } else {
           onBalancePercentChange(0);
           setPercentInputValue('0');
         }
+      } else {
+        onBalancePercentChange(0);
+        setPercentInputValue('0');
       }
     },
-    [onAmountChange, onBalancePercentChange, availableBalance],
-  );
-
-  const formatAmount = useCallback(
-    (value: number): string =>
-      formatNumber(value, {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-      }),
-    [formatNumber],
+    [availableBalance, onAmountChange, onBalancePercentChange],
   );
 
   const handleAmountBlur = useCallback(() => {
-    if (amount) {
-      const numValue = parseFloat(amount.replace(/,/gu, ''));
-      if (!isNaN(numValue) && numValue > 0) {
-        onAmountChange(formatAmount(numValue));
-      }
+    if (!amount) {
+      onAmountChange('');
+      return;
+    }
+
+    const numValue = Number.parseFloat(amount);
+    if (Number.isFinite(numValue) && numValue > 0) {
+      onAmountChange(formatFlooredDecimals(numValue));
+      return;
     }
-  }, [amount, onAmountChange, formatAmount]);
+
+    onAmountChange('');
+  }, [amount, onAmountChange]);
 
   const handleTokenAmountChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^\d+(\.\d*)?$|^\.\d*$/u.test(value)) {
+      if (value === '' || isUnsignedDecimalInput(value)) {
         if (value === '' || value === '.') {
           onAmountChange('');
           onBalancePercentChange(0);
@@ -148,7 +149,7 @@ export const AmountInput: React.FC<AmountInputProps> = ({
           return;
         }
         const usdMargin = (numToken * currentPrice) / leverage;
-        onAmountChange(formatAmount(usdMargin));
+        onAmountChange(formatFlooredDecimals(usdMargin));
         if (availableBalance > 0) {
           const pct = Math.min(
             Math.round((usdMargin / availableBalance) * 100),
@@ -168,7 +169,6 @@ export const AmountInput: React.FC<AmountInputProps> = ({
       availableBalance,
       onAmountChange,
       onBalancePercentChange,
-      formatAmount,
     ],
   );
 
@@ -185,16 +185,16 @@ export const AmountInput: React.FC<AmountInputProps> = ({
         onAmountChange('');
       } else {
         const newAmount = (availableBalance * percent) / 100;
-        onAmountChange(formatAmount(newAmount));
+        onAmountChange(formatFlooredDecimals(newAmount));
       }
     },
-    [onAmountChange, onBalancePercentChange, availableBalance, formatAmount],
+    [onAmountChange, onBalancePercentChange, availableBalance],
   );
 
   const handlePercentInputChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^\d*$/u.test(value)) {
+      if (value === '' || isDigitsOnlyInput(value)) {
         setPercentInputValue(value);
         const num = parseInt(value, 10);
         if (!isNaN(num) && num >= 0 && num <= 100) {
@@ -203,12 +203,12 @@ export const AmountInput: React.FC<AmountInputProps> = ({
             onAmountChange('');
           } else {
             const newAmount = (availableBalance * num) / 100;
-            onAmountChange(formatAmount(newAmount));
+            onAmountChange(formatFlooredDecimals(newAmount));
           }
         }
       }
     },
-    [onAmountChange, onBalancePercentChange, availableBalance, formatAmount],
+    [onAmountChange, onBalancePercentChange, availableBalance],
   );
 
   const handlePercentInputBlur = useCallback(() => {
@@ -220,7 +220,7 @@ export const AmountInput: React.FC<AmountInputProps> = ({
     } else if (num > 100) {
       onBalancePercentChange(100);
       setPercentInputValue('100');
-      onAmountChange(formatAmount(availableBalance));
+      onAmountChange(formatFlooredDecimals(availableBalance));
     } else {
       onBalancePercentChange(num);
       setPercentInputValue(String(num));
@@ -230,11 +230,8 @@ export const AmountInput: React.FC<AmountInputProps> = ({
     onAmountChange,
     onBalancePercentChange,
     availableBalance,
-    formatAmount,
   ]);
 
-  const formattedPlaceholder = useMemo(() => formatAmount(0), [formatAmount]);
-
   return (
     <Box flexDirection={BoxFlexDirection.Column} gap={3}>
       {/* Header: Size, then Available to trade below (both left-aligned) */}
@@ -284,7 +281,7 @@ export const AmountInput: React.FC<AmountInputProps> = ({
             value={amount}
             onChange={handleAmountChange}
             onBlur={handleAmountBlur}
-            placeholder={formattedPlaceholder}
+            placeholder="0.00"
             borderRadius={BorderRadius.MD}
             borderWidth={0}
             backgroundColor={BackgroundColor.backgroundMuted}
diff --git a/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.test.tsx b/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.test.tsx
index b7ab675b853c..d2b6fffc25d5 100644
--- a/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.test.tsx
+++ b/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.test.tsx
@@ -149,6 +149,46 @@ describe('AutoCloseSection', () => {
 
       expect(onTakeProfitPriceChange).not.toHaveBeenCalled();
     });
+
+    it('normalizes take profit price on blur', () => {
+      const onTakeProfitPriceChange = jest.fn();
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          takeProfitPrice="50000.1"
+          onTakeProfitPriceChange={onTakeProfitPriceChange}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('tp-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onTakeProfitPriceChange).toHaveBeenCalledWith('50000.1');
+    });
+
+    it('clears take profit price on blur when value is non-positive', () => {
+      const onTakeProfitPriceChange = jest.fn();
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          takeProfitPrice="0"
+          onTakeProfitPriceChange={onTakeProfitPriceChange}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('tp-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onTakeProfitPriceChange).toHaveBeenCalledWith('');
+    });
   });
 
   describe('stop loss input', () => {
@@ -187,6 +227,46 @@ describe('AutoCloseSection', () => {
 
       expect(onStopLossPriceChange).toHaveBeenCalledWith('40000');
     });
+
+    it('normalizes stop loss price on blur', () => {
+      const onStopLossPriceChange = jest.fn();
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          stopLossPrice="40000.1"
+          onStopLossPriceChange={onStopLossPriceChange}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('sl-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onStopLossPriceChange).toHaveBeenCalledWith('40000.1');
+    });
+
+    it('clears stop loss price on blur when value is non-positive', () => {
+      const onStopLossPriceChange = jest.fn();
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          stopLossPrice="0"
+          onStopLossPriceChange={onStopLossPriceChange}
+        />,
+        mockStore,
+      );
+
+      const container = screen.getByTestId('sl-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onStopLossPriceChange).toHaveBeenCalledWith('');
+    });
   });
 
   describe('percentage calculation', () => {
@@ -264,7 +344,7 @@ describe('AutoCloseSection', () => {
       });
 
       // For long +10%: 45000 * 1.10 = 49500
-      expect(onTakeProfitPriceChange).toHaveBeenCalledWith('49,500.00');
+      expect(onTakeProfitPriceChange).toHaveBeenCalledWith('49500');
     });
 
     it('updates price when percent is entered for SL', () => {
@@ -288,7 +368,68 @@ describe('AutoCloseSection', () => {
       });
 
       // For long -10%: 45000 * 0.90 = 40500
-      expect(onStopLossPriceChange).toHaveBeenCalledWith('40,500.00');
+      expect(onStopLossPriceChange).toHaveBeenCalledWith('40500');
+    });
+  });
+
+  describe('locale handling', () => {
+    it('keeps raw dot-decimal TP value in de locale', () => {
+      const onTakeProfitPriceChange = jest.fn();
+      const deStore = configureStore({
+        localeMessages: {
+          ...(mockState.localeMessages ?? {}),
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          takeProfitPrice="45050.00"
+          onTakeProfitPriceChange={onTakeProfitPriceChange}
+        />,
+        deStore,
+      );
+
+      const container = screen.getByTestId('tp-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      expect(input).toHaveValue('45050.00');
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(onTakeProfitPriceChange).toHaveBeenCalledWith('45050');
+    });
+
+    it('rejects non-en-US locale-formatted TP input while typing', () => {
+      const onTakeProfitPriceChange = jest.fn();
+      const deStore = configureStore({
+        localeMessages: {
+          ...(mockState.localeMessages ?? {}),
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <AutoCloseSection
+          {...defaultProps}
+          enabled={true}
+          takeProfitPrice=""
+          onTakeProfitPriceChange={onTakeProfitPriceChange}
+        />,
+        deStore,
+      );
+
+      const container = screen.getByTestId('tp-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+
+      fireEvent.focus(input as HTMLInputElement);
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '45.050,00' },
+      });
+
+      expect(onTakeProfitPriceChange).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.tsx b/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.tsx
index 028fc4708fa9..667f012fde1c 100644
--- a/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.tsx
+++ b/ui/components/app/perps/order-entry/components/auto-close-section/auto-close-section.tsx
@@ -1,4 +1,3 @@
-import React, { useCallback, useMemo } from 'react';
 import {
   Box,
   Text,
@@ -9,16 +8,18 @@ import {
   BoxAlignItems,
   FontWeight,
 } from '@metamask/design-system-react';
-import { TextField, TextFieldSize } from '../../../../../component-library';
+import React, { useCallback, useMemo } from 'react';
+
 import {
   BorderRadius,
   BackgroundColor,
   TextVariant as TextVariantLegacy,
 } from '../../../../../../helpers/constants/design-system';
-import ToggleButton from '../../../../../ui/toggle-button';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { useFormatters } from '../../../../../../hooks/useFormatters';
+import { TextField, TextFieldSize } from '../../../../../component-library';
+import ToggleButton from '../../../../../ui/toggle-button';
 import type { AutoCloseSectionProps } from '../../order-entry.types';
+import { isSignedDecimalInput, isUnsignedDecimalInput } from '../../utils';
 
 /**
  * AutoCloseSection - Collapsible section for Take Profit and Stop Loss configuration
@@ -51,31 +52,14 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
   entryPrice: entryPriceProp,
 }) => {
   const t = useI18nContext();
-  const { formatNumber } = useFormatters();
 
   // In modify mode use position's entry price; otherwise use current price
   const entryPrice = entryPriceProp ?? currentPrice;
 
-  // Format price for display (with locale-aware formatting)
-  const formatPrice = useCallback(
-    (value: number): string => {
-      return formatNumber(value, {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-      });
-    },
-    [formatNumber],
-  );
-
-  // Format percentage for display
+  // Keep percent inputs in dot-decimal format to match strict input policy.
   const formatPercent = useCallback(
-    (value: number): string => {
-      return formatNumber(value, {
-        minimumFractionDigits: 1,
-        maximumFractionDigits: 1,
-      });
-    },
-    [formatNumber],
+    (value: number): string => value.toFixed(1),
+    [],
   );
 
   // Calculate percentage from price
@@ -84,9 +68,8 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
       if (!price || !entryPrice) {
         return '';
       }
-      const cleanPrice = price.replace(/,/gu, '');
-      const priceNum = parseFloat(cleanPrice);
-      if (isNaN(priceNum) || priceNum <= 0) {
+      const priceNum = Number.parseFloat(price);
+      if (!Number.isFinite(priceNum) || priceNum <= 0) {
         return '';
       }
 
@@ -120,9 +103,12 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
       }
 
       const price = entryPrice * multiplier;
-      return formatPrice(price);
+      const normalizedPrice = Number.parseFloat(price.toFixed(8));
+      return Number.isFinite(normalizedPrice) && normalizedPrice > 0
+        ? normalizedPrice.toString()
+        : '';
     },
-    [entryPrice, direction, formatPrice],
+    [entryPrice, direction],
   );
 
   const handleToggle = useCallback(
@@ -136,28 +122,33 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
   const handleTpPriceChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^[\d,]*\.?\d*$/u.test(value)) {
+      if (value === '' || isUnsignedDecimalInput(value)) {
         onTakeProfitPriceChange(value);
       }
     },
     [onTakeProfitPriceChange],
   );
 
-  // Handle TP price blur - format the value
   const handleTpPriceBlur = useCallback(() => {
-    if (takeProfitPrice) {
-      const numValue = parseFloat(takeProfitPrice.replace(/,/gu, ''));
-      if (!isNaN(numValue) && numValue > 0) {
-        onTakeProfitPriceChange(formatPrice(numValue));
-      }
+    if (!takeProfitPrice) {
+      onTakeProfitPriceChange('');
+      return;
+    }
+
+    const parsed = Number.parseFloat(takeProfitPrice);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      onTakeProfitPriceChange(parsed.toString());
+      return;
     }
-  }, [takeProfitPrice, onTakeProfitPriceChange, formatPrice]);
+
+    onTakeProfitPriceChange('');
+  }, [onTakeProfitPriceChange, takeProfitPrice]);
 
   // Handle TP percentage input change
   const handleTpPercentChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^-?\d*(?:\.\d*)?$/u.test(value)) {
+      if (value === '' || isSignedDecimalInput(value)) {
         const numValue = parseFloat(value);
         if (value === '' || value === '-') {
           onTakeProfitPriceChange('');
@@ -174,28 +165,34 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
   const handleSlPriceChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^[\d,]*(?:\.\d*)?$/u.test(value)) {
+      if (value === '' || isUnsignedDecimalInput(value)) {
         onStopLossPriceChange(value);
       }
     },
     [onStopLossPriceChange],
   );
 
-  // Handle SL price blur - format the value
+  // Handle SL price blur - commit normalized value
   const handleSlPriceBlur = useCallback(() => {
-    if (stopLossPrice) {
-      const numValue = parseFloat(stopLossPrice.replace(/,/gu, ''));
-      if (!isNaN(numValue) && numValue > 0) {
-        onStopLossPriceChange(formatPrice(numValue));
-      }
+    if (!stopLossPrice) {
+      onStopLossPriceChange('');
+      return;
     }
-  }, [stopLossPrice, onStopLossPriceChange, formatPrice]);
+
+    const parsed = Number.parseFloat(stopLossPrice);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      onStopLossPriceChange(parsed.toString());
+      return;
+    }
+
+    onStopLossPriceChange('');
+  }, [onStopLossPriceChange, stopLossPrice]);
 
   // Handle SL percentage input change
   const handleSlPercentChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^-?\d*(?:\.\d*)?$/u.test(value)) {
+      if (value === '' || isSignedDecimalInput(value)) {
         const numValue = parseFloat(value);
         if (value === '' || value === '-') {
           onStopLossPriceChange('');
@@ -269,7 +266,10 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
                   backgroundColor={BackgroundColor.backgroundMuted}
                   className="w-full"
                   data-testid="tp-price-input"
-                  inputProps={{ textVariant: TextVariantLegacy.bodySm }}
+                  inputProps={{
+                    textVariant: TextVariantLegacy.bodySm,
+                    inputMode: 'decimal',
+                  }}
                   startAccessory={
                     <Text
                       variant={TextVariant.BodySm}
@@ -336,7 +336,10 @@ export const AutoCloseSection: React.FC<AutoCloseSectionProps> = ({
                   backgroundColor={BackgroundColor.backgroundMuted}
                   className="w-full"
                   data-testid="sl-price-input"
-                  inputProps={{ textVariant: TextVariantLegacy.bodySm }}
+                  inputProps={{
+                    textVariant: TextVariantLegacy.bodySm,
+                    inputMode: 'decimal',
+                  }}
                   startAccessory={
                     <Text
                       variant={TextVariant.BodySm}
diff --git a/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.test.tsx b/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.test.tsx
index a5907c68e939..58bb5129d78a 100644
--- a/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.test.tsx
+++ b/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen, fireEvent } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
 import { enLocale as messages } from '../../../../../../../test/lib/i18n-helpers';
 import configureStore from '../../../../../../store/store';
@@ -26,67 +26,47 @@ describe('CloseAmountSection', () => {
   });
 
   describe('rendering', () => {
-    it('renders position size label', () => {
+    it('renders position size and close amount labels', () => {
       renderWithProvider(<CloseAmountSection {...defaultProps} />, mockStore);
 
       expect(
-        screen.getByText(messages.perpsPositionSize.message),
+        screen.getByText(messages.perpsAvailableToClose.message),
       ).toBeInTheDocument();
-    });
-
-    it('renders close amount label', () => {
-      renderWithProvider(<CloseAmountSection {...defaultProps} />, mockStore);
-
       expect(
         screen.getByText(messages.perpsCloseAmount.message),
       ).toBeInTheDocument();
     });
 
-    it('displays total position size', () => {
+    it('displays total position size next to label', () => {
       renderWithProvider(
         <CloseAmountSection {...defaultProps} closePercent={50} />,
         mockStore,
       );
 
-      // Use 50% to avoid collision between position size and close amount
-      // Position size: 2.5 BTC, Close amount at 50%: 1.25 BTC
       expect(screen.getByText(/2\.5.*BTC/u)).toBeInTheDocument();
       expect(screen.getByTestId('close-amount-value')).toHaveTextContent(
-        /1\.25.*BTC/u,
+        /\$56,250/u,
       );
     });
 
-    it('displays close amount based on percentage', () => {
+    it('displays close amount USD based on percentage', () => {
       renderWithProvider(
         <CloseAmountSection {...defaultProps} closePercent={75} />,
         mockStore,
       );
 
-      // 75% of 2.5 BTC = 1.875 BTC
       expect(screen.getByTestId('close-amount-value')).toHaveTextContent(
-        /1\.875.*BTC/u,
-      );
-    });
-
-    it('displays close percentage', () => {
-      renderWithProvider(
-        <CloseAmountSection {...defaultProps} closePercent={100} />,
-        mockStore,
+        /\$84,375/u,
       );
-
-      // Multiple elements may show 100% (display and preset button)
-      const percentElements = screen.getAllByText(/100.*%/u);
-      expect(percentElements.length).toBeGreaterThanOrEqual(1);
     });
 
-    it('displays USD value of close amount', () => {
+    it('displays close percentage in chip', () => {
       renderWithProvider(
         <CloseAmountSection {...defaultProps} closePercent={100} />,
         mockStore,
       );
 
-      // 2.5 BTC * $45000 = $112,500
-      expect(screen.getByText(/≈.*\$112,500/u)).toBeInTheDocument();
+      expect(screen.getByText(/100.*%/u)).toBeInTheDocument();
     });
 
     it('renders the slider', () => {
@@ -95,41 +75,39 @@ describe('CloseAmountSection', () => {
       expect(screen.getByTestId('close-amount-slider')).toBeInTheDocument();
     });
 
-    it('renders preset buttons', () => {
+    it('does not render preset percentage buttons', () => {
       renderWithProvider(<CloseAmountSection {...defaultProps} />, mockStore);
 
-      expect(screen.getByTestId('close-percent-preset-25')).toBeInTheDocument();
-      expect(screen.getByTestId('close-percent-preset-50')).toBeInTheDocument();
-      expect(screen.getByTestId('close-percent-preset-75')).toBeInTheDocument();
       expect(
-        screen.getByTestId('close-percent-preset-100'),
-      ).toBeInTheDocument();
+        screen.queryByTestId('close-percent-preset-25'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('close-percent-preset-100'),
+      ).not.toBeInTheDocument();
     });
   });
 
   describe('close amount calculations', () => {
-    it('calculates 50% close amount', () => {
+    it('calculates 50% close USD value', () => {
       renderWithProvider(
         <CloseAmountSection {...defaultProps} closePercent={50} />,
         mockStore,
       );
 
       expect(screen.getByTestId('close-amount-value')).toHaveTextContent(
-        /1\.25.*BTC/u,
+        /\$56,250/u,
       );
-      // Multiple elements show 50% (display and preset button)
-      const percentElements = screen.getAllByText(/50.*%/u);
-      expect(percentElements.length).toBeGreaterThanOrEqual(1);
+      expect(screen.getByText(/50.*%/u)).toBeInTheDocument();
     });
 
-    it('calculates 25% close amount', () => {
+    it('calculates 25% close USD value', () => {
       renderWithProvider(
         <CloseAmountSection {...defaultProps} closePercent={25} />,
         mockStore,
       );
 
       expect(screen.getByTestId('close-amount-value')).toHaveTextContent(
-        /0\.625.*BTC/u,
+        /\$28,125/u,
       );
     });
 
@@ -139,39 +117,11 @@ describe('CloseAmountSection', () => {
         mockStore,
       );
 
-      // Should use absolute value - position size and close amount both show 2.5 BTC
       const btcElements = screen.getAllByText(/2\.5.*BTC/u);
       expect(btcElements.length).toBeGreaterThanOrEqual(1);
     });
   });
 
-  describe('interactions', () => {
-    it('calls onClosePercentChange when preset is clicked', () => {
-      const onClosePercentChange = jest.fn();
-      renderWithProvider(
-        <CloseAmountSection
-          {...defaultProps}
-          onClosePercentChange={onClosePercentChange}
-        />,
-        mockStore,
-      );
-
-      fireEvent.click(screen.getByTestId('close-percent-preset-50'));
-
-      expect(onClosePercentChange).toHaveBeenCalledWith(50);
-    });
-
-    it('applies active style to selected preset', () => {
-      renderWithProvider(
-        <CloseAmountSection {...defaultProps} closePercent={50} />,
-        mockStore,
-      );
-
-      const activePreset = screen.getByTestId('close-percent-preset-50');
-      expect(activePreset).toHaveClass('bg-primary-muted');
-    });
-  });
-
   describe('edge cases', () => {
     it('handles zero position size', () => {
       renderWithProvider(
@@ -179,7 +129,6 @@ describe('CloseAmountSection', () => {
         mockStore,
       );
 
-      // Both position size and close amount show 0 BTC
       const btcElements = screen.getAllByText(/0.*BTC/u);
       expect(btcElements.length).toBeGreaterThanOrEqual(1);
     });
@@ -190,7 +139,6 @@ describe('CloseAmountSection', () => {
         mockStore,
       );
 
-      // Both position size and close amount show 0 BTC
       const btcElements = screen.getAllByText(/0.*BTC/u);
       expect(btcElements.length).toBeGreaterThanOrEqual(1);
     });
diff --git a/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.tsx b/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.tsx
index 3f22f900e0cd..f3f0793df064 100644
--- a/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.tsx
+++ b/ui/components/app/perps/order-entry/components/close-amount-section/close-amount-section.tsx
@@ -1,31 +1,29 @@
 import React, { useCallback, useMemo } from 'react';
 import {
-  twMerge,
   Box,
+  BoxBackgroundColor,
   Text,
   TextVariant,
   TextColor,
+  TextAlign,
   FontWeight,
   BoxFlexDirection,
   BoxJustifyContent,
   BoxAlignItems,
-  ButtonBase,
 } from '@metamask/design-system-react';
 import { PerpsSlider } from '../../../perps-slider';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { useFormatters } from '../../../../../../hooks/useFormatters';
 import type { CloseAmountSectionProps } from '../../order-entry.types';
 
-/**
- * Preset percentage buttons for close amount slider
- */
-const CLOSE_PERCENT_PRESETS = [25, 50, 75, 100] as const;
+/** Fixed width (rem) for the close-% chip so the slider row layout stays stable as digits change */
+const CLOSE_PERCENT_CHIP_WIDTH_REM = 4.75;
 
 /**
  * CloseAmountSection - Section for selecting how much of a position to close
  *
  * @param props - Component props
- * @param props.positionSize - Total position size (absolute value)
+ * @param props.positionSize - Total position size (absolute value); labeled "Available to close"
  * @param props.closePercent - Percentage of position to close (0-100)
  * @param props.onClosePercentChange - Callback when percentage changes
  * @param props.asset - Asset symbol for display
@@ -42,18 +40,15 @@ export const CloseAmountSection: React.FC<CloseAmountSectionProps> = ({
   const { formatCurrencyWithMinThreshold, formatTokenQuantity } =
     useFormatters();
 
-  // Calculate the amount to close based on percentage
   const closeAmount = useMemo(() => {
     const size = Math.abs(parseFloat(positionSize)) || 0;
     return (size * closePercent) / 100;
   }, [positionSize, closePercent]);
 
-  // Calculate USD value of close amount
   const closeValueUsd = useMemo(() => {
     return closeAmount * currentPrice;
   }, [closeAmount, currentPrice]);
 
-  // Handle slider change
   const handleSliderChange = useCallback(
     (_event: React.ChangeEvent<unknown>, value: number | number[]) => {
       const percent = Array.isArray(value) ? value[0] : value;
@@ -62,78 +57,52 @@ export const CloseAmountSection: React.FC<CloseAmountSectionProps> = ({
     [onClosePercentChange],
   );
 
-  // Handle percentage preset button click
-  const handlePercentClick = useCallback(
-    (percent: number) => {
-      onClosePercentChange(percent);
-    },
-    [onClosePercentChange],
-  );
-
   const totalPositionSize = Math.abs(parseFloat(positionSize)) || 0;
 
   return (
     <Box flexDirection={BoxFlexDirection.Column} gap={3}>
-      {/* Position Size Reference */}
       <Box
         flexDirection={BoxFlexDirection.Row}
         justifyContent={BoxJustifyContent.Between}
         alignItems={BoxAlignItems.Center}
       >
         <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-          {t('perpsPositionSize')}
+          {t('perpsAvailableToClose')}
         </Text>
         <Text variant={TextVariant.BodySm} fontWeight={FontWeight.Medium}>
           {formatTokenQuantity(totalPositionSize, asset)}
         </Text>
       </Box>
 
-      {/* Close Amount Section */}
-      <Box
-        className="bg-muted rounded-xl"
-        paddingLeft={4}
-        paddingRight={4}
-        paddingTop={4}
-        paddingBottom={4}
-      >
-        <Box flexDirection={BoxFlexDirection.Column} gap={1}>
-          {/* Label */}
-          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-            {t('perpsCloseAmount')}
-          </Text>
-
-          {/* Close Amount Display - Large and prominent */}
-          <Box
-            flexDirection={BoxFlexDirection.Row}
-            alignItems={BoxAlignItems.Baseline}
-            justifyContent={BoxJustifyContent.Between}
+      <Box flexDirection={BoxFlexDirection.Column} gap={2}>
+        <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
+          {t('perpsCloseAmount')}
+        </Text>
+        <Box
+          backgroundColor={BoxBackgroundColor.BackgroundMuted}
+          className="rounded-xl"
+          padding={4}
+        >
+          <Text
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Medium}
+            data-testid="close-amount-value"
           >
-            <Text
-              variant={TextVariant.HeadingMd}
-              fontWeight={FontWeight.Medium}
-              data-testid="close-amount-value"
-            >
-              {formatTokenQuantity(closeAmount, asset)}
-            </Text>
-            <Text
-              variant={TextVariant.BodyMd}
-              fontWeight={FontWeight.Medium}
-              color={TextColor.TextAlternative}
-            >
-              {closePercent}%
-            </Text>
-          </Box>
-
-          {/* USD Value */}
-          <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-            ≈ {formatCurrencyWithMinThreshold(closeValueUsd, 'USD')}
+            {formatCurrencyWithMinThreshold(closeValueUsd, 'USD')}
           </Text>
         </Box>
       </Box>
 
-      {/* Percentage Slider */}
-      <Box flexDirection={BoxFlexDirection.Column} gap={2}>
-        <Box className="px-3" data-testid="close-amount-slider">
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        gap={4}
+      >
+        <Box
+          className="min-w-0 flex-1"
+          paddingHorizontal={1}
+          data-testid="close-amount-slider"
+        >
           <PerpsSlider
             min={0}
             max={100}
@@ -142,29 +111,27 @@ export const CloseAmountSection: React.FC<CloseAmountSectionProps> = ({
             onChange={handleSliderChange}
           />
         </Box>
-
-        {/* Percentage Preset Buttons */}
         <Box
+          backgroundColor={BoxBackgroundColor.BackgroundMuted}
+          className="rounded-lg"
           flexDirection={BoxFlexDirection.Row}
-          justifyContent={BoxJustifyContent.Between}
           alignItems={BoxAlignItems.Center}
-          className="w-full"
+          justifyContent={BoxJustifyContent.Center}
+          paddingHorizontal={2}
+          paddingVertical={1}
+          style={{
+            width: `${CLOSE_PERCENT_CHIP_WIDTH_REM}rem`,
+            flexShrink: 0,
+          }}
         >
-          {CLOSE_PERCENT_PRESETS.map((preset) => (
-            <ButtonBase
-              key={preset}
-              onClick={() => handlePercentClick(preset)}
-              className={twMerge(
-                'px-3 py-1 rounded-md text-sm',
-                closePercent === preset
-                  ? 'bg-primary-muted text-primary-default'
-                  : 'bg-transparent text-muted hover:bg-muted-hover',
-              )}
-              data-testid={`close-percent-preset-${preset}`}
-            >
-              {preset}%
-            </ButtonBase>
-          ))}
+          <Text
+            variant={TextVariant.BodySm}
+            fontWeight={FontWeight.Medium}
+            textAlign={TextAlign.Center}
+            style={{ width: '100%', fontVariantNumeric: 'tabular-nums' }}
+          >
+            {closePercent} %
+          </Text>
         </Box>
       </Box>
     </Box>
diff --git a/ui/components/app/perps/order-entry/components/leverage-slider/leverage-slider.tsx b/ui/components/app/perps/order-entry/components/leverage-slider/leverage-slider.tsx
index 95212133085c..22fa23ac0860 100644
--- a/ui/components/app/perps/order-entry/components/leverage-slider/leverage-slider.tsx
+++ b/ui/components/app/perps/order-entry/components/leverage-slider/leverage-slider.tsx
@@ -15,6 +15,7 @@ import {
 import { PerpsSlider } from '../../../perps-slider';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import type { LeverageSliderProps } from '../../order-entry.types';
+import { isDigitsOnlyInput } from '../../utils';
 
 /**
  * LeverageSlider - Slider for selecting leverage multiplier
@@ -50,7 +51,7 @@ export const LeverageSlider: React.FC<LeverageSliderProps> = ({
   const handleInputChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^\d*$/u.test(value)) {
+      if (value === '' || isDigitsOnlyInput(value)) {
         setInputValue(value);
         const num = parseInt(value, 10);
         if (!isNaN(num) && num >= minLeverage && num <= maxLeverage) {
diff --git a/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.test.tsx b/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.test.tsx
index d1fd075006f5..2d5dee171145 100644
--- a/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.test.tsx
+++ b/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.test.tsx
@@ -36,6 +36,7 @@ describe('LimitPriceInput', () => {
     onLimitPriceChange: jest.fn(),
     currentPrice: 45250.0,
     midPrice: 45050.0,
+    direction: 'long' as const,
   };
 
   beforeEach(() => {
@@ -118,9 +119,214 @@ describe('LimitPriceInput', () => {
 
       fireEvent.click(screen.getByTestId('limit-price-mid-button'));
 
-      expect(defaultProps.onLimitPriceChange).toHaveBeenCalledWith(
-        expect.stringContaining('45,050'),
+      expect(defaultProps.onLimitPriceChange).toHaveBeenCalledWith('45050');
+    });
+  });
+
+  describe('locale handling', () => {
+    it('keeps raw dot-decimal value in de locale', () => {
+      const deStore = configureStore({
+        localeMessages: {
+          ...(mockState.localeMessages ?? {}),
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          limitPrice="45050.00"
+          onLimitPriceChange={defaultProps.onLimitPriceChange}
+        />,
+        deStore,
+      );
+
+      const container = screen.getByTestId('limit-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      expect(input).toHaveValue('45050.00');
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(defaultProps.onLimitPriceChange).toHaveBeenCalledWith('45050');
+    });
+
+    it('rejects non-en-US locale-formatted input while typing', () => {
+      const onLimitPriceChange = jest.fn();
+      const deStore = configureStore({
+        localeMessages: {
+          ...(mockState.localeMessages ?? {}),
+          currentLocale: 'de',
+        },
+      });
+
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          limitPrice=""
+          onLimitPriceChange={onLimitPriceChange}
+        />,
+        deStore,
+      );
+
+      const container = screen.getByTestId('limit-price-input');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+
+      fireEvent.focus(input as HTMLInputElement);
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '45.050,00' },
+      });
+
+      expect(onLimitPriceChange).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('limit price warnings', () => {
+    it('shows warning when long limit price is above current price', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="long"
+          limitPrice="46000"
+        />,
+        mockStore,
+      );
+
+      expect(screen.getByTestId('limit-price-warning')).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsLimitPriceAboveCurrentPrice.message),
+      ).toBeInTheDocument();
+    });
+
+    it('shows warning when short limit price is below current price', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="short"
+          limitPrice="44000"
+        />,
+        mockStore,
+      );
+
+      expect(screen.getByTestId('limit-price-warning')).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsLimitPriceBelowCurrentPrice.message),
+      ).toBeInTheDocument();
+    });
+
+    it('does not show warning when long limit price is below current price', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="long"
+          limitPrice="44000"
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.queryByTestId('limit-price-warning'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not show warning when short limit price is above current price', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="short"
+          limitPrice="46000"
+        />,
+        mockStore,
       );
+
+      expect(
+        screen.queryByTestId('limit-price-warning'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not show warning when limit price is empty', () => {
+      renderWithProvider(
+        <LimitPriceInput {...defaultProps} limitPrice="" />,
+        mockStore,
+      );
+
+      expect(
+        screen.queryByTestId('limit-price-warning'),
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  describe('liquidation price warnings', () => {
+    it('shows liquidation warning when current price is at or below liquidation price for long', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="long"
+          limitPrice="44000"
+          currentPrice={100}
+          liquidationPrice={200}
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.getByTestId('limit-price-liquidation-warning'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsLimitPriceNearLiquidation.message),
+      ).toBeInTheDocument();
+    });
+
+    it('shows liquidation warning when current price is at or above liquidation price for short', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="short"
+          limitPrice="46000"
+          currentPrice={500}
+          liquidationPrice={400}
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.getByTestId('limit-price-liquidation-warning'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsLimitPriceNearLiquidation.message),
+      ).toBeInTheDocument();
+    });
+
+    it('does not show liquidation warning when liquidation price is not provided', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="long"
+          limitPrice="44000"
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.queryByTestId('limit-price-liquidation-warning'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not show liquidation warning when current price is safely above liquidation for long', () => {
+      renderWithProvider(
+        <LimitPriceInput
+          {...defaultProps}
+          direction="long"
+          limitPrice="44000"
+          currentPrice={45250}
+          liquidationPrice={40000}
+        />,
+        mockStore,
+      );
+
+      expect(
+        screen.queryByTestId('limit-price-liquidation-warning'),
+      ).not.toBeInTheDocument();
     });
   });
 });
diff --git a/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.tsx b/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.tsx
index 9565e9dc4dc1..2e0e6330dde2 100644
--- a/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.tsx
+++ b/ui/components/app/perps/order-entry/components/limit-price-input/limit-price-input.tsx
@@ -1,4 +1,3 @@
-import React, { useCallback } from 'react';
 import {
   Box,
   Text,
@@ -10,14 +9,25 @@ import {
   FontWeight,
   ButtonBase,
   ButtonBaseSize,
+  Icon,
+  IconName,
+  IconSize,
+  IconColor,
 } from '@metamask/design-system-react';
-import { TextField, TextFieldSize } from '../../../../../component-library';
+import React, { useCallback, useMemo } from 'react';
+
 import {
   BorderRadius,
   BackgroundColor,
 } from '../../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { useFormatters } from '../../../../../../hooks/useFormatters';
+import { TextField, TextFieldSize } from '../../../../../component-library';
+import type { OrderDirection } from '../../order-entry.types';
+import {
+  isLimitPriceUnfavorable,
+  isNearLiquidationPrice,
+} from '../../limit-price-warnings';
+import { isUnsignedDecimalInput } from '../../utils';
 
 /**
  * Props for LimitPriceInput component
@@ -31,6 +41,10 @@ export type LimitPriceInputProps = {
   currentPrice: number;
   /** Mid price from top-of-book (optional, falls back to currentPrice) */
   midPrice?: number;
+  /** Order direction (long or short) */
+  direction: OrderDirection;
+  /** Raw estimated liquidation price (for proximity warning) */
+  liquidationPrice?: number | null;
 };
 
 /**
@@ -40,31 +54,24 @@ export type LimitPriceInputProps = {
  * @param options0.onLimitPriceChange
  * @param options0.currentPrice
  * @param options0.midPrice
+ * @param options0.direction
+ * @param options0.liquidationPrice
  */
 export const LimitPriceInput: React.FC<LimitPriceInputProps> = ({
   limitPrice,
   onLimitPriceChange,
   currentPrice,
   midPrice: midPriceProp,
+  direction,
+  liquidationPrice,
 }) => {
   const t = useI18nContext();
-  const { formatNumber } = useFormatters();
-
-  const formatPrice = useCallback(
-    (value: number): string =>
-      formatNumber(value, {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-      }),
-    [formatNumber],
-  );
-
   const midPrice = midPriceProp ?? currentPrice;
 
   const handlePriceChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
-      if (value === '' || /^[\d,]*\.?\d*$/u.test(value)) {
+      if (value === '' || isUnsignedDecimalInput(value)) {
         onLimitPriceChange(value);
       }
     },
@@ -72,19 +79,41 @@ export const LimitPriceInput: React.FC<LimitPriceInputProps> = ({
   );
 
   const handlePriceBlur = useCallback(() => {
-    if (limitPrice) {
-      const numValue = parseFloat(limitPrice.replace(/,/gu, ''));
-      if (!isNaN(numValue) && numValue > 0) {
-        onLimitPriceChange(formatPrice(numValue));
-      }
+    if (!limitPrice) {
+      onLimitPriceChange('');
+      return;
+    }
+
+    const parsed = Number.parseFloat(limitPrice);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      onLimitPriceChange(parsed.toString());
+      return;
     }
-  }, [limitPrice, onLimitPriceChange, formatPrice]);
+
+    onLimitPriceChange('');
+  }, [limitPrice, onLimitPriceChange]);
 
   const handleMidClick = useCallback(() => {
     if (midPrice > 0) {
-      onLimitPriceChange(formatPrice(midPrice));
+      onLimitPriceChange(midPrice.toString());
+    }
+  }, [midPrice, onLimitPriceChange]);
+
+  const limitPriceWarning = useMemo(() => {
+    if (!isLimitPriceUnfavorable(limitPrice, currentPrice, direction)) {
+      return null;
+    }
+    return direction === 'long'
+      ? t('perpsLimitPriceAboveCurrentPrice')
+      : t('perpsLimitPriceBelowCurrentPrice');
+  }, [limitPrice, currentPrice, direction, t]);
+
+  const liquidationWarning = useMemo(() => {
+    if (!isNearLiquidationPrice(currentPrice, liquidationPrice, direction)) {
+      return null;
     }
-  }, [midPrice, onLimitPriceChange, formatPrice]);
+    return t('perpsLimitPriceNearLiquidation');
+  }, [currentPrice, liquidationPrice, direction, t]);
 
   return (
     <Box
@@ -111,6 +140,7 @@ export const LimitPriceInput: React.FC<LimitPriceInputProps> = ({
         backgroundColor={BackgroundColor.backgroundMuted}
         className="w-full"
         data-testid="limit-price-input"
+        inputProps={{ inputMode: 'decimal' }}
         startAccessory={
           <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
             $
@@ -132,6 +162,42 @@ export const LimitPriceInput: React.FC<LimitPriceInputProps> = ({
           </ButtonBase>
         }
       />
+
+      {limitPriceWarning && (
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          gap={1}
+          data-testid="limit-price-warning"
+        >
+          <Icon
+            name={IconName.Warning}
+            size={IconSize.Xs}
+            color={IconColor.WarningDefault}
+          />
+          <Text variant={TextVariant.BodyXs} color={TextColor.WarningDefault}>
+            {limitPriceWarning}
+          </Text>
+        </Box>
+      )}
+
+      {liquidationWarning && (
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          gap={1}
+          data-testid="limit-price-liquidation-warning"
+        >
+          <Icon
+            name={IconName.Warning}
+            size={IconSize.Xs}
+            color={IconColor.ErrorDefault}
+          />
+          <Text variant={TextVariant.BodyXs} color={TextColor.ErrorDefault}>
+            {liquidationWarning}
+          </Text>
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/ui/components/app/perps/order-entry/limit-price-warnings.test.ts b/ui/components/app/perps/order-entry/limit-price-warnings.test.ts
new file mode 100644
index 000000000000..ed181674cb7c
--- /dev/null
+++ b/ui/components/app/perps/order-entry/limit-price-warnings.test.ts
@@ -0,0 +1,147 @@
+import {
+  parseLimitPrice,
+  isLimitPriceUnfavorable,
+  isNearLiquidationPrice,
+} from './limit-price-warnings';
+
+describe('parseLimitPrice', () => {
+  it('parses a plain numeric string', () => {
+    expect(parseLimitPrice('45000')).toBe(45000);
+  });
+
+  it('strips commas', () => {
+    expect(parseLimitPrice('45,000.50')).toBe(45000.5);
+  });
+
+  it('strips dollar signs', () => {
+    expect(parseLimitPrice('$45,000')).toBe(45000);
+  });
+
+  it('returns NaN for empty string', () => {
+    expect(parseLimitPrice('')).toBeNaN();
+  });
+
+  it('returns NaN for non-numeric input', () => {
+    expect(parseLimitPrice('abc')).toBeNaN();
+  });
+});
+
+describe('isLimitPriceUnfavorable', () => {
+  const CURRENT_PRICE = 45000;
+
+  describe('long direction', () => {
+    it('returns true when limit price is above current price', () => {
+      expect(isLimitPriceUnfavorable('46000', CURRENT_PRICE, 'long')).toBe(
+        true,
+      );
+    });
+
+    it('returns false when limit price is below current price', () => {
+      expect(isLimitPriceUnfavorable('44000', CURRENT_PRICE, 'long')).toBe(
+        false,
+      );
+    });
+
+    it('returns false when limit price equals current price', () => {
+      expect(isLimitPriceUnfavorable('45000', CURRENT_PRICE, 'long')).toBe(
+        false,
+      );
+    });
+  });
+
+  describe('short direction', () => {
+    it('returns true when limit price is below current price', () => {
+      expect(isLimitPriceUnfavorable('44000', CURRENT_PRICE, 'short')).toBe(
+        true,
+      );
+    });
+
+    it('returns false when limit price is above current price', () => {
+      expect(isLimitPriceUnfavorable('46000', CURRENT_PRICE, 'short')).toBe(
+        false,
+      );
+    });
+
+    it('returns false when limit price equals current price', () => {
+      expect(isLimitPriceUnfavorable('45000', CURRENT_PRICE, 'short')).toBe(
+        false,
+      );
+    });
+  });
+
+  describe('edge cases', () => {
+    it('returns false for empty limit price', () => {
+      expect(isLimitPriceUnfavorable('', CURRENT_PRICE, 'long')).toBe(false);
+    });
+
+    it('returns false for zero limit price', () => {
+      expect(isLimitPriceUnfavorable('0', CURRENT_PRICE, 'short')).toBe(false);
+    });
+
+    it('returns false when current price is zero', () => {
+      expect(isLimitPriceUnfavorable('46000', 0, 'long')).toBe(false);
+    });
+
+    it('returns false when current price is negative', () => {
+      expect(isLimitPriceUnfavorable('46000', -1, 'long')).toBe(false);
+    });
+
+    it('handles formatted prices with commas and dollar signs', () => {
+      expect(isLimitPriceUnfavorable('$46,000.00', CURRENT_PRICE, 'long')).toBe(
+        true,
+      );
+    });
+  });
+});
+
+describe('isNearLiquidationPrice', () => {
+  describe('long direction', () => {
+    it('returns true when current price is at or below liquidation price', () => {
+      expect(isNearLiquidationPrice(100, 200, 'long')).toBe(true);
+    });
+
+    it('returns true when current price equals liquidation price', () => {
+      expect(isNearLiquidationPrice(200, 200, 'long')).toBe(true);
+    });
+
+    it('returns false when current price is safely above liquidation', () => {
+      expect(isNearLiquidationPrice(45000, 40000, 'long')).toBe(false);
+    });
+  });
+
+  describe('short direction', () => {
+    it('returns true when current price is at or above liquidation price', () => {
+      expect(isNearLiquidationPrice(500, 400, 'short')).toBe(true);
+    });
+
+    it('returns true when current price equals liquidation price', () => {
+      expect(isNearLiquidationPrice(400, 400, 'short')).toBe(true);
+    });
+
+    it('returns false when current price is safely below liquidation', () => {
+      expect(isNearLiquidationPrice(300, 400, 'short')).toBe(false);
+    });
+  });
+
+  describe('edge cases', () => {
+    it('returns false when liquidation price is null', () => {
+      expect(isNearLiquidationPrice(45000, null, 'long')).toBe(false);
+    });
+
+    it('returns false when liquidation price is undefined', () => {
+      expect(isNearLiquidationPrice(45000, undefined, 'long')).toBe(false);
+    });
+
+    it('returns false when liquidation price is zero', () => {
+      expect(isNearLiquidationPrice(45000, 0, 'long')).toBe(false);
+    });
+
+    it('returns false when liquidation price is negative', () => {
+      expect(isNearLiquidationPrice(45000, -100, 'long')).toBe(false);
+    });
+
+    it('returns false when current price is zero', () => {
+      expect(isNearLiquidationPrice(0, 40000, 'long')).toBe(false);
+    });
+  });
+});
diff --git a/ui/components/app/perps/order-entry/limit-price-warnings.ts b/ui/components/app/perps/order-entry/limit-price-warnings.ts
new file mode 100644
index 000000000000..3f5cbbc4e863
--- /dev/null
+++ b/ui/components/app/perps/order-entry/limit-price-warnings.ts
@@ -0,0 +1,83 @@
+import type { OrderDirection } from './order-entry.types';
+
+/**
+ * Parse a formatted limit-price string (may contain commas and "$") into a
+ * numeric value. Returns `NaN` when the input is empty or otherwise
+ * non-numeric.
+ * @param raw
+ */
+export function parseLimitPrice(raw: string): number {
+  const cleaned = raw.replaceAll(',', '').replaceAll('$', '');
+  if (!cleaned) {
+    return Number.NaN;
+  }
+  return Number.parseFloat(cleaned);
+}
+
+/**
+ * Determine whether the given limit price is "unfavorable" relative to the
+ * current market price and the order direction.
+ *
+ * A long order with a limit price above the current price is unfavorable
+ * (the user would pay more than market). A short order with a limit price
+ * below the current price is unfavorable (the user would sell for less than
+ * market). Returns `false` when any input is missing or the parsed price
+ * is zero or negative.
+ *
+ * @param limitPrice - Raw limit price string (may contain commas / "$")
+ * @param currentPrice - Current market price
+ * @param direction - Order direction ("long" or "short")
+ */
+export function isLimitPriceUnfavorable(
+  limitPrice: string,
+  currentPrice: number,
+  direction: OrderDirection,
+): boolean {
+  if (!limitPrice || !currentPrice || currentPrice <= 0) {
+    return false;
+  }
+  const parsed = parseLimitPrice(limitPrice);
+  if (Number.isNaN(parsed) || parsed <= 0) {
+    return false;
+  }
+  if (direction === 'long' && parsed > currentPrice) {
+    return true;
+  }
+  if (direction === 'short' && parsed < currentPrice) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Determine whether the current market price is at or beyond the estimated
+ * liquidation price for the given direction.
+ *
+ * For longs the current price being at or below the liquidation price is
+ * considered near-liquidation. For shorts it is the current price being at
+ * or above the liquidation price. Returns `false` when liquidation price is
+ * unavailable or any input is missing / non-positive.
+ *
+ * @param currentPrice - Current market price
+ * @param liquidationPrice - Estimated liquidation price (may be null)
+ * @param direction - Order direction ("long" or "short")
+ */
+export function isNearLiquidationPrice(
+  currentPrice: number,
+  liquidationPrice: number | null | undefined,
+  direction: OrderDirection,
+): boolean {
+  if (
+    liquidationPrice === null ||
+    liquidationPrice === undefined ||
+    liquidationPrice <= 0
+  ) {
+    return false;
+  }
+  if (!currentPrice || currentPrice <= 0) {
+    return false;
+  }
+  return direction === 'long'
+    ? currentPrice <= liquidationPrice
+    : currentPrice >= liquidationPrice;
+}
diff --git a/ui/components/app/perps/order-entry/order-entry.mocks.ts b/ui/components/app/perps/order-entry/order-entry.mocks.ts
index a75b567cc1de..bc16c7d1e720 100644
--- a/ui/components/app/perps/order-entry/order-entry.mocks.ts
+++ b/ui/components/app/perps/order-entry/order-entry.mocks.ts
@@ -12,7 +12,7 @@ export const mockOrderFormDefaults: OrderFormState = {
   asset: 'BTC',
   direction: 'long',
   amount: '',
-  leverage: 1,
+  leverage: 3,
   balancePercent: 0,
   takeProfitPrice: '',
   stopLossPrice: '',
diff --git a/ui/components/app/perps/order-entry/order-entry.test.tsx b/ui/components/app/perps/order-entry/order-entry.test.tsx
index 8dffe496aec3..7db9992478f5 100644
--- a/ui/components/app/perps/order-entry/order-entry.test.tsx
+++ b/ui/components/app/perps/order-entry/order-entry.test.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
 import { screen, fireEvent } from '@testing-library/react';
-import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-import configureStore from '../../../../store/store';
+import React from 'react';
+
 import mockState from '../../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import configureStore from '../../../../store/store';
 import { OrderEntry } from './order-entry';
 
 // Mock hooks that depend on @metamask/perps-controller to avoid ESM transform issues
@@ -105,6 +106,20 @@ describe('OrderEntry', () => {
       expect(input).toHaveValue('1000');
     });
 
+    it('normalizes amount on blur', () => {
+      renderWithProvider(<OrderEntry {...defaultProps} />, mockStore);
+
+      const container = screen.getByTestId('amount-input-field');
+      const input = container.querySelector('input');
+      expect(input).not.toBeNull();
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '1000' },
+      });
+      fireEvent.blur(input as HTMLInputElement);
+
+      expect(input).toHaveValue('1000.00');
+    });
+
     it('shows token conversion when amount is entered', () => {
       renderWithProvider(<OrderEntry {...defaultProps} />, mockStore);
 
@@ -117,17 +132,18 @@ describe('OrderEntry', () => {
 
       const tokenContainer = screen.getByTestId('amount-input-token-field');
       const tokenInput = tokenContainer.querySelector('input');
-      expect(tokenInput).toHaveValue('1');
+      // Default leverage is 3x, so position size = ($45250 * 3) / $45250 = 3 BTC
+      expect(tokenInput).toHaveValue('3');
     });
   });
 
   describe('leverage slider', () => {
-    it('defaults to 1x leverage', () => {
+    it('defaults to 3x leverage', () => {
       renderWithProvider(<OrderEntry {...defaultProps} />, mockStore);
 
       const container = screen.getByTestId('leverage-input');
       const input = container.querySelector('input');
-      expect(input).toHaveValue('1');
+      expect(input).toHaveValue('3');
     });
   });
 
@@ -149,10 +165,10 @@ describe('OrderEntry', () => {
         target: { value: '1000' },
       });
 
-      // Should show calculated margin (1000 / 1 leverage = $1000)
+      // Should show calculated margin ($1,000 entered)
       expect(screen.getByText('$1,000.00')).toBeInTheDocument();
-      // Should show calculated fees (0.05% of 1000 = $0.50)
-      expect(screen.getByText('$0.50')).toBeInTheDocument();
+      // Should show calculated fees (0.05% of 3000 position value at 3x leverage = $1.50)
+      expect(screen.getByText('$1.50')).toBeInTheDocument();
     });
   });
 
@@ -324,10 +340,7 @@ describe('OrderEntry', () => {
       );
 
       expect(
-        screen.getByText(messages.perpsPositionSize.message),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByText(messages.perpsCloseAmount.message),
+        screen.getByText(messages.perpsAvailableToClose.message),
       ).toBeInTheDocument();
       expect(screen.getByTestId('close-amount-slider')).toBeInTheDocument();
     });
@@ -383,12 +396,12 @@ describe('OrderEntry', () => {
         mockStore,
       );
 
-      // Both the close amount display and the 100% preset button show "100%"
+      // Close amount chip reflects default 100% close
       const percentElements = screen.getAllByText(/100.*%/u);
       expect(percentElements.length).toBeGreaterThanOrEqual(1);
     });
 
-    it('shows close percentage preset buttons', () => {
+    it('does not render close percentage preset buttons', () => {
       renderWithProvider(
         <OrderEntry
           {...defaultProps}
@@ -398,12 +411,18 @@ describe('OrderEntry', () => {
         mockStore,
       );
 
-      expect(screen.getByTestId('close-percent-preset-25')).toBeInTheDocument();
-      expect(screen.getByTestId('close-percent-preset-50')).toBeInTheDocument();
-      expect(screen.getByTestId('close-percent-preset-75')).toBeInTheDocument();
       expect(
-        screen.getByTestId('close-percent-preset-100'),
-      ).toBeInTheDocument();
+        screen.queryByTestId('close-percent-preset-25'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('close-percent-preset-50'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('close-percent-preset-75'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('close-percent-preset-100'),
+      ).not.toBeInTheDocument();
     });
   });
 
diff --git a/ui/components/app/perps/order-entry/order-entry.tsx b/ui/components/app/perps/order-entry/order-entry.tsx
index 43379e02afc0..bbe84ffcfee6 100644
--- a/ui/components/app/perps/order-entry/order-entry.tsx
+++ b/ui/components/app/perps/order-entry/order-entry.tsx
@@ -55,6 +55,7 @@ import { CloseAmountSection } from './components/close-amount-section';
  * @param props.onOrderTypeChange
  * @param props.onCalculationsChange
  * @param props.onAddFunds
+ * @param props.initialLeverage
  */
 export const OrderEntry: React.FC<OrderEntryProps> = ({
   asset,
@@ -73,6 +74,7 @@ export const OrderEntry: React.FC<OrderEntryProps> = ({
   midPrice,
   onOrderTypeChange,
   onAddFunds,
+  initialLeverage,
 }) => {
   const t = useI18nContext();
 
@@ -101,6 +103,7 @@ export const OrderEntry: React.FC<OrderEntryProps> = ({
     onFormStateChange,
     onSubmit,
     orderType,
+    initialLeverage,
   });
 
   const isLong = formState.direction === 'long';
@@ -119,6 +122,7 @@ export const OrderEntry: React.FC<OrderEntryProps> = ({
         a.positionSize !== b.positionSize ||
         a.marginRequired !== b.marginRequired ||
         a.liquidationPrice !== b.liquidationPrice ||
+        a.liquidationPriceRaw !== b.liquidationPriceRaw ||
         a.orderValue !== b.orderValue ||
         a.estimatedFees !== b.estimatedFees
       );
@@ -248,6 +252,8 @@ export const OrderEntry: React.FC<OrderEntryProps> = ({
             onLimitPriceChange={handleLimitPriceChange}
             currentPrice={currentPrice}
             midPrice={midPrice}
+            direction={formState.direction}
+            liquidationPrice={calculations.liquidationPriceRaw}
           />
         )}
 
diff --git a/ui/components/app/perps/order-entry/order-entry.types.ts b/ui/components/app/perps/order-entry/order-entry.types.ts
index 3c2c64ec2611..9e2ef171fd1d 100644
--- a/ui/components/app/perps/order-entry/order-entry.types.ts
+++ b/ui/components/app/perps/order-entry/order-entry.types.ts
@@ -77,8 +77,10 @@ export type OrderCalculations = {
   positionSize: string | null;
   /** Margin required for the position */
   marginRequired: string | null;
-  /** Estimated liquidation price */
+  /** Estimated liquidation price (formatted) */
   liquidationPrice: string | null;
+  /** Raw estimated liquidation price as a number (for comparisons) */
+  liquidationPriceRaw: number | null;
   /** Total order value in USD */
   orderValue: string | null;
   /** Estimated trading fees */
@@ -121,6 +123,8 @@ export type OrderEntryProps = {
   onOrderTypeChange?: (orderType: OrderType) => void;
   /** Callback when add-funds icon is pressed in the amount input */
   onAddFunds?: () => void;
+  /** Initial leverage override for new orders (e.g. last used leverage for this market) */
+  initialLeverage?: number;
 };
 
 /**
diff --git a/ui/components/app/perps/order-entry/utils.test.ts b/ui/components/app/perps/order-entry/utils.test.ts
new file mode 100644
index 000000000000..87ec898dbb24
--- /dev/null
+++ b/ui/components/app/perps/order-entry/utils.test.ts
@@ -0,0 +1,56 @@
+import {
+  isDigitsOnlyInput,
+  isSignedDecimalInput,
+  isUnsignedDecimalInput,
+} from './utils';
+
+describe('order-entry utils', () => {
+  describe('isDigitsOnlyInput', () => {
+    it('accepts digit-only values', () => {
+      expect(isDigitsOnlyInput('')).toBe(true);
+      expect(isDigitsOnlyInput('0')).toBe(true);
+      expect(isDigitsOnlyInput('123456')).toBe(true);
+    });
+
+    it('rejects non-digit values', () => {
+      expect(isDigitsOnlyInput('12.3')).toBe(false);
+      expect(isDigitsOnlyInput('-10')).toBe(false);
+      expect(isDigitsOnlyInput('abc')).toBe(false);
+    });
+  });
+
+  describe('isUnsignedDecimalInput', () => {
+    it('accepts unsigned decimal typing states', () => {
+      expect(isUnsignedDecimalInput('')).toBe(true);
+      expect(isUnsignedDecimalInput('.')).toBe(true);
+      expect(isUnsignedDecimalInput('10')).toBe(true);
+      expect(isUnsignedDecimalInput('10.')).toBe(true);
+      expect(isUnsignedDecimalInput('.25')).toBe(true);
+      expect(isUnsignedDecimalInput('10.25')).toBe(true);
+    });
+
+    it('rejects invalid unsigned decimal values', () => {
+      expect(isUnsignedDecimalInput('10..2')).toBe(false);
+      expect(isUnsignedDecimalInput('1-0')).toBe(false);
+      expect(isUnsignedDecimalInput('a10')).toBe(false);
+    });
+  });
+
+  describe('isSignedDecimalInput', () => {
+    it('accepts signed decimal typing states', () => {
+      expect(isSignedDecimalInput('')).toBe(true);
+      expect(isSignedDecimalInput('-')).toBe(true);
+      expect(isSignedDecimalInput('-.')).toBe(true);
+      expect(isSignedDecimalInput('.')).toBe(true);
+      expect(isSignedDecimalInput('-12.5')).toBe(true);
+      expect(isSignedDecimalInput('12.5')).toBe(true);
+    });
+
+    it('rejects invalid signed decimal values', () => {
+      expect(isSignedDecimalInput('--1')).toBe(false);
+      expect(isSignedDecimalInput('-1-2')).toBe(false);
+      expect(isSignedDecimalInput('1.2.3')).toBe(false);
+      expect(isSignedDecimalInput('1a')).toBe(false);
+    });
+  });
+});
diff --git a/ui/components/app/perps/order-entry/utils.ts b/ui/components/app/perps/order-entry/utils.ts
new file mode 100644
index 000000000000..e19c1c8fd772
--- /dev/null
+++ b/ui/components/app/perps/order-entry/utils.ts
@@ -0,0 +1,64 @@
+const isDigit = (char: string): boolean => char >= '0' && char <= '9';
+
+/**
+ * Linear-time digit check for integer-style inputs.
+ * @param value
+ */
+export const isDigitsOnlyInput = (value: string): boolean => {
+  for (const char of value) {
+    if (!isDigit(char)) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Linear-time unsigned decimal validation with optional single decimal point.
+ * Accepts intermediate input states like ".".
+ * @param value
+ */
+export const isUnsignedDecimalInput = (value: string): boolean => {
+  let seenDecimal = false;
+  for (const char of value) {
+    if (char === '.') {
+      if (seenDecimal) {
+        return false;
+      }
+      seenDecimal = true;
+      continue;
+    }
+    if (!isDigit(char)) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Linear-time signed decimal validation with optional leading minus and
+ * optional single decimal point. Accepts intermediate states like "-" and "-.".
+ * @param value
+ */
+export const isSignedDecimalInput = (value: string): boolean => {
+  let startIndex = 0;
+  if (value.startsWith('-')) {
+    startIndex = 1;
+  }
+
+  let seenDecimal = false;
+  for (let index = startIndex; index < value.length; index += 1) {
+    const char = value[index];
+    if (char === '.') {
+      if (seenDecimal) {
+        return false;
+      }
+      seenDecimal = true;
+      continue;
+    }
+    if (!isDigit(char)) {
+      return false;
+    }
+  }
+  return true;
+};
diff --git a/ui/components/app/perps/perps-balance-dropdown/index.ts b/ui/components/app/perps/perps-balance-dropdown/index.ts
index ff5bbe6dcc6f..fb2d9c0ce776 100644
--- a/ui/components/app/perps/perps-balance-dropdown/index.ts
+++ b/ui/components/app/perps/perps-balance-dropdown/index.ts
@@ -1,4 +1,6 @@
 export {
   PerpsBalanceDropdown,
+  invokePerpsBalanceAction,
+  type PerpsBalanceActionHandler,
   type PerpsBalanceDropdownProps,
 } from './perps-balance-dropdown';
diff --git a/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.test.tsx b/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.test.tsx
index d9250c225823..4af1b971b8bd 100644
--- a/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.test.tsx
+++ b/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.test.tsx
@@ -1,10 +1,13 @@
 import React from 'react';
-import { fireEvent, screen } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../../store/store';
 import mockState from '../../../../../test/data/mock-state.json';
 import { mockAccountState } from '../mocks';
-import { PerpsBalanceDropdown } from './perps-balance-dropdown';
+import {
+  PerpsBalanceDropdown,
+  invokePerpsBalanceAction,
+} from './perps-balance-dropdown';
 
 jest.mock('../../../../hooks/useFormatters', () => ({
   useFormatters: () => ({
@@ -37,6 +40,33 @@ const mockStore = configureStore({
   },
 });
 
+describe('invokePerpsBalanceAction', () => {
+  it('logs when callback returns a rejected promise', async () => {
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+
+    invokePerpsBalanceAction(() => Promise.reject(new Error('fail')));
+
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(consoleErrorSpy).toHaveBeenCalledWith(expect.any(Error));
+    consoleErrorSpy.mockRestore();
+  });
+
+  it('does nothing when callback is undefined', () => {
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+
+    invokePerpsBalanceAction(undefined);
+
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
+    consoleErrorSpy.mockRestore();
+  });
+});
+
 describe('PerpsBalanceDropdown', () => {
   it('renders the balance dropdown component', () => {
     renderWithProvider(<PerpsBalanceDropdown />, mockStore);
@@ -109,6 +139,28 @@ describe('PerpsBalanceDropdown', () => {
     expect(onWithdraw).toHaveBeenCalledTimes(1);
   });
 
+  it('logs when onWithdraw returns a rejected promise', async () => {
+    const consoleErrorSpy = jest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+    const onWithdraw = jest
+      .fn()
+      .mockImplementation(() => Promise.reject(new Error('withdraw failed')));
+
+    renderWithProvider(
+      <PerpsBalanceDropdown onWithdraw={onWithdraw} />,
+      mockStore,
+    );
+
+    fireEvent.click(screen.getByTestId('perps-balance-dropdown-balance'));
+    fireEvent.click(screen.getByTestId('perps-balance-dropdown-withdraw'));
+
+    await waitFor(() => {
+      expect(consoleErrorSpy).toHaveBeenCalledWith(expect.any(Error));
+    });
+    consoleErrorSpy.mockRestore();
+  });
+
   it('does not show P&L row when hasPositions is false', () => {
     renderWithProvider(
       <PerpsBalanceDropdown hasPositions={false} />,
diff --git a/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.tsx b/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.tsx
index 6360a4b94be9..d1b6d917ba88 100644
--- a/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.tsx
+++ b/ui/components/app/perps/perps-balance-dropdown/perps-balance-dropdown.tsx
@@ -20,13 +20,31 @@ import { useFormatters } from '../../../../hooks/useFormatters';
 import { usePerpsEligibility } from '../../../../hooks/perps';
 import { usePerpsLiveAccount } from '../../../../hooks/perps/stream';
 
+/** Handler from perps triggers (e.g. deposit / withdraw); may return a Promise. */
+export type PerpsBalanceActionHandler = () => void | Promise<unknown>;
+
+/**
+ * Runs an optional UI callback that may be sync or async. If it returns a
+ * rejected promise, the failure is logged so it does not surface as an
+ * unhandled rejection (e.g. event handlers cannot be `async` in all call sites).
+ *
+ * @param callback - Optional handler; may return a Promise.
+ */
+export function invokePerpsBalanceAction(
+  callback?: PerpsBalanceActionHandler,
+): void {
+  Promise.resolve(callback?.()).catch((error: unknown) => {
+    console.error(error);
+  });
+}
+
 export type PerpsBalanceDropdownProps = {
   /** Whether the user has open positions (controls P&L row visibility) */
   hasPositions?: boolean;
   /** Callback when Add funds button is pressed */
-  onAddFunds?: () => void;
+  onAddFunds?: PerpsBalanceActionHandler;
   /** Callback when Withdraw button is pressed */
-  onWithdraw?: () => void;
+  onWithdraw?: PerpsBalanceActionHandler;
 };
 
 /**
@@ -72,11 +90,11 @@ export const PerpsBalanceDropdown: React.FC<PerpsBalanceDropdownProps> = ({
     if (!isEligible) {
       return;
     }
-    onAddFunds?.();
+    invokePerpsBalanceAction(onAddFunds);
   }, [isEligible, onAddFunds]);
 
   const handleWithdraw = useCallback(() => {
-    onWithdraw?.();
+    invokePerpsBalanceAction(onWithdraw);
   }, [onWithdraw]);
 
   const containerRef = useRef<HTMLDivElement>(null);
diff --git a/ui/components/app/perps/perps-fiat-hero-amount-input/index.ts b/ui/components/app/perps/perps-fiat-hero-amount-input/index.ts
new file mode 100644
index 000000000000..5c893700c02d
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-hero-amount-input/index.ts
@@ -0,0 +1,5 @@
+export {
+  PerpsFiatHeroAmountInput,
+  PerpsFiatHeroAmountSkeleton,
+} from './perps-fiat-hero-amount-input';
+export type { PerpsFiatHeroAmountInputProps } from './perps-fiat-hero-amount-input.types';
diff --git a/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.test.tsx b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.test.tsx
new file mode 100644
index 000000000000..af1092428a1d
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.test.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import {
+  PerpsFiatHeroAmountInput,
+  isValidPartialFiatAmountInput,
+} from './perps-fiat-hero-amount-input';
+
+describe('isValidPartialFiatAmountInput', () => {
+  it('accepts empty, digits, and a single separator', () => {
+    expect(isValidPartialFiatAmountInput('')).toBe(true);
+    expect(isValidPartialFiatAmountInput('0')).toBe(true);
+    expect(isValidPartialFiatAmountInput('12.5')).toBe(true);
+    expect(isValidPartialFiatAmountInput('12,5')).toBe(true);
+    expect(isValidPartialFiatAmountInput('.5')).toBe(true);
+    expect(isValidPartialFiatAmountInput('5.')).toBe(true);
+  });
+
+  it('rejects invalid characters and multiple separators', () => {
+    expect(isValidPartialFiatAmountInput('12a')).toBe(false);
+    expect(isValidPartialFiatAmountInput('1.2.3')).toBe(false);
+    expect(isValidPartialFiatAmountInput('1,2,')).toBe(false);
+  });
+
+  it('rejects input longer than the max length', () => {
+    expect(isValidPartialFiatAmountInput('0'.repeat(49))).toBe(false);
+    expect(isValidPartialFiatAmountInput('0'.repeat(48))).toBe(true);
+  });
+});
+
+describe('PerpsFiatHeroAmountInput', () => {
+  it('renders symbol and forwards input changes', () => {
+    const onChange = jest.fn();
+    render(<PerpsFiatHeroAmountInput value="" onChange={onChange} />);
+
+    expect(
+      screen.getByTestId('perps-fiat-hero-amount-symbol'),
+    ).toBeInTheDocument();
+    fireEvent.change(screen.getByTestId('perps-fiat-hero-amount-input'), {
+      target: { value: '12.5' },
+    });
+    expect(onChange).toHaveBeenCalledWith('12.5');
+  });
+
+  it('shows skeleton when loading', () => {
+    render(
+      <PerpsFiatHeroAmountInput value="1" onChange={jest.fn()} isLoading />,
+    );
+
+    expect(
+      screen.getByTestId('perps-fiat-hero-amount-skeleton'),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByTestId('perps-fiat-hero-amount-input'),
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.tsx b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.tsx
new file mode 100644
index 000000000000..bf6730078815
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.tsx
@@ -0,0 +1,172 @@
+import React, { useCallback } from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Text,
+  TextAlign,
+  TextColor,
+  twMerge,
+} from '@metamask/design-system-react';
+import { Skeleton } from '../../../component-library/skeleton';
+import { getCurrencySymbol } from '../../../../helpers/utils/common.util';
+import type { PerpsFiatHeroAmountInputProps } from './perps-fiat-hero-amount-input.types';
+
+/**
+ * Visual twin of confirmations `CustomAmount` for standalone Perps screens.
+ * Keep in sync manually with `ui/pages/confirmations/.../custom-amount.tsx`.
+ * @param length
+ */
+function getFontSize(length: number): string {
+  if (length <= 8) {
+    return '64px';
+  }
+  if (length <= 13) {
+    return '40px';
+  }
+  if (length <= 18) {
+    return '30px';
+  }
+  return '20px';
+}
+
+function getLineHeight(length: number): string {
+  if (length <= 8) {
+    return '70px';
+  }
+  if (length <= 13) {
+    return '44px';
+  }
+  if (length <= 18) {
+    return '33px';
+  }
+  return '22px';
+}
+
+/** Enough for realistic USD entry; bounds worst-case validation cost. */
+const MAX_PARTIAL_FIAT_AMOUNT_LENGTH = 48;
+
+/**
+ * Partial amount while typing: digits with at most one `,` or `.` separator.
+ * Linear-time (no regex) so pathological strings cannot burn CPU.
+ * @param raw
+ */
+export function isValidPartialFiatAmountInput(raw: string): boolean {
+  if (raw.length > MAX_PARTIAL_FIAT_AMOUNT_LENGTH) {
+    return false;
+  }
+  let sawSeparator = false;
+  for (const c of raw) {
+    if (c >= '0' && c <= '9') {
+      continue;
+    }
+    if (c === '.' || c === ',') {
+      if (sawSeparator) {
+        return false;
+      }
+      sawSeparator = true;
+      continue;
+    }
+    return false;
+  }
+  return true;
+}
+
+function getHeroAmountTextColor(
+  hasAlert: boolean,
+  disabled: boolean,
+): TextColor {
+  if (hasAlert) {
+    return TextColor.ErrorDefault;
+  }
+  if (disabled) {
+    return TextColor.TextMuted;
+  }
+  return TextColor.TextDefault;
+}
+
+export const PerpsFiatHeroAmountSkeleton: React.FC = () => (
+  <Box
+    flexDirection={BoxFlexDirection.Row}
+    justifyContent={BoxJustifyContent.Center}
+    alignItems={BoxAlignItems.Center}
+    style={{ minHeight: '70px' }}
+    data-testid="perps-fiat-hero-amount-skeleton"
+  >
+    <Skeleton height={70} width={80} />
+  </Box>
+);
+
+export const PerpsFiatHeroAmountInput: React.FC<PerpsFiatHeroAmountInputProps> =
+  React.memo(
+    ({
+      value,
+      onChange,
+      disabled = false,
+      hasAlert = false,
+      isLoading = false,
+    }) => {
+      const fiatSymbol = getCurrencySymbol('USD');
+      const amountLength = value.length;
+
+      const handleChange = useCallback(
+        (e: React.ChangeEvent<HTMLInputElement>) => {
+          const next = e.target.value;
+          if (isValidPartialFiatAmountInput(next)) {
+            onChange(next);
+          }
+        },
+        [onChange],
+      );
+
+      if (isLoading) {
+        return <PerpsFiatHeroAmountSkeleton />;
+      }
+
+      const fontSize = getFontSize(amountLength);
+      const lineHeight = getLineHeight(amountLength);
+      const textColor = getHeroAmountTextColor(hasAlert, disabled);
+
+      return (
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          justifyContent={BoxJustifyContent.Center}
+          alignItems={BoxAlignItems.Center}
+          style={{ minHeight: '70px' }}
+        >
+          <Text
+            data-testid="perps-fiat-hero-amount-symbol"
+            textAlign={TextAlign.Right}
+            fontWeight={FontWeight.Medium}
+            color={textColor}
+            style={{ fontSize, lineHeight }}
+          >
+            {fiatSymbol}
+          </Text>
+          <input
+            data-testid="perps-fiat-hero-amount-input"
+            type="text"
+            inputMode="decimal"
+            value={value}
+            onChange={handleChange}
+            disabled={disabled}
+            className={twMerge(
+              textColor,
+              'border-none bg-transparent text-left outline-none',
+              disabled ? 'cursor-default' : 'cursor-text',
+            )}
+            style={
+              {
+                fontSize,
+                lineHeight,
+                fontWeight: 500,
+                width: `${Math.max(1, amountLength)}ch`,
+              } as React.CSSProperties
+            }
+          />
+        </Box>
+      );
+    },
+  );
diff --git a/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.types.ts b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.types.ts
new file mode 100644
index 000000000000..d2b3f9fb25fb
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-hero-amount-input/perps-fiat-hero-amount-input.types.ts
@@ -0,0 +1,7 @@
+export type PerpsFiatHeroAmountInputProps = {
+  value: string;
+  onChange: (value: string) => void;
+  disabled?: boolean;
+  hasAlert?: boolean;
+  isLoading?: boolean;
+};
diff --git a/ui/components/app/perps/perps-fiat-summary-rows/index.ts b/ui/components/app/perps/perps-fiat-summary-rows/index.ts
new file mode 100644
index 000000000000..cfc0aeed7b1a
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-summary-rows/index.ts
@@ -0,0 +1,5 @@
+export { PerpsFiatSummaryRows } from './perps-fiat-summary-rows';
+export type {
+  PerpsFiatSummaryRow,
+  PerpsFiatSummaryRowsProps,
+} from './perps-fiat-summary-rows.types';
diff --git a/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.test.tsx b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.test.tsx
new file mode 100644
index 000000000000..b4002481425b
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.test.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import configureStore from '../../../../store/store';
+import mockState from '../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
+import { ConfirmInfoRowSize } from '../../confirm/info/row/row';
+import { PerpsFiatSummaryRows } from './perps-fiat-summary-rows';
+
+describe('PerpsFiatSummaryRows', () => {
+  it('renders labels and values', () => {
+    const store = configureStore({ metamask: mockState.metamask });
+    renderWithProvider(
+      <PerpsFiatSummaryRows
+        rowVariant={ConfirmInfoRowSize.Small}
+        rows={[
+          { label: 'Fee', value: '$1.00', 'data-testid': 'row-fee' },
+          {
+            label: messages.time.message,
+            value: '~5 min',
+            'data-testid': 'row-time',
+          },
+        ]}
+      />,
+      store,
+    );
+
+    expect(screen.getByTestId('perps-fiat-summary-rows')).toBeInTheDocument();
+    expect(screen.getByText('Fee')).toBeInTheDocument();
+    expect(screen.getByText('$1.00')).toBeInTheDocument();
+    expect(screen.getByText(messages.time.message)).toBeInTheDocument();
+    expect(screen.getByText('~5 min')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.tsx b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.tsx
new file mode 100644
index 000000000000..ef5df36ef9b4
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import {
+  Box,
+  BoxFlexDirection,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react';
+import { ConfirmInfoRow, ConfirmInfoRowSize } from '../../confirm/info/row/row';
+import type { PerpsFiatSummaryRowsProps } from './perps-fiat-summary-rows.types';
+
+/**
+ * Confirmation-style key/value rows for standalone Perps flows (e.g. withdraw).
+ * Mirrors small-row typography from `TotalRow` / `BridgeTimeRow` in confirmations.
+ * @param options0
+ * @param options0.rows
+ * @param options0.rowVariant
+ */
+export const PerpsFiatSummaryRows: React.FC<PerpsFiatSummaryRowsProps> = ({
+  rows,
+  rowVariant = ConfirmInfoRowSize.Small,
+}) => {
+  const isSmall = rowVariant === ConfirmInfoRowSize.Small;
+  const textVariant = TextVariant.BodyMd;
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Column}
+      gap={2}
+      paddingBottom={4}
+      data-testid="perps-fiat-summary-rows"
+    >
+      {rows.map(
+        (
+          {
+            label,
+            value,
+            valueContent,
+            'data-testid': dataTestId,
+            emphasizeValue,
+            valueColor = TextColor.TextAlternative,
+          },
+          index,
+        ) => {
+          const valueFontWeight =
+            emphasizeValue || !isSmall ? FontWeight.Medium : undefined;
+
+          return (
+            <ConfirmInfoRow
+              key={`${label}-${index}`}
+              label={label}
+              rowVariant={rowVariant}
+              data-testid={dataTestId}
+            >
+              {valueContent ?? (
+                <Text
+                  variant={textVariant}
+                  color={valueColor}
+                  fontWeight={valueFontWeight}
+                  data-testid={dataTestId ? `${dataTestId}-value` : undefined}
+                >
+                  {value}
+                </Text>
+              )}
+            </ConfirmInfoRow>
+          );
+        },
+      )}
+    </Box>
+  );
+};
diff --git a/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.types.ts b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.types.ts
new file mode 100644
index 000000000000..98620cdae369
--- /dev/null
+++ b/ui/components/app/perps/perps-fiat-summary-rows/perps-fiat-summary-rows.types.ts
@@ -0,0 +1,20 @@
+import type { TextColor } from '@metamask/design-system-react';
+import type { ReactNode } from 'react';
+import type { ConfirmInfoRowSize } from '../../confirm/info/row/row';
+
+export type PerpsFiatSummaryRow = {
+  label: string;
+  /** Shown when `valueContent` is not set. */
+  value?: string;
+  /** Renders in place of `value` (e.g. token + network badge). */
+  valueContent?: ReactNode;
+  'data-testid'?: string;
+  emphasizeValue?: boolean;
+  /** Value column text color; defaults to `textAlternative`. */
+  valueColor?: TextColor;
+};
+
+export type PerpsFiatSummaryRowsProps = {
+  rows: PerpsFiatSummaryRow[];
+  rowVariant?: ConfirmInfoRowSize;
+};
diff --git a/ui/components/app/perps/perps-market-balance-actions/perps-market-balance-actions.tsx b/ui/components/app/perps/perps-market-balance-actions/perps-market-balance-actions.tsx
index fa5e8420ef68..1b41789ff3e5 100644
--- a/ui/components/app/perps/perps-market-balance-actions/perps-market-balance-actions.tsx
+++ b/ui/components/app/perps/perps-market-balance-actions/perps-market-balance-actions.tsx
@@ -17,6 +17,10 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useFormatters } from '../../../../hooks/useFormatters';
 import { usePerpsEligibility } from '../../../../hooks/perps';
 import { usePerpsLiveAccount } from '../../../../hooks/perps/stream';
+import {
+  invokePerpsBalanceAction,
+  type PerpsBalanceActionHandler,
+} from '../perps-balance-dropdown';
 
 type PerpsMarketBalanceActionsProps = {
   /** Whether to show the action buttons (Add funds, Withdraw) */
@@ -24,9 +28,9 @@ type PerpsMarketBalanceActionsProps = {
   /** Whether add funds transaction creation is in progress */
   isAddFundsLoading?: boolean;
   /** Callback when Add funds button is pressed */
-  onAddFunds?: () => void;
+  onAddFunds?: PerpsBalanceActionHandler;
   /** Callback when Withdraw button is pressed */
-  onWithdraw?: () => void;
+  onWithdraw?: PerpsBalanceActionHandler;
   /** Callback when Learn more button is pressed */
   onLearnMore?: () => void;
 };
@@ -56,11 +60,11 @@ const PerpsMarketBalanceActions: React.FC<PerpsMarketBalanceActionsProps> = ({
     if (!isEligible) {
       return;
     }
-    onAddFunds?.();
+    invokePerpsBalanceAction(onAddFunds);
   }, [isEligible, onAddFunds]);
 
   const handleWithdraw = useCallback(() => {
-    onWithdraw?.();
+    invokePerpsBalanceAction(onWithdraw);
   }, [onWithdraw]);
 
   const handleLearnMore = useCallback(() => {
diff --git a/ui/components/app/perps/perps-positions-orders/perps-positions-orders.tsx b/ui/components/app/perps/perps-positions-orders/perps-positions-orders.tsx
index 22d7deb3dfa0..26a408fe6cc3 100644
--- a/ui/components/app/perps/perps-positions-orders/perps-positions-orders.tsx
+++ b/ui/components/app/perps/perps-positions-orders/perps-positions-orders.tsx
@@ -8,6 +8,8 @@ import {
   TextVariant,
   TextColor,
   FontWeight,
+  ButtonBase,
+  ButtonBaseSize,
 } from '@metamask/design-system-react';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { PositionCard } from '../position-card';
@@ -17,11 +19,19 @@ import type { Position, Order } from '../types';
 export type PerpsPositionsOrdersProps = {
   positions: Position[];
   orders: Order[];
+  onCloseAllPositions?: () => void;
+  onCancelAllOrders?: () => void;
+  isCloseAllPending?: boolean;
+  isCancelAllPending?: boolean;
 };
 
 export const PerpsPositionsOrders: React.FC<PerpsPositionsOrdersProps> = ({
   positions,
   orders,
+  onCloseAllPositions,
+  onCancelAllOrders,
+  isCloseAllPending = false,
+  isCancelAllPending = false,
 }) => {
   const t = useI18nContext();
   const hasPositions = positions.length > 0;
@@ -53,12 +63,19 @@ export const PerpsPositionsOrders: React.FC<PerpsPositionsOrdersProps> = ({
             marginBottom={2}
           >
             <Text fontWeight={FontWeight.Medium}>{t('perpsPositions')}</Text>
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
+            <ButtonBase
+              size={ButtonBaseSize.Sm}
+              disabled={isCloseAllPending || !onCloseAllPositions}
+              onClick={onCloseAllPositions}
+              data-testid="perps-close-all-positions"
+              className="min-w-0 rounded-md border-0 bg-transparent px-1 py-0.5 -mr-1 shadow-none hover:bg-transparent active:bg-transparent focus-visible:bg-transparent disabled:opacity-50"
+              textProps={{
+                variant: TextVariant.BodySm,
+                color: TextColor.TextAlternative,
+              }}
             >
               {t('perpsCloseAll')}
-            </Text>
+            </ButtonBase>
           </Box>
           <Box flexDirection={BoxFlexDirection.Column}>
             {positions.map((position) => (
@@ -84,12 +101,19 @@ export const PerpsPositionsOrders: React.FC<PerpsPositionsOrdersProps> = ({
             marginBottom={2}
           >
             <Text fontWeight={FontWeight.Medium}>{t('perpsOpenOrders')}</Text>
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
+            <ButtonBase
+              size={ButtonBaseSize.Sm}
+              disabled={isCancelAllPending || !onCancelAllOrders}
+              onClick={onCancelAllOrders}
+              data-testid="perps-cancel-all-orders"
+              className="min-w-0 rounded-md border-0 bg-transparent px-1 py-0.5 -mr-1 shadow-none hover:bg-transparent active:bg-transparent focus-visible:bg-transparent disabled:opacity-50"
+              textProps={{
+                variant: TextVariant.BodySm,
+                color: TextColor.TextAlternative,
+              }}
             >
               {t('perpsCancelAllOrders')}
-            </Text>
+            </ButtonBase>
           </Box>
           <Box flexDirection={BoxFlexDirection.Column}>
             {orders.map((order) => (
diff --git a/ui/components/app/perps/perps-slider/perps-slider.tsx b/ui/components/app/perps/perps-slider/perps-slider.tsx
index 02f2735965bd..397fa99be5d8 100644
--- a/ui/components/app/perps/perps-slider/perps-slider.tsx
+++ b/ui/components/app/perps/perps-slider/perps-slider.tsx
@@ -14,7 +14,9 @@ import {
 import InfoTooltip from '../../../ui/info-tooltip/info-tooltip';
 
 /**
- * Material UI styles for the slider - uses CSS variables for theming
+ * Material UI styles for the slider - uses CSS variables for theming.
+ * MUI v4's default Slider shrinks the thumb to 8×8 when disabled; we keep the
+ * same size as enabled so $0 available / disabled sliders still look correct.
  */
 const sliderStyles = {
   root: {
@@ -22,6 +24,8 @@ const sliderStyles = {
     padding: 0,
     overflow: 'visible',
   },
+  /** Required for JSS `$disabled` references on root/thumb */
+  disabled: {},
   rail: {
     borderRadius: 50,
     background: 'var(--color-border-muted)',
@@ -58,6 +62,19 @@ const sliderStyles = {
       border: '2px solid var(--color-text-default)',
       boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
     },
+    '&$disabled': {
+      height: 20,
+      width: 20,
+      marginTop: -7,
+      marginLeft: -7,
+      backgroundColor: 'var(--color-icon-muted)',
+      border: '2px solid var(--color-text-default)',
+      boxSizing: 'border-box' as const,
+      boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
+      '&:hover': {
+        boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
+      },
+    },
   },
   active: {},
 };
@@ -94,6 +111,8 @@ export type PerpsSliderProps = {
   valueText?: string | React.ReactNode;
   /** Test ID for testing */
   'data-testid'?: string;
+  /** When true, the slider is non-interactive */
+  disabled?: boolean;
 };
 
 export const PerpsSlider: React.FC<PerpsSliderProps> = ({
@@ -110,6 +129,7 @@ export const PerpsSlider: React.FC<PerpsSliderProps> = ({
   tooltipText,
   valueText,
   'data-testid': dataTestId,
+  disabled = false,
 }) => {
   const hasHeader = titleText || tooltipText || valueText || titleDetail;
   const hasFooter = infoText || onEdit;
@@ -163,6 +183,7 @@ export const PerpsSlider: React.FC<PerpsSliderProps> = ({
         step={step}
         value={value}
         onChange={onChange}
+        disabled={disabled}
         data-testid={dataTestId}
       />
 
diff --git a/ui/components/app/perps/perps-support-learn/perps-support-learn.test.tsx b/ui/components/app/perps/perps-support-learn/perps-support-learn.test.tsx
new file mode 100644
index 000000000000..2763918aafb5
--- /dev/null
+++ b/ui/components/app/perps/perps-support-learn/perps-support-learn.test.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+import configureStore from '../../../../store/store';
+import mockState from '../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
+import {
+  FEEDBACK_CONFIG,
+  SUPPORT_CONFIG,
+} from '../../../../../shared/constants/perps';
+import { PerpsSupportLearn } from './perps-support-learn';
+
+const mockTrackEvent = jest.fn();
+const mockMetaMetricsContext = {
+  trackEvent: mockTrackEvent,
+  bufferedTrace: jest.fn(),
+  bufferedEndTrace: jest.fn(),
+  onboardingParentContext: { current: null },
+};
+
+describe('PerpsSupportLearn', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // @ts-expect-error test platform
+    globalThis.platform = {
+      openTab: jest.fn(),
+      closeCurrentWindow: jest.fn(),
+    };
+  });
+
+  it('opens the support URL and tracks MetaMetrics when Contact support is clicked', () => {
+    const store = configureStore(mockState);
+    renderWithProvider(
+      <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
+        <PerpsSupportLearn />
+      </MetaMetricsContext.Provider>,
+      store,
+    );
+
+    fireEvent.click(screen.getByTestId('perps-contact-support'));
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      {
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.SupportLinkClicked,
+        properties: {
+          url: SUPPORT_CONFIG.Url,
+          location: 'perps_support_learn',
+        },
+      },
+      expect.objectContaining({
+        contextPropsIntoEventProperties: expect.any(Array),
+      }),
+    );
+    expect(globalThis.platform.openTab).toHaveBeenCalledWith({
+      url: SUPPORT_CONFIG.Url,
+    });
+  });
+
+  it('opens the feedback survey and tracks MetaMetrics when Give feedback is clicked', () => {
+    const store = configureStore(mockState);
+    renderWithProvider(
+      <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
+        <PerpsSupportLearn />
+      </MetaMetricsContext.Provider>,
+      store,
+    );
+
+    fireEvent.click(screen.getByTestId('perps-give-feedback'));
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      {
+        category: MetaMetricsEventCategory.Feedback,
+        event: MetaMetricsEventName.ExternalLinkClicked,
+        properties: {
+          url: FEEDBACK_CONFIG.Url,
+          location: 'perps_support_learn',
+          text: 'perps_feedback_survey',
+        },
+      },
+      expect.objectContaining({
+        contextPropsIntoEventProperties: expect.any(Array),
+      }),
+    );
+    expect(globalThis.platform.openTab).toHaveBeenCalledWith({
+      url: FEEDBACK_CONFIG.Url,
+    });
+  });
+});
diff --git a/ui/components/app/perps/perps-support-learn/perps-support-learn.tsx b/ui/components/app/perps/perps-support-learn/perps-support-learn.tsx
index 510064d3a314..9df9a9c22689 100644
--- a/ui/components/app/perps/perps-support-learn/perps-support-learn.tsx
+++ b/ui/components/app/perps/perps-support-learn/perps-support-learn.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useContext } from 'react';
 import {
   Box,
   BoxFlexDirection,
@@ -14,6 +14,16 @@ import {
 } from '@metamask/design-system-react';
 import { useDispatch } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import {
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
+import {
+  FEEDBACK_CONFIG,
+  SUPPORT_CONFIG,
+} from '../../../../../shared/constants/perps';
 import { setTutorialModalOpen } from '../../../../ducks/perps';
 
 const LIST_ITEM_BASE =
@@ -62,26 +72,60 @@ const SupportListItem: React.FC<SupportListItemProps> = ({
 export const PerpsSupportLearn: React.FC = () => {
   const t = useI18nContext();
   const dispatch = useDispatch();
+  const { trackEvent } = useContext(MetaMetricsContext);
 
   const handleLearnPerps = useCallback(() => {
     dispatch(setTutorialModalOpen(true));
   }, [dispatch]);
 
+  const handleContactSupport = useCallback(() => {
+    trackEvent(
+      {
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.SupportLinkClicked,
+        properties: {
+          url: SUPPORT_CONFIG.Url,
+          location: 'perps_support_learn',
+        },
+      },
+      {
+        contextPropsIntoEventProperties: [MetaMetricsContextProp.PageTitle],
+      },
+    );
+    globalThis.platform.openTab({ url: SUPPORT_CONFIG.Url });
+  }, [trackEvent]);
+
+  const handleFeedback = useCallback(() => {
+    trackEvent(
+      {
+        category: MetaMetricsEventCategory.Feedback,
+        event: MetaMetricsEventName.ExternalLinkClicked,
+        properties: {
+          url: FEEDBACK_CONFIG.Url,
+          location: 'perps_support_learn',
+          text: 'perps_feedback_survey',
+        },
+      },
+      {
+        contextPropsIntoEventProperties: [MetaMetricsContextProp.PageTitle],
+      },
+    );
+    globalThis.platform.openTab({ url: FEEDBACK_CONFIG.Url });
+  }, [trackEvent]);
+
   return (
     <Box paddingLeft={4} paddingRight={4} paddingBottom={4}>
       <Box flexDirection={BoxFlexDirection.Column} style={{ gap: '1px' }}>
         <SupportListItem
           label={t('perpsContactSupport')}
-          onClick={() => {
-            // TODO: Navigate to support
-          }}
+          onClick={handleContactSupport}
           className="rounded-t-xl"
+          data-testid="perps-contact-support"
         />
         <SupportListItem
           label={t('perpsGiveFeedback')}
-          onClick={() => {
-            // TODO: Navigate to feedback page
-          }}
+          onClick={handleFeedback}
+          data-testid="perps-give-feedback"
         />
         <SupportListItem
           label={t('perpsLearnBasics')}
diff --git a/ui/components/app/perps/perps-view.test.tsx b/ui/components/app/perps/perps-view.test.tsx
index 65438a8d58a6..b65c4a8230e1 100644
--- a/ui/components/app/perps/perps-view.test.tsx
+++ b/ui/components/app/perps/perps-view.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
@@ -7,6 +7,9 @@ import { usePerpsTransactionHistory } from '../../../hooks/perps/usePerpsTransac
 import * as mocks from './mocks';
 import { PerpsView } from './perps-view';
 
+const mockSubmitRequestToBackground = jest.fn().mockResolvedValue(undefined);
+const mockGetPerpsStreamManager = jest.fn();
+
 jest.mock('../../../hooks/perps/usePerpsTransactionHistory', () => ({
   usePerpsTransactionHistory: jest.fn(() => ({
     transactions: [],
@@ -17,15 +20,12 @@ jest.mock('../../../hooks/perps/usePerpsTransactionHistory', () => ({
 }));
 
 jest.mock('../../../store/background-connection', () => ({
-  submitRequestToBackground: jest.fn().mockResolvedValue(undefined),
+  submitRequestToBackground: (...args: unknown[]) =>
+    mockSubmitRequestToBackground(...args),
 }));
 
 jest.mock('../../../providers/perps', () => ({
-  getPerpsStreamManager: () => ({
-    init: jest.fn().mockResolvedValue(undefined),
-    prewarm: jest.fn(),
-    cleanupPrewarm: jest.fn(),
-  }),
+  getPerpsStreamManager: () => mockGetPerpsStreamManager(),
   usePerpsController: () => ({
     messenger: {
       subscribe: jest.fn(() => jest.fn()),
@@ -69,6 +69,15 @@ const mockStore = configureStore({
 describe('PerpsView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockSubmitRequestToBackground.mockResolvedValue(undefined);
+    mockGetPerpsStreamManager.mockReturnValue({
+      init: jest.fn().mockResolvedValue(undefined),
+      prewarm: jest.fn(),
+      cleanupPrewarm: jest.fn(),
+      clearAllOptimisticTPSL: jest.fn(),
+      pushPositionsWithOverrides: jest.fn(),
+      orders: { pushData: jest.fn() },
+    });
   });
 
   describe('with default mock data (positions and orders)', () => {
@@ -204,4 +213,88 @@ describe('PerpsView', () => {
       expect(positionsIndex).toBeLessThan(ordersIndex);
     });
   });
+
+  describe('close all and cancel all', () => {
+    it('calls batch close and applies a single positions snapshot', async () => {
+      const clearAll = jest.fn();
+      const pushPositions = jest.fn();
+      mockGetPerpsStreamManager.mockReturnValue({
+        init: jest.fn().mockResolvedValue(undefined),
+        prewarm: jest.fn(),
+        cleanupPrewarm: jest.fn(),
+        clearAllOptimisticTPSL: clearAll,
+        pushPositionsWithOverrides: pushPositions,
+        orders: { pushData: jest.fn() },
+      });
+      mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsClosePositions') {
+          return Promise.resolve({ success: true });
+        }
+        if (method === 'perpsGetPositions') {
+          return Promise.resolve([]);
+        }
+        return Promise.resolve(undefined);
+      });
+
+      renderWithProvider(<PerpsView />, mockStore);
+
+      fireEvent.click(screen.getByTestId('perps-close-all-positions'));
+
+      await waitFor(() => {
+        expect(mockSubmitRequestToBackground).toHaveBeenCalledWith(
+          'perpsClosePositions',
+          [{ closeAll: true }],
+        );
+      });
+      await waitFor(() => {
+        expect(mockSubmitRequestToBackground).toHaveBeenCalledWith(
+          'perpsGetPositions',
+          [],
+        );
+      });
+      expect(clearAll).toHaveBeenCalledTimes(1);
+      expect(pushPositions).toHaveBeenCalledTimes(1);
+      expect(pushPositions).toHaveBeenCalledWith([]);
+    });
+
+    it('calls batch cancel and applies a single orders snapshot', async () => {
+      const ordersPush = jest.fn();
+      mockGetPerpsStreamManager.mockReturnValue({
+        init: jest.fn().mockResolvedValue(undefined),
+        prewarm: jest.fn(),
+        cleanupPrewarm: jest.fn(),
+        clearAllOptimisticTPSL: jest.fn(),
+        pushPositionsWithOverrides: jest.fn(),
+        orders: { pushData: ordersPush },
+      });
+      mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsCancelOrders') {
+          return Promise.resolve({ success: true });
+        }
+        if (method === 'perpsGetOpenOrders') {
+          return Promise.resolve([]);
+        }
+        return Promise.resolve(undefined);
+      });
+
+      renderWithProvider(<PerpsView />, mockStore);
+
+      fireEvent.click(screen.getByTestId('perps-cancel-all-orders'));
+
+      await waitFor(() => {
+        expect(mockSubmitRequestToBackground).toHaveBeenCalledWith(
+          'perpsCancelOrders',
+          [{ cancelAll: true }],
+        );
+      });
+      await waitFor(() => {
+        expect(mockSubmitRequestToBackground).toHaveBeenCalledWith(
+          'perpsGetOpenOrders',
+          [],
+        );
+      });
+      expect(ordersPush).toHaveBeenCalledTimes(1);
+      expect(ordersPush).toHaveBeenCalledWith([]);
+    });
+  });
 });
diff --git a/ui/components/app/perps/perps-view.tsx b/ui/components/app/perps/perps-view.tsx
index 50ce4af23014..d62570a81bb1 100644
--- a/ui/components/app/perps/perps-view.tsx
+++ b/ui/components/app/perps/perps-view.tsx
@@ -1,5 +1,12 @@
-import { Box, BoxFlexDirection } from '@metamask/design-system-react';
-import React, { useMemo } from 'react';
+import {
+  Box,
+  BoxFlexDirection,
+  Text,
+  TextVariant,
+  TextColor,
+} from '@metamask/design-system-react';
+import type { Order, Position } from '@metamask/perps-controller';
+import React, { useCallback, useMemo, useState } from 'react';
 import {
   usePerpsLivePositions,
   usePerpsLiveOrders,
@@ -7,8 +14,12 @@ import {
 } from '../../../hooks/perps/stream';
 import { usePerpsTransactionHistory } from '../../../hooks/perps/usePerpsTransactionHistory';
 import { PERPS_RECENT_ACTIVITY_MAX_TRANSACTIONS } from '../../../../shared/constants/perps';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { submitRequestToBackground } from '../../../store/background-connection';
+import { getPerpsStreamManager } from '../../../providers/perps';
 
 import { usePerpsDepositConfirmation } from './hooks/usePerpsDepositConfirmation';
+import { usePerpsWithdrawNavigation } from './hooks/usePerpsWithdrawNavigation';
 import { PerpsBalanceDropdown } from './perps-balance-dropdown';
 import { PerpsExploreMarkets } from './perps-explore-markets';
 import { PerpsPositionsOrders } from './perps-positions-orders';
@@ -28,8 +39,19 @@ import { PerpsWatchlist } from './perps-watchlist';
  * Uses PerpsStreamManager for cached data, enabling smooth navigation
  * without loading skeletons when switching between views.
  */
+type BatchCloseResult = {
+  success: boolean;
+  successCount?: number;
+  failureCount?: number;
+};
+
 export const PerpsView: React.FC = () => {
+  const t = useI18nContext();
   const { trigger: triggerDeposit } = usePerpsDepositConfirmation();
+  const [isCloseAllPending, setIsCloseAllPending] = useState(false);
+  const [isCancelAllPending, setIsCancelAllPending] = useState(false);
+  const [batchActionError, setBatchActionError] = useState<string | null>(null);
+  const { trigger: triggerWithdraw } = usePerpsWithdrawNavigation();
 
   // Stream hooks must run before any effects that touch PerpsStreamManager.
   // `usePerpsStreamManager` (inside these hooks) calls `perpsInit` then `init(address)`;
@@ -61,6 +83,70 @@ export const PerpsView: React.FC = () => {
     return allOrders.filter((order) => order.status === 'open');
   }, [allOrders]);
 
+  const applyPositionsSnapshot = useCallback((next: Position[]) => {
+    const streamManager = getPerpsStreamManager();
+    streamManager.clearAllOptimisticTPSL();
+    streamManager.pushPositionsWithOverrides(next);
+  }, []);
+
+  const applyOrdersSnapshot = useCallback((next: Order[]) => {
+    getPerpsStreamManager().orders.pushData(next);
+  }, []);
+
+  const handleCloseAllPositions = useCallback(async () => {
+    if (positions.length === 0) {
+      return;
+    }
+    setBatchActionError(null);
+    setIsCloseAllPending(true);
+    try {
+      const result = await submitRequestToBackground<BatchCloseResult>(
+        'perpsClosePositions',
+        [{ closeAll: true }],
+      );
+      if (!result?.success) {
+        setBatchActionError(t('somethingWentWrong'));
+        return;
+      }
+      const fresh = await submitRequestToBackground<Position[]>(
+        'perpsGetPositions',
+        [],
+      );
+      applyPositionsSnapshot(fresh ?? []);
+    } catch {
+      setBatchActionError(t('somethingWentWrong'));
+    } finally {
+      setIsCloseAllPending(false);
+    }
+  }, [applyPositionsSnapshot, positions.length, t]);
+
+  const handleCancelAllOrders = useCallback(async () => {
+    if (orders.length === 0) {
+      return;
+    }
+    setBatchActionError(null);
+    setIsCancelAllPending(true);
+    try {
+      const result = await submitRequestToBackground<BatchCloseResult>(
+        'perpsCancelOrders',
+        [{ cancelAll: true }],
+      );
+      if (!result?.success) {
+        setBatchActionError(t('somethingWentWrong'));
+        return;
+      }
+      const fresh = await submitRequestToBackground<Order[]>(
+        'perpsGetOpenOrders',
+        [],
+      );
+      applyOrdersSnapshot(fresh ?? []);
+    } catch {
+      setBatchActionError(t('somethingWentWrong'));
+    } finally {
+      setIsCancelAllPending(false);
+    }
+  }, [applyOrdersSnapshot, orders.length, t]);
+
   const hasPositions = positions.length > 0;
   const isLoading = positionsLoading || ordersLoading || marketsLoading;
 
@@ -103,13 +189,24 @@ export const PerpsView: React.FC = () => {
       <PerpsBalanceDropdown
         hasPositions={hasPositions}
         onAddFunds={triggerDeposit}
-        onWithdraw={() => {
-          // TODO: Navigate to withdraw flow
-        }}
+        onWithdraw={triggerWithdraw}
       />
 
+      {batchActionError ? (
+        <Text variant={TextVariant.BodySm} color={TextColor.ErrorDefault}>
+          {batchActionError}
+        </Text>
+      ) : null}
+
       {/* Positions + Orders sections */}
-      <PerpsPositionsOrders positions={positions} orders={orders} />
+      <PerpsPositionsOrders
+        positions={positions}
+        orders={orders}
+        onCloseAllPositions={handleCloseAllPositions}
+        onCancelAllOrders={handleCancelAllOrders}
+        isCloseAllPending={isCloseAllPending}
+        isCancelAllPending={isCancelAllPending}
+      />
 
       {/* Watchlist */}
       <PerpsWatchlist />
diff --git a/ui/components/app/perps/perps-wallet-account-header/index.ts b/ui/components/app/perps/perps-wallet-account-header/index.ts
new file mode 100644
index 000000000000..f8a7db5d6fd1
--- /dev/null
+++ b/ui/components/app/perps/perps-wallet-account-header/index.ts
@@ -0,0 +1 @@
+export { PerpsWalletAccountHeader } from './perps-wallet-account-header';
diff --git a/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.test.tsx b/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.test.tsx
new file mode 100644
index 000000000000..8f782bbe2ca3
--- /dev/null
+++ b/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.test.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import configureStore from '../../../../store/store';
+import mockState from '../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import { PerpsWalletAccountHeader } from './perps-wallet-account-header';
+
+describe('PerpsWalletAccountHeader', () => {
+  it('renders account header when a selected account exists', () => {
+    const store = configureStore({ metamask: mockState.metamask });
+
+    renderWithProvider(<PerpsWalletAccountHeader />, store);
+
+    expect(
+      screen.getByTestId('perps-wallet-account-header'),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('perps-wallet-account-header-name'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.tsx b/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.tsx
new file mode 100644
index 000000000000..ee48fd52c373
--- /dev/null
+++ b/ui/components/app/perps/perps-wallet-account-header/perps-wallet-account-header.tsx
@@ -0,0 +1,195 @@
+import React, { useMemo } from 'react';
+import type { Hex } from '@metamask/utils';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  FontWeight,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react';
+import { useSelector } from 'react-redux';
+import {
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  NETWORK_TO_NAME_MAP,
+} from '../../../../../shared/constants/network';
+import { PreferredAvatar } from '../../preferred-avatar';
+import { getAvatarNetworkColor } from '../../../../helpers/utils/accounts';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { getCurrentChainId } from '../../../../../shared/lib/selectors/networks';
+import {
+  getIsMultichainAccountsState2Enabled,
+  selectNetworkConfigurationByChainId,
+} from '../../../../selectors';
+import { getSelectedInternalAccount } from '../../../../selectors/accounts';
+import { selectAccountGroupNameByAddress } from '../../../../selectors/multichain-accounts/account-tree';
+import type { MultichainAccountsState } from '../../../../selectors/multichain-accounts/account-tree.types';
+
+/**
+ * Tab-safe wallet name for subtitle (matches confirmations header intent without
+ * `getWalletsWithAccounts`, which depends on active tab origin).
+ *
+ * @param state - Redux root state.
+ * @param address - Selected account address.
+ */
+function getWalletMetadataNameByAddress(
+  state: unknown,
+  address: string,
+): string | undefined {
+  const { metamask } = state as MultichainAccountsState;
+  const internalAccountsObject = metamask.internalAccounts.accounts;
+  const { wallets } = metamask.accountTree;
+
+  for (const wallet of Object.values(wallets)) {
+    for (const group of Object.values(wallet.groups)) {
+      for (const accountId of group.accounts) {
+        const acc = internalAccountsObject[accountId];
+        if (acc?.address.toLowerCase() === address.toLowerCase()) {
+          return wallet.metadata.name;
+        }
+      }
+    }
+  }
+
+  return undefined;
+}
+
+/**
+ * @param state - Redux root state.
+ */
+function getHasMultipleWallets(state: unknown): boolean {
+  const { metamask } = state as MultichainAccountsState;
+  return Object.keys(metamask.accountTree.wallets).length > 1;
+}
+
+/**
+ * Account strip matching confirmations `Header` default layout (sender avatar,
+ * network badge, account name, secondary line) for standalone Perps pages.
+ */
+export const PerpsWalletAccountHeader: React.FC = () => {
+  const t = useI18nContext();
+  const selectedAccount = useSelector(getSelectedInternalAccount);
+  const senderAddress = selectedAccount?.address ?? '';
+  const isMultichainAccountsState2Enabled = useSelector(
+    getIsMultichainAccountsState2Enabled,
+  );
+  const chainId = useSelector(getCurrentChainId) as Hex;
+
+  const accountGroupDisplayName = useSelector((state) =>
+    selectAccountGroupNameByAddress(state, senderAddress),
+  );
+
+  const walletNameForSubtitle = useSelector((state) =>
+    senderAddress
+      ? getWalletMetadataNameByAddress(state, senderAddress)
+      : undefined,
+  );
+
+  const hasMoreThanOneWallet = useSelector(getHasMultipleWallets);
+
+  const networkConfiguration = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
+  const networkDisplayName = useMemo(() => {
+    return (
+      networkConfiguration?.name ??
+      NETWORK_TO_NAME_MAP[chainId as keyof typeof NETWORK_TO_NAME_MAP] ??
+      t('privateNetwork')
+    );
+  }, [chainId, networkConfiguration?.name, t]);
+
+  const networkImageUrl =
+    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+      chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+    ] ?? '';
+
+  const networkBackgroundKey = getAvatarNetworkColor(networkDisplayName);
+  const networkAvatarStyle = networkBackgroundKey
+    ? {
+        backgroundColor: `var(--color-network-${networkBackgroundKey}-default)`,
+      }
+    : undefined;
+
+  const primaryLabel =
+    (isMultichainAccountsState2Enabled ? accountGroupDisplayName : null) ??
+    selectedAccount?.metadata?.name ??
+    '';
+
+  let secondaryText: string | undefined;
+  if (isMultichainAccountsState2Enabled) {
+    if (hasMoreThanOneWallet) {
+      secondaryText = walletNameForSubtitle ?? '';
+    }
+  } else {
+    secondaryText = networkDisplayName;
+  }
+
+  if (!senderAddress || (!primaryLabel && !secondaryText)) {
+    return null;
+  }
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      className="confirm_header__wrapper"
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Between}
+      data-testid="perps-wallet-account-header"
+    >
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Start}
+        padding={4}
+      >
+        <Box flexDirection={BoxFlexDirection.Row} marginTop={2}>
+          <PreferredAvatar address={senderAddress} />
+          {isMultichainAccountsState2Enabled ? null : (
+            <AvatarNetwork
+              src={networkImageUrl}
+              name={networkDisplayName}
+              size={AvatarNetworkSize.Xs}
+              className="confirm_header__avatar-network"
+              style={networkAvatarStyle}
+            />
+          )}
+        </Box>
+        <Box
+          flexDirection={BoxFlexDirection.Column}
+          alignItems={BoxAlignItems.Start}
+          gap={1}
+          marginLeft={4}
+          marginTop={secondaryText ? 0 : 3}
+        >
+          <Text
+            color={TextColor.TextDefault}
+            variant={TextVariant.BodyMd}
+            fontWeight={FontWeight.Medium}
+            data-testid="perps-wallet-account-header-name"
+          >
+            {primaryLabel}
+          </Text>
+          {secondaryText ? (
+            <Text
+              color={TextColor.TextAlternative}
+              variant={TextVariant.BodyMd}
+              data-testid="perps-wallet-account-header-secondary"
+            >
+              {secondaryText}
+            </Text>
+          ) : null}
+        </Box>
+      </Box>
+      {/* Right column reserved to match confirmations header grid; deposit shows HeaderInfo here. */}
+      <Box
+        alignItems={BoxAlignItems.End}
+        flexDirection={BoxFlexDirection.Row}
+        padding={4}
+      />
+    </Box>
+  );
+};
diff --git a/ui/components/app/perps/perps-withdraw-percentage-buttons/index.ts b/ui/components/app/perps/perps-withdraw-percentage-buttons/index.ts
new file mode 100644
index 000000000000..510bed5a7b58
--- /dev/null
+++ b/ui/components/app/perps/perps-withdraw-percentage-buttons/index.ts
@@ -0,0 +1,2 @@
+export { PerpsWithdrawPercentageButtons } from './perps-withdraw-percentage-buttons';
+export type { PerpsWithdrawPercentageButtonsProps } from './perps-withdraw-percentage-buttons';
diff --git a/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.test.tsx b/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.test.tsx
new file mode 100644
index 000000000000..04f9c2c8fddd
--- /dev/null
+++ b/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.test.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import configureStore from '../../../../store/store';
+import mockState from '../../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
+import { PerpsWithdrawPercentageButtons } from './perps-withdraw-percentage-buttons';
+
+describe('PerpsWithdrawPercentageButtons', () => {
+  it('invokes callback with percentage including max', async () => {
+    const user = userEvent.setup();
+    const onPercentageClick = jest.fn();
+    const store = configureStore({ metamask: mockState.metamask });
+
+    renderWithProvider(
+      <PerpsWithdrawPercentageButtons onPercentageClick={onPercentageClick} />,
+      store,
+    );
+
+    await user.click(screen.getByTestId('perps-withdraw-percentage-10'));
+    expect(onPercentageClick).toHaveBeenCalledWith(10);
+
+    await user.click(screen.getByTestId('perps-withdraw-percentage-max'));
+    expect(onPercentageClick).toHaveBeenCalledWith(100);
+  });
+});
diff --git a/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.tsx b/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.tsx
new file mode 100644
index 000000000000..2930101b0642
--- /dev/null
+++ b/ui/components/app/perps/perps-withdraw-percentage-buttons/perps-withdraw-percentage-buttons.tsx
@@ -0,0 +1,70 @@
+import React, { useCallback } from 'react';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxFlexWrap,
+  BoxJustifyContent,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+} from '@metamask/design-system-react';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+
+const QUICK_PERCENTAGES = [10, 25, 50] as const;
+
+export type PerpsWithdrawPercentageButtonsProps = {
+  onPercentageClick: (percentage: number) => void;
+  disabled?: boolean;
+};
+
+/**
+ * Quick amount presets aligned with mobile Perps withdraw (10%, 25%, 50%, Max).
+ * Deposit confirmations use a different set (25/50/75/100) inside pay flow.
+ * @param options0
+ * @param options0.onPercentageClick
+ * @param options0.disabled
+ */
+export const PerpsWithdrawPercentageButtons: React.FC<
+  PerpsWithdrawPercentageButtonsProps
+> = ({ onPercentageClick, disabled = false }) => {
+  const t = useI18nContext();
+
+  const handleClick = useCallback(
+    (percentage: number) => {
+      onPercentageClick(percentage);
+    },
+    [onPercentageClick],
+  );
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      flexWrap={BoxFlexWrap.Wrap}
+      justifyContent={BoxJustifyContent.Center}
+      gap={2}
+      data-testid="perps-withdraw-percentage-buttons"
+    >
+      {QUICK_PERCENTAGES.map((percentage) => (
+        <Button
+          key={percentage}
+          variant={ButtonVariant.Secondary}
+          size={ButtonSize.Sm}
+          isDisabled={disabled}
+          onClick={() => handleClick(percentage)}
+          data-testid={`perps-withdraw-percentage-${percentage}`}
+        >
+          {`${percentage}%`}
+        </Button>
+      ))}
+      <Button
+        variant={ButtonVariant.Secondary}
+        size={ButtonSize.Sm}
+        isDisabled={disabled}
+        onClick={() => handleClick(100)}
+        data-testid="perps-withdraw-percentage-max"
+      >
+        {t('max')}
+      </Button>
+    </Box>
+  );
+};
diff --git a/ui/components/app/perps/perps-withdraw-toast.test.tsx b/ui/components/app/perps/perps-withdraw-toast.test.tsx
new file mode 100644
index 000000000000..e9b9cdc87472
--- /dev/null
+++ b/ui/components/app/perps/perps-withdraw-toast.test.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
+import { submitRequestToBackground } from '../../../store/background-connection';
+import { PerpsWithdrawToast } from './perps-withdraw-toast';
+
+jest.mock('../../../store/background-connection', () => ({
+  submitRequestToBackground: jest.fn().mockResolvedValue(undefined),
+}));
+
+const mockSubmit = submitRequestToBackground as jest.MockedFunction<
+  typeof submitRequestToBackground
+>;
+
+describe('PerpsWithdrawToast', () => {
+  const baseResult = {
+    amount: '50',
+    asset: 'USDC',
+    txHash: '',
+    timestamp: 1_700_000_000_000,
+    success: true,
+    error: '',
+  };
+
+  it('renders success toast when lastWithdrawResult is set', () => {
+    const store = configureStore({
+      metamask: {
+        ...mockState.metamask,
+        lastWithdrawResult: baseResult,
+      },
+    });
+
+    renderWithProvider(<PerpsWithdrawToast />, store);
+
+    expect(screen.getByTestId('perps-withdraw-toast')).toBeInTheDocument();
+    expect(
+      screen.getByText(messages.perpsWithdrawToastSuccessTitle.message),
+    ).toBeInTheDocument();
+  });
+
+  it('calls perpsClearWithdrawResult when dismissed', async () => {
+    const user = userEvent.setup();
+    const store = configureStore({
+      metamask: {
+        ...mockState.metamask,
+        lastWithdrawResult: baseResult,
+      },
+    });
+
+    renderWithProvider(<PerpsWithdrawToast />, store);
+
+    await user.click(
+      screen.getByRole('button', { name: messages.close.message }),
+    );
+
+    expect(mockSubmit).toHaveBeenCalledWith('perpsClearWithdrawResult', []);
+  });
+
+  it('renders nothing when there is no lastWithdrawResult', () => {
+    const store = configureStore({
+      metamask: {
+        ...mockState.metamask,
+        lastWithdrawResult: null,
+      },
+    });
+
+    renderWithProvider(<PerpsWithdrawToast />, store);
+
+    expect(
+      screen.queryByTestId('perps-withdraw-toast'),
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/perps/perps-withdraw-toast.tsx b/ui/components/app/perps/perps-withdraw-toast.tsx
new file mode 100644
index 000000000000..4d17565bcad8
--- /dev/null
+++ b/ui/components/app/perps/perps-withdraw-toast.tsx
@@ -0,0 +1,86 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  Icon as DsIcon,
+  IconColor as DsIconColor,
+  IconName as DsIconName,
+  IconSize as DsIconSize,
+} from '@metamask/design-system-react';
+import { SECOND } from '../../../../shared/constants/time';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { useFormatters } from '../../../hooks/useFormatters';
+import { submitRequestToBackground } from '../../../store/background-connection';
+import { selectPerpsLastWithdrawResult } from '../../../selectors/perps-controller';
+import { Toast } from '../../multichain/toast';
+
+/**
+ * Home-screen toast for Perps withdrawal completion.
+ *
+ * `PerpsController` sets `lastWithdrawResult` when `withdraw` finishes; the
+ * withdraw page navigates here on success so users see confirmation after leaving
+ * the flow. Dismissal clears controller state via `perpsClearWithdrawResult`.
+ */
+export function PerpsWithdrawToast() {
+  const t = useI18nContext();
+  const { formatCurrency } = useFormatters();
+  const lastWithdrawResult = useSelector(selectPerpsLastWithdrawResult);
+  const [dismissed, setDismissed] = useState(false);
+
+  useEffect(() => {
+    setDismissed(false);
+  }, [lastWithdrawResult?.timestamp]);
+
+  const dismissToast = useCallback(() => {
+    setDismissed(true);
+    submitRequestToBackground('perpsClearWithdrawResult', []).catch(() => {
+      // Non-blocking: toast is already dismissed locally
+    });
+  }, []);
+
+  const autoHideDelay = 5 * SECOND;
+
+  if (dismissed || !lastWithdrawResult) {
+    return null;
+  }
+
+  const isSuccess = lastWithdrawResult.success === true;
+  const amountNum = parseFloat(lastWithdrawResult.amount);
+  const amountLabel = Number.isFinite(amountNum)
+    ? formatCurrency(amountNum, 'USD')
+    : lastWithdrawResult.amount;
+
+  const toastText = isSuccess
+    ? t('perpsWithdrawToastSuccessTitle')
+    : t('perpsWithdrawToastErrorTitle');
+
+  const description = isSuccess
+    ? t('perpsWithdrawToastSuccessDescription', [amountLabel])
+    : lastWithdrawResult.error || t('perpsWithdrawFailed');
+
+  const startAdornment = isSuccess ? (
+    <DsIcon
+      name={DsIconName.Confirmation}
+      color={DsIconColor.SuccessDefault}
+      size={DsIconSize.Lg}
+    />
+  ) : (
+    <DsIcon
+      name={DsIconName.CircleX}
+      color={DsIconColor.ErrorDefault}
+      size={DsIconSize.Lg}
+    />
+  );
+
+  return (
+    <Toast
+      key={`perps-withdraw-toast-${lastWithdrawResult.timestamp}`}
+      dataTestId="perps-withdraw-toast"
+      text={toastText}
+      description={description}
+      startAdornment={startAdornment}
+      onClose={dismissToast}
+      autoHideTime={autoHideDelay}
+      onAutoHideToast={dismissToast}
+    />
+  );
+}
diff --git a/ui/components/app/perps/transaction-card/transaction-card.test.tsx b/ui/components/app/perps/transaction-card/transaction-card.test.tsx
index 97480f538bcd..ba0383ba72a0 100644
--- a/ui/components/app/perps/transaction-card/transaction-card.test.tsx
+++ b/ui/components/app/perps/transaction-card/transaction-card.test.tsx
@@ -81,7 +81,7 @@ describe('TransactionCard', () => {
   });
 
   describe('Trade transactions', () => {
-    it('shows pnl with profit color for positive values', () => {
+    it('shows trade amount with profit color for positive values', () => {
       const transaction = createMockTransaction({
         type: 'trade',
         category: 'position_close',
@@ -105,10 +105,12 @@ describe('TransactionCard', () => {
         mockStore,
       );
 
-      expect(screen.getByText('+$125.00')).toBeInTheDocument();
+      const amountElement = screen.getByText('+$125.00');
+      expect(amountElement).toBeInTheDocument();
+      expect(amountElement).toHaveClass('text-success-default');
     });
 
-    it('shows pnl with loss color for negative values', () => {
+    it('shows trade amount with loss color for negative values', () => {
       const transaction = createMockTransaction({
         type: 'trade',
         category: 'position_close',
@@ -132,7 +134,38 @@ describe('TransactionCard', () => {
         mockStore,
       );
 
-      expect(screen.getByText('-$45.50')).toBeInTheDocument();
+      const amountElement = screen.getByText('-$45.50');
+      expect(amountElement).toBeInTheDocument();
+      expect(amountElement).toHaveClass('text-error-default');
+    });
+
+    it('uses amount polarity for color when pnl string is unsigned', () => {
+      const transaction = createMockTransaction({
+        type: 'trade',
+        category: 'position_close',
+        fill: {
+          shortTitle: 'Closed long',
+          amount: '+$125.00',
+          amountNumber: 125,
+          isPositive: true,
+          size: '0.5',
+          entryPrice: '45250.00',
+          points: '0',
+          pnl: '125.00',
+          fee: '22.63',
+          action: 'Closed',
+          feeToken: 'USDC',
+          fillType: FillType.Standard,
+        },
+      });
+      renderWithProvider(
+        <TransactionCard transaction={transaction} />,
+        mockStore,
+      );
+
+      const amountElement = screen.getByText('+$125.00');
+      expect(amountElement).toBeInTheDocument();
+      expect(amountElement).toHaveClass('text-success-default');
     });
 
     it('displays size and symbol in subtitle for trades', () => {
@@ -172,7 +205,7 @@ describe('TransactionCard', () => {
         fill: undefined,
         fundingAmount: {
           isPositive: true,
-          fee: '+8.30',
+          fee: '+$8.30',
           feeNumber: 8.3,
           rate: '0.0001',
         },
@@ -193,7 +226,7 @@ describe('TransactionCard', () => {
         fill: undefined,
         fundingAmount: {
           isPositive: false,
-          fee: '-3.10',
+          fee: '-$3.10',
           feeNumber: -3.1,
           rate: '-0.00005',
         },
@@ -217,7 +250,7 @@ describe('TransactionCard', () => {
         title: 'Deposited 5000 USDC',
         fill: undefined,
         depositWithdrawal: {
-          amount: '5000.00',
+          amount: '+$5000.00',
           amountNumber: 5000,
           isPositive: true,
           asset: 'USDC',
@@ -231,7 +264,9 @@ describe('TransactionCard', () => {
         mockStore,
       );
 
-      expect(screen.getByText('+$5000.00')).toBeInTheDocument();
+      const amountElement = screen.getByText('+$5000.00');
+      expect(amountElement).toBeInTheDocument();
+      expect(amountElement).toHaveClass('text-success-default');
     });
 
     it('shows withdrawal amount with negative sign', () => {
@@ -243,7 +278,7 @@ describe('TransactionCard', () => {
         title: 'Withdrew 2000 USDC',
         fill: undefined,
         depositWithdrawal: {
-          amount: '2000.00',
+          amount: '-$2000.00',
           amountNumber: 2000,
           isPositive: false,
           asset: 'USDC',
@@ -257,7 +292,9 @@ describe('TransactionCard', () => {
         mockStore,
       );
 
-      expect(screen.getByText('-$2000.00')).toBeInTheDocument();
+      const amountElement = screen.getByText('-$2000.00');
+      expect(amountElement).toBeInTheDocument();
+      expect(amountElement).toHaveClass('text-error-default');
     });
 
     it('shows "Completed" status for deposits', () => {
@@ -268,7 +305,7 @@ describe('TransactionCard', () => {
         title: 'Deposited 5000 USDC',
         fill: undefined,
         depositWithdrawal: {
-          amount: '5000.00',
+          amount: '+$5000.00',
           amountNumber: 5000,
           isPositive: true,
           asset: 'USDC',
diff --git a/ui/components/app/perps/transaction-card/transaction-card.tsx b/ui/components/app/perps/transaction-card/transaction-card.tsx
index d7b62ee74ab5..2028a551636b 100644
--- a/ui/components/app/perps/transaction-card/transaction-card.tsx
+++ b/ui/components/app/perps/transaction-card/transaction-card.tsx
@@ -13,7 +13,7 @@ import {
 } from '@metamask/design-system-react';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { PerpsTokenLogo } from '../perps-token-logo';
-import { getDisplayName, getTransactionAmountColor } from '../utils';
+import { getDisplayName } from '../utils';
 import type { PerpsTransaction } from '../types';
 
 export type TransactionCardProps = {
@@ -61,25 +61,28 @@ export const TransactionCard: React.FC<TransactionCardProps> = ({
 
   // Determine the amount to display based on transaction type
   const getAmountDisplay = (): { text: string; color: TextColor } => {
-    if (transaction.fill?.pnl) {
+    if (transaction.fill) {
       return {
-        text: `${transaction.fill.pnl.startsWith('-') ? '-' : '+'}$${transaction.fill.pnl.replace(/^[+-]/u, '')}`,
-        color: getTransactionAmountColor(transaction.fill.pnl),
+        text: transaction.fill.amount,
+        color: transaction.fill.isPositive
+          ? TextColor.SuccessDefault
+          : TextColor.ErrorDefault,
       };
     }
     if (transaction.fundingAmount) {
-      const { fee } = transaction.fundingAmount;
-      const isNegative = fee.startsWith('-');
       return {
-        text: `${isNegative ? '-' : '+'}$${fee.replace(/^[+-]/u, '')}`,
-        color: isNegative ? TextColor.ErrorDefault : TextColor.SuccessDefault,
+        text: transaction.fundingAmount.fee,
+        color: transaction.fundingAmount.isPositive
+          ? TextColor.SuccessDefault
+          : TextColor.ErrorDefault,
       };
     }
     if (transaction.depositWithdrawal) {
-      const isWithdrawal = transaction.type === 'withdrawal';
       return {
-        text: `${isWithdrawal ? '-' : '+'}$${transaction.depositWithdrawal.amount}`,
-        color: isWithdrawal ? TextColor.ErrorDefault : TextColor.SuccessDefault,
+        text: transaction.depositWithdrawal.amount,
+        color: transaction.depositWithdrawal.isPositive
+          ? TextColor.SuccessDefault
+          : TextColor.ErrorDefault,
       };
     }
     // For trades without realized PnL, return empty (don't show symbol)
diff --git a/ui/components/app/perps/update-tpsl/index.ts b/ui/components/app/perps/update-tpsl/index.ts
index db69ffca161a..56b24cc6fccd 100644
--- a/ui/components/app/perps/update-tpsl/index.ts
+++ b/ui/components/app/perps/update-tpsl/index.ts
@@ -1,4 +1,7 @@
 export { UpdateTPSLModal } from './update-tpsl-modal';
 export type { UpdateTPSLModalProps } from './update-tpsl-modal';
 export { UpdateTPSLModalContent } from './update-tpsl-modal-content';
-export type { UpdateTPSLModalContentProps } from './update-tpsl-modal-content';
+export type {
+  UpdateTPSLModalContentProps,
+  UpdateTPSLSubmitState,
+} from './update-tpsl-modal-content';
diff --git a/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.test.tsx b/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.test.tsx
index 1094fe9c7f39..7886b7418313 100644
--- a/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.test.tsx
+++ b/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.test.tsx
@@ -5,7 +5,10 @@ import configureStore from '../../../../store/store';
 import mockState from '../../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
 import { mockPositions } from '../mocks';
-import { UpdateTPSLModalContent } from './update-tpsl-modal-content';
+import {
+  UpdateTPSLModalContent,
+  type UpdateTPSLSubmitState,
+} from './update-tpsl-modal-content';
 
 const mockSubmitRequestToBackground = jest.fn();
 const mockGetPerpsStreamManager = jest.fn();
@@ -38,6 +41,44 @@ const defaultProps = {
   onClose: jest.fn(),
 };
 
+/**
+ * Mirrors UpdateTPSLModal footer so unit tests can reach the primary action
+ * @param props
+ */
+const TpslContentWithTestFooter: React.FC<
+  React.ComponentProps<typeof UpdateTPSLModalContent>
+> = (props) => {
+  const [submitState, setSubmitState] =
+    React.useState<UpdateTPSLSubmitState | null>(null);
+  return (
+    <>
+      <UpdateTPSLModalContent {...props} onSubmitStateChange={setSubmitState} />
+      {submitState ? (
+        <button
+          type="button"
+          data-testid="perps-update-tpsl-modal-submit"
+          onClick={submitState.onSubmit}
+          disabled={submitState.submitDisabled}
+          title={submitState.submitButtonTitle}
+        >
+          {submitState.isSaving
+            ? messages.perpsSubmitting.message
+            : messages.perpsSaveChanges.message}
+        </button>
+      ) : null}
+    </>
+  );
+};
+
+function renderTpslModalContent(
+  props: Partial<React.ComponentProps<typeof UpdateTPSLModalContent>> = {},
+) {
+  return renderWithProvider(
+    <TpslContentWithTestFooter {...defaultProps} {...props} />,
+    mockStore,
+  );
+}
+
 describe('UpdateTPSLModalContent', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -62,10 +103,7 @@ describe('UpdateTPSLModalContent', () => {
 
   describe('rendering', () => {
     it('renders Take Profit and Stop Loss sections', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       expect(
         screen.getByText(messages.perpsTakeProfit.message),
@@ -76,10 +114,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('renders TP preset buttons', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       expect(screen.getByText('+10%')).toBeInTheDocument();
       expect(screen.getByText('+25%')).toBeInTheDocument();
@@ -88,10 +123,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('renders SL preset buttons', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       expect(screen.getByText('-10%')).toBeInTheDocument();
       expect(screen.getByText('-25%')).toBeInTheDocument();
@@ -100,10 +132,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('renders the save button', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       expect(
         screen.getByText(messages.perpsSaveChanges.message),
@@ -111,10 +140,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('renders four text inputs (TP price, TP %, SL price, SL %)', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const priceInputs = screen.getAllByPlaceholderText('0.00');
       const percentInputs = screen.getAllByPlaceholderText('0.0');
@@ -125,10 +151,7 @@ describe('UpdateTPSLModalContent', () => {
 
   describe('initialization', () => {
     it('initializes TP/SL prices from position data', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const priceInputs = screen.getAllByPlaceholderText('0.00');
       const tpInput = priceInputs[0] as HTMLInputElement;
@@ -139,13 +162,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('initializes with empty inputs when position has no TP/SL', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={positionWithoutTPSL}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({ position: positionWithoutTPSL });
 
       const priceInputs = screen.getAllByPlaceholderText('0.00');
       const tpInput = priceInputs[0] as HTMLInputElement;
@@ -154,14 +171,77 @@ describe('UpdateTPSLModalContent', () => {
       expect(tpInput.value).toBe('');
       expect(slInput.value).toBe('');
     });
+
+    it('does not reset TP/SL fields when position updates with the same symbol', () => {
+      const { rerender } = renderWithProvider(
+        <TpslContentWithTestFooter {...defaultProps} />,
+        mockStore,
+      );
+
+      const tpInput = screen.getAllByPlaceholderText(
+        '0.00',
+      )[0] as HTMLInputElement;
+      const slInput = screen.getAllByPlaceholderText(
+        '0.00',
+      )[1] as HTMLInputElement;
+      fireEvent.change(tpInput, { target: { value: '4000' } });
+      fireEvent.change(slInput, { target: { value: '2500' } });
+
+      const polledPosition = {
+        ...positionWithTPSL,
+        unrealizedPnl: '400.00',
+        stopLossPrice: undefined,
+        takeProfitPrice: undefined,
+      };
+      rerender(
+        <TpslContentWithTestFooter
+          {...defaultProps}
+          position={polledPosition}
+        />,
+      );
+
+      expect(
+        (screen.getAllByPlaceholderText('0.00')[0] as HTMLInputElement).value,
+      ).toBe('4000');
+      expect(
+        (screen.getAllByPlaceholderText('0.00')[1] as HTMLInputElement).value,
+      ).toBe('2500');
+    });
+  });
+
+  describe('estimated P&L', () => {
+    it('shows estimated P&L at take profit and stop loss when prices are set', () => {
+      renderTpslModalContent();
+
+      expect(
+        screen.getByTestId('perps-update-tpsl-estimated-tp-pnl-row'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByTestId('perps-update-tpsl-estimated-sl-pnl-row'),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsEstimatedPnlAtTakeProfit.message),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.perpsEstimatedPnlAtStopLoss.message),
+      ).toBeInTheDocument();
+    });
+
+    it('hides estimated P&L rows when TP/SL prices are cleared', () => {
+      renderTpslModalContent({ position: positionWithoutTPSL });
+
+      expect(
+        screen.queryByTestId('perps-update-tpsl-estimated-tp-pnl-row'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByTestId('perps-update-tpsl-estimated-sl-pnl-row'),
+      ).not.toBeInTheDocument();
+    });
   });
 
   describe('presets', () => {
     it('sets TP price when a TP preset is clicked', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       fireEvent.click(screen.getByText('+25%'));
 
@@ -175,10 +255,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('sets SL price when a SL preset is clicked', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       fireEvent.click(screen.getByText('-25%'));
 
@@ -194,10 +271,7 @@ describe('UpdateTPSLModalContent', () => {
 
   describe('price input', () => {
     it('allows typing a TP price directly', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const tpInput = screen.getAllByPlaceholderText('0.00')[0];
       fireEvent.change(tpInput, { target: { value: '3500' } });
@@ -206,10 +280,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('allows clearing the TP price input', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const tpInput = screen.getAllByPlaceholderText('0.00')[0];
       fireEvent.change(tpInput, { target: { value: '' } });
@@ -218,13 +289,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('formats the TP price on blur', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={positionWithoutTPSL}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({ position: positionWithoutTPSL });
 
       const tpInput = screen.getAllByPlaceholderText('0.00')[0];
       fireEvent.change(tpInput, { target: { value: '3500' } });
@@ -236,13 +301,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('formats the SL price on blur', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={positionWithoutTPSL}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({ position: positionWithoutTPSL });
 
       const slInput = screen.getAllByPlaceholderText('0.00')[1];
       fireEvent.change(slInput, { target: { value: '2500' } });
@@ -256,10 +315,7 @@ describe('UpdateTPSLModalContent', () => {
 
   describe('percent input', () => {
     it('updates TP price when a percent value is typed', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const percentInputs = screen.getAllByPlaceholderText('0.0');
       const tpPercentInput = percentInputs[0];
@@ -274,10 +330,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('updates SL price when a percent value is typed', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const percentInputs = screen.getAllByPlaceholderText('0.0');
       const slPercentInput = percentInputs[1];
@@ -292,10 +345,7 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('clears TP price when percent input is cleared', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       const tpPercentInput = screen.getAllByPlaceholderText('0.0')[0];
       fireEvent.change(tpPercentInput, { target: { value: '' } });
@@ -321,10 +371,7 @@ describe('UpdateTPSLModalContent', () => {
         return Promise.resolve(undefined);
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} onClose={onClose} />,
-        mockStore,
-      );
+      renderTpslModalContent({ onClose });
 
       const saveButton = screen.getByText(messages.perpsSaveChanges.message);
       fireEvent.click(saveButton);
@@ -357,13 +404,7 @@ describe('UpdateTPSLModalContent', () => {
         return Promise.resolve(undefined);
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={positionWithoutTPSL}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({ position: positionWithoutTPSL });
 
       const saveButton = screen.getByText(messages.perpsSaveChanges.message);
       fireEvent.click(saveButton);
@@ -394,10 +435,7 @@ describe('UpdateTPSLModalContent', () => {
         pushPositionsWithOverrides: jest.fn(),
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       fireEvent.click(screen.getByText(messages.perpsSaveChanges.message));
 
@@ -424,10 +462,7 @@ describe('UpdateTPSLModalContent', () => {
         return Promise.resolve(undefined);
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       fireEvent.click(screen.getByText(messages.perpsSaveChanges.message));
 
@@ -444,10 +479,7 @@ describe('UpdateTPSLModalContent', () => {
         return Promise.resolve(undefined);
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} />,
-        mockStore,
-      );
+      renderTpslModalContent();
 
       fireEvent.click(screen.getByText(messages.perpsSaveChanges.message));
 
@@ -468,10 +500,7 @@ describe('UpdateTPSLModalContent', () => {
         return Promise.resolve(undefined);
       });
 
-      renderWithProvider(
-        <UpdateTPSLModalContent {...defaultProps} onClose={onClose} />,
-        mockStore,
-      );
+      renderTpslModalContent({ onClose });
 
       fireEvent.click(screen.getByText(messages.perpsSaveChanges.message));
 
@@ -487,14 +516,10 @@ describe('UpdateTPSLModalContent', () => {
     const shortPosition = mockPositions[1];
 
     it('calculates TP preset correctly for a short position', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={shortPosition}
-          currentPrice={45000}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({
+        position: shortPosition,
+        currentPrice: 45000,
+      });
 
       fireEvent.click(screen.getByText('+10%'));
 
@@ -508,14 +533,10 @@ describe('UpdateTPSLModalContent', () => {
     });
 
     it('calculates SL preset correctly for a short position', () => {
-      renderWithProvider(
-        <UpdateTPSLModalContent
-          {...defaultProps}
-          position={shortPosition}
-          currentPrice={45000}
-        />,
-        mockStore,
-      );
+      renderTpslModalContent({
+        position: shortPosition,
+        currentPrice: 45000,
+      });
 
       fireEvent.click(screen.getByText('-10%'));
 
diff --git a/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.tsx b/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.tsx
index aaac3edd6fef..ae4815c04d22 100644
--- a/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.tsx
+++ b/ui/components/app/perps/update-tpsl/update-tpsl-modal-content.tsx
@@ -1,15 +1,13 @@
-import React, { useState, useCallback, useMemo, useEffect } from 'react';
+import React, { useState, useCallback, useMemo, useLayoutEffect } from 'react';
 import {
   Box,
   BoxAlignItems,
   BoxFlexDirection,
+  BoxJustifyContent,
   Text,
   TextVariant,
   TextColor,
   FontWeight,
-  Button,
-  ButtonVariant,
-  ButtonSize,
   Icon,
   IconName,
   IconSize,
@@ -31,37 +29,64 @@ import type { Position } from '../types';
 const TP_PRESETS = [10, 25, 50, 100];
 const SL_PRESETS = [10, 25, 50, 75];
 
+function getPnlDisplayColor(pnl: number): TextColor {
+  if (pnl > 0) {
+    return TextColor.SuccessDefault;
+  }
+  if (pnl < 0) {
+    return TextColor.ErrorDefault;
+  }
+  return TextColor.TextDefault;
+}
+
+export type UpdateTPSLSubmitState = {
+  onSubmit: () => void;
+  isSaving: boolean;
+  submitDisabled: boolean;
+  submitButtonTitle?: string;
+};
+
 export type UpdateTPSLModalContentProps = {
   position: Position;
   currentPrice: number;
   onClose: () => void;
+  /** Wired by UpdateTPSLModal to place the primary action in ModalFooter */
+  onSubmitStateChange?: (state: UpdateTPSLSubmitState) => void;
 };
 
 /**
- * TP/SL form content: presets, price/percent inputs, save.
- * Used inside UpdateTPSLModal. Initializes from position when modal opens.
+ * TP/SL form content: presets, price/percent inputs, and validation errors.
+ * Used inside UpdateTPSLModal. Initializes from position on mount; parent should set
+ * `key={position.symbol}` on the modal so edits are not overwritten when the same
+ * market is refetched while the modal is open.
  * @param options0
  * @param options0.position
  * @param options0.currentPrice
  * @param options0.onClose
+ * @param options0.onSubmitStateChange
  */
 export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
   position,
   currentPrice,
   onClose,
+  onSubmitStateChange,
 }) => {
   const t = useI18nContext();
-  const { formatNumber } = useFormatters();
+  const { formatNumber, formatCurrencyWithMinThreshold } = useFormatters();
   const { isEligible } = usePerpsEligibility();
 
-  const [editingTpPrice, setEditingTpPrice] = useState<string>('');
-  const [editingSlPrice, setEditingSlPrice] = useState<string>('');
+  const [editingTpPrice, setEditingTpPrice] = useState(
+    () => position.takeProfitPrice ?? '',
+  );
+  const [editingSlPrice, setEditingSlPrice] = useState(
+    () => position.stopLossPrice ?? '',
+  );
   const [isSaving, setIsSaving] = useState(false);
   const [tpslError, setTpslError] = useState<string | null>(null);
 
   const entryPriceForEdit = useMemo(() => {
     if (position?.entryPrice) {
-      return parseFloat(position.entryPrice.replace(/,/gu, ''));
+      return Number.parseFloat(position.entryPrice.replaceAll(',', ''));
     }
     return currentPrice;
   }, [position, currentPrice]);
@@ -70,7 +95,7 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     if (!position) {
       return 'long';
     }
-    return parseFloat(position.size) >= 0 ? 'long' : 'short';
+    return Number.parseFloat(position.size) >= 0 ? 'long' : 'short';
   }, [position]);
 
   const formatEditPrice = useCallback(
@@ -96,8 +121,8 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
       if (!price || !entryPriceForEdit) {
         return '';
       }
-      const cleanPrice = price.replace(/,/gu, '');
-      const priceNum = parseFloat(cleanPrice);
+      const cleanPrice = price.replaceAll(',', '');
+      const priceNum = Number.parseFloat(cleanPrice);
       if (Number.isNaN(priceNum) || priceNum <= 0) {
         return '';
       }
@@ -138,13 +163,34 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     [priceToPercentForEdit, editingSlPrice],
   );
 
-  useEffect(() => {
-    if (position) {
-      setEditingTpPrice(position.takeProfitPrice ?? '');
-      setEditingSlPrice(position.stopLossPrice ?? '');
-      setTpslError(null);
+  const signedSize = useMemo(
+    () => Number.parseFloat(position.size.replaceAll(',', '')) || 0,
+    [position.size],
+  );
+
+  const estimatedPnlAtTp = useMemo(() => {
+    const clean = editingTpPrice.replaceAll(',', '').trim();
+    if (!clean) {
+      return null;
     }
-  }, [position]);
+    const exitPrice = Number.parseFloat(clean);
+    if (Number.isNaN(exitPrice) || exitPrice <= 0 || !entryPriceForEdit) {
+      return null;
+    }
+    return signedSize * (exitPrice - entryPriceForEdit);
+  }, [editingTpPrice, signedSize, entryPriceForEdit]);
+
+  const estimatedPnlAtSl = useMemo(() => {
+    const clean = editingSlPrice.replaceAll(',', '').trim();
+    if (!clean) {
+      return null;
+    }
+    const exitPrice = Number.parseFloat(clean);
+    if (Number.isNaN(exitPrice) || exitPrice <= 0 || !entryPriceForEdit) {
+      return null;
+    }
+    return signedSize * (exitPrice - entryPriceForEdit);
+  }, [editingSlPrice, signedSize, entryPriceForEdit]);
 
   const handleTpPresetClick = useCallback(
     (percent: number) => {
@@ -166,7 +212,7 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
       if (value === '' || /^-?\d*(?:\.\d*)?$/u.test(value)) {
-        const numValue = parseFloat(value);
+        const numValue = Number.parseFloat(value);
         if (value === '' || value === '-') {
           setEditingTpPrice('');
         } else if (!Number.isNaN(numValue)) {
@@ -182,7 +228,7 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const { value } = event.target;
       if (value === '' || /^-?\d*(?:\.\d*)?$/u.test(value)) {
-        const numValue = parseFloat(value);
+        const numValue = Number.parseFloat(value);
         if (value === '' || value === '-') {
           setEditingSlPrice('');
         } else if (!Number.isNaN(numValue)) {
@@ -196,7 +242,7 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
 
   const handleTpPriceBlur = useCallback(() => {
     if (editingTpPrice) {
-      const numValue = parseFloat(editingTpPrice.replace(/,/gu, ''));
+      const numValue = Number.parseFloat(editingTpPrice.replaceAll(',', ''));
       if (!Number.isNaN(numValue) && numValue > 0) {
         setEditingTpPrice(formatEditPrice(numValue));
       }
@@ -205,7 +251,7 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
 
   const handleSlPriceBlur = useCallback(() => {
     if (editingSlPrice) {
-      const numValue = parseFloat(editingSlPrice.replace(/,/gu, ''));
+      const numValue = Number.parseFloat(editingSlPrice.replaceAll(',', ''));
       if (!Number.isNaN(numValue) && numValue > 0) {
         setEditingSlPrice(formatEditPrice(numValue));
       }
@@ -219,8 +265,8 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     setIsSaving(true);
     setTpslError(null);
     try {
-      const cleanTpPrice = editingTpPrice.replace(/,/gu, '').trim();
-      const cleanSlPrice = editingSlPrice.replace(/,/gu, '').trim();
+      const cleanTpPrice = editingTpPrice.replaceAll(',', '').trim();
+      const cleanSlPrice = editingSlPrice.replaceAll(',', '').trim();
       const result = await submitRequestToBackground<{
         success: boolean;
         error?: string;
@@ -271,6 +317,15 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
     }
   }, [isEligible, position, editingTpPrice, editingSlPrice, onClose]);
 
+  useLayoutEffect(() => {
+    onSubmitStateChange?.({
+      onSubmit: handleSave,
+      isSaving,
+      submitDisabled: !isEligible || isSaving,
+      submitButtonTitle: isEligible ? undefined : t('perpsGeoBlockedTooltip'),
+    });
+  }, [onSubmitStateChange, handleSave, isSaving, isEligible, t]);
+
   return (
     <Box flexDirection={BoxFlexDirection.Column} gap={4}>
       {/* Take Profit */}
@@ -356,6 +411,32 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
             />
           </Box>
         </Box>
+        {estimatedPnlAtTp !== null && (
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            justifyContent={BoxJustifyContent.Between}
+            alignItems={BoxAlignItems.Center}
+            data-testid="perps-update-tpsl-estimated-tp-pnl-row"
+          >
+            <Text
+              variant={TextVariant.BodyXs}
+              color={TextColor.TextAlternative}
+            >
+              {t('perpsEstimatedPnlAtTakeProfit')}
+            </Text>
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={getPnlDisplayColor(estimatedPnlAtTp)}
+            >
+              {estimatedPnlAtTp >= 0 ? '+' : '-'}
+              {formatCurrencyWithMinThreshold(
+                Math.abs(estimatedPnlAtTp),
+                'USD',
+              )}
+            </Text>
+          </Box>
+        )}
       </Box>
 
       {/* Stop Loss */}
@@ -441,6 +522,32 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
             />
           </Box>
         </Box>
+        {estimatedPnlAtSl !== null && (
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            justifyContent={BoxJustifyContent.Between}
+            alignItems={BoxAlignItems.Center}
+            data-testid="perps-update-tpsl-estimated-sl-pnl-row"
+          >
+            <Text
+              variant={TextVariant.BodyXs}
+              color={TextColor.TextAlternative}
+            >
+              {t('perpsEstimatedPnlAtStopLoss')}
+            </Text>
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={getPnlDisplayColor(estimatedPnlAtSl)}
+            >
+              {estimatedPnlAtSl >= 0 ? '+' : '-'}
+              {formatCurrencyWithMinThreshold(
+                Math.abs(estimatedPnlAtSl),
+                'USD',
+              )}
+            </Text>
+          </Box>
+        )}
       </Box>
 
       {tpslError && (
@@ -460,21 +567,6 @@ export const UpdateTPSLModalContent: React.FC<UpdateTPSLModalContentProps> = ({
           </Text>
         </Box>
       )}
-
-      <Button
-        variant={ButtonVariant.Primary}
-        size={ButtonSize.Md}
-        onClick={handleSave}
-        disabled={!isEligible || isSaving}
-        title={isEligible ? undefined : t('perpsGeoBlockedTooltip')}
-        className={
-          isSaving || !isEligible
-            ? 'w-full opacity-70 cursor-not-allowed'
-            : 'w-full'
-        }
-      >
-        {isSaving ? t('perpsSubmitting') : t('perpsSaveChanges')}
-      </Button>
     </Box>
   );
 };
diff --git a/ui/components/app/perps/update-tpsl/update-tpsl-modal.tsx b/ui/components/app/perps/update-tpsl/update-tpsl-modal.tsx
index 4266a15846f5..1843483f000d 100644
--- a/ui/components/app/perps/update-tpsl/update-tpsl-modal.tsx
+++ b/ui/components/app/perps/update-tpsl/update-tpsl-modal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import {
   Modal,
   ModalContent,
@@ -10,7 +10,10 @@ import {
 } from '../../../component-library';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import type { Position } from '../types';
-import { UpdateTPSLModalContent } from './update-tpsl-modal-content';
+import {
+  UpdateTPSLModalContent,
+  type UpdateTPSLSubmitState,
+} from './update-tpsl-modal-content';
 
 export type UpdateTPSLModalProps = {
   isOpen: boolean;
@@ -35,6 +38,22 @@ export const UpdateTPSLModal: React.FC<UpdateTPSLModalProps> = ({
   currentPrice,
 }) => {
   const t = useI18nContext();
+  const [submitState, setSubmitState] = useState<UpdateTPSLSubmitState | null>(
+    null,
+  );
+
+  const handleSubmitStateChange = useCallback(
+    (state: UpdateTPSLSubmitState) => {
+      setSubmitState(state);
+    },
+    [],
+  );
+
+  useEffect(() => {
+    if (!isOpen) {
+      setSubmitState(null);
+    }
+  }, [isOpen]);
 
   return (
     <Modal
@@ -50,13 +69,18 @@ export const UpdateTPSLModal: React.FC<UpdateTPSLModalProps> = ({
             position={position}
             currentPrice={currentPrice}
             onClose={onClose}
+            onSubmitStateChange={handleSubmitStateChange}
           />
         </ModalBody>
         <ModalFooter
-          onCancel={onClose}
-          cancelButtonProps={{
-            'data-testid': 'perps-update-tpsl-modal-cancel',
-            children: t('cancel'),
+          onSubmit={submitState?.onSubmit}
+          submitButtonProps={{
+            'data-testid': 'perps-update-tpsl-modal-submit',
+            children: submitState?.isSaving
+              ? t('perpsSubmitting')
+              : t('perpsSaveChanges'),
+            disabled: submitState?.submitDisabled ?? true,
+            title: submitState?.submitButtonTitle,
           }}
         />
       </ModalContent>
diff --git a/ui/components/app/perps/utils/index.ts b/ui/components/app/perps/utils/index.ts
index 75528b20fcc0..3e852c93e128 100644
--- a/ui/components/app/perps/utils/index.ts
+++ b/ui/components/app/perps/utils/index.ts
@@ -15,3 +15,10 @@ export {
   type WithdrawalRequest,
   type DepositRequest,
 } from './transactionTransforms';
+
+export {
+  normalizeMarketDetailsOrders,
+  shouldDisplayOrderInMarketDetailsOrders,
+  buildDisplayOrdersWithSyntheticTpsl,
+  isOrderAssociatedWithFullPosition,
+} from './orderUtils';
diff --git a/ui/components/app/perps/utils/number.test.ts b/ui/components/app/perps/utils/number.test.ts
new file mode 100644
index 000000000000..4921dac8df30
--- /dev/null
+++ b/ui/components/app/perps/utils/number.test.ts
@@ -0,0 +1,23 @@
+import { floorToDecimals, formatFlooredDecimals } from './number';
+
+describe('perps number utils', () => {
+  describe('floorToDecimals', () => {
+    it('avoids extra-cent underflow for IEEE-754 edge values', () => {
+      expect(floorToDecimals(0.29, 2)).toBe(0.29);
+      expect(floorToDecimals(1.15, 2)).toBe(1.15);
+      expect(floorToDecimals(2.29, 2)).toBe(2.29);
+    });
+
+    it('still floors values above the target precision', () => {
+      expect(floorToDecimals(3.066, 2)).toBe(3.06);
+      expect(floorToDecimals(1.159, 2)).toBe(1.15);
+    });
+  });
+
+  describe('formatFlooredDecimals', () => {
+    it('returns fixed-width floored strings', () => {
+      expect(formatFlooredDecimals(3.066, 2)).toBe('3.06');
+      expect(formatFlooredDecimals(1.15, 2)).toBe('1.15');
+    });
+  });
+});
diff --git a/ui/components/app/perps/utils/number.ts b/ui/components/app/perps/utils/number.ts
new file mode 100644
index 000000000000..892c8da8d0f6
--- /dev/null
+++ b/ui/components/app/perps/utils/number.ts
@@ -0,0 +1,27 @@
+/**
+ * Floors a number to a fixed decimal precision while guarding against
+ * IEEE-754 underflow around integer boundaries (e.g. 0.29 * 100).
+ *
+ * @param value - Numeric value to floor.
+ * @param decimals - Decimal places to keep.
+ * @returns Floored numeric value at the requested precision.
+ */
+export function floorToDecimals(value: number, decimals = 2): number {
+  if (!Number.isFinite(value)) {
+    return 0;
+  }
+
+  const factor = 10 ** decimals;
+  return Math.floor((value + Number.EPSILON) * factor) / factor;
+}
+
+/**
+ * Floors a number to a fixed decimal precision and returns a fixed-width string.
+ *
+ * @param value - Numeric value to floor.
+ * @param decimals - Decimal places to keep.
+ * @returns Fixed-width floored decimal string.
+ */
+export function formatFlooredDecimals(value: number, decimals = 2): string {
+  return floorToDecimals(value, decimals).toFixed(decimals);
+}
diff --git a/ui/components/app/perps/utils/orderUtils.test.ts b/ui/components/app/perps/utils/orderUtils.test.ts
new file mode 100644
index 000000000000..9a1d04921482
--- /dev/null
+++ b/ui/components/app/perps/utils/orderUtils.test.ts
@@ -0,0 +1,333 @@
+import type { Order, Position } from '@metamask/perps-controller';
+import {
+  isOrderAssociatedWithFullPosition,
+  shouldDisplayOrderInMarketDetailsOrders,
+  buildDisplayOrdersWithSyntheticTpsl,
+  normalizeMarketDetailsOrders,
+} from './orderUtils';
+
+const makeOrder = (overrides: Partial<Order> = {}): Order => ({
+  orderId: 'order-1',
+  symbol: 'ETH',
+  side: 'buy',
+  orderType: 'limit',
+  size: '1.0',
+  originalSize: '1.0',
+  price: '3000.00',
+  filledSize: '0',
+  remainingSize: '1.0',
+  status: 'open',
+  timestamp: Date.now(),
+  reduceOnly: false,
+  ...overrides,
+});
+
+const makePosition = (overrides: Partial<Position> = {}): Position =>
+  ({
+    symbol: 'ETH',
+    size: '1.0',
+    entryPrice: '3000.00',
+    leverage: '10',
+    liquidationPrice: '2700.00',
+    unrealizedPnl: '50.00',
+    marginUsed: '300.00',
+    ...overrides,
+  }) as Position;
+
+describe('orderUtils', () => {
+  describe('isOrderAssociatedWithFullPosition', () => {
+    it('returns false for non-reduce-only orders', () => {
+      const order = makeOrder({ reduceOnly: false });
+      const position = makePosition();
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(false);
+    });
+
+    it('returns true when isPositionTpsl is true', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        isPositionTpsl: true,
+      });
+      expect(isOrderAssociatedWithFullPosition(order)).toBe(true);
+    });
+
+    it('returns false when no position provided and isPositionTpsl is not true', () => {
+      const order = makeOrder({ reduceOnly: true });
+      expect(isOrderAssociatedWithFullPosition(order)).toBe(false);
+    });
+
+    it('returns false when symbols do not match', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'BTC',
+        side: 'sell',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(false);
+    });
+
+    it('returns false when isPositionTpsl is explicitly false', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        isPositionTpsl: false,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '1.0',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(false);
+    });
+
+    it('returns true when reduce-only order matches full position size (sell closing long)', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '1.0',
+        originalSize: '1.0',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(true);
+    });
+
+    it('returns true when reduce-only order matches full position size (buy closing short)', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'buy',
+        size: '2.0',
+        originalSize: '2.0',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '-2.0' });
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(true);
+    });
+
+    it('returns false when order size does not match position size', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '0.5',
+        originalSize: '0.5',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(isOrderAssociatedWithFullPosition(order, position)).toBe(false);
+    });
+  });
+
+  describe('shouldDisplayOrderInMarketDetailsOrders', () => {
+    it('shows non-reduce-only orders', () => {
+      const order = makeOrder({ reduceOnly: false });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order)).toBe(true);
+    });
+
+    it('shows limit orders', () => {
+      const order = makeOrder({ orderType: 'limit', reduceOnly: false });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order)).toBe(true);
+    });
+
+    it('shows trigger orders that are not position-attached', () => {
+      const order = makeOrder({
+        isTrigger: true,
+        reduceOnly: false,
+        triggerPrice: '3200.00',
+      });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order)).toBe(true);
+    });
+
+    it('shows reduce-only orders not associated with full position', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '0.5',
+        originalSize: '0.5',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order, position)).toBe(
+        true,
+      );
+    });
+
+    it('hides reduce-only orders associated with full position', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '1.0',
+        originalSize: '1.0',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order, position)).toBe(
+        false,
+      );
+    });
+
+    it('hides orders with isPositionTpsl true', () => {
+      const order = makeOrder({
+        reduceOnly: true,
+        isPositionTpsl: true,
+      });
+      expect(shouldDisplayOrderInMarketDetailsOrders(order)).toBe(false);
+    });
+  });
+
+  describe('buildDisplayOrdersWithSyntheticTpsl', () => {
+    it('returns empty array for empty input', () => {
+      expect(buildDisplayOrdersWithSyntheticTpsl([])).toEqual([]);
+    });
+
+    it('returns orders as-is when no TP/SL prices are set', () => {
+      const order = makeOrder();
+      const result = buildDisplayOrdersWithSyntheticTpsl([order]);
+      expect(result).toHaveLength(1);
+      expect(result[0].orderId).toBe('order-1');
+    });
+
+    it('adds synthetic TP row when takeProfitPrice is set on parent', () => {
+      const order = makeOrder({
+        takeProfitPrice: '3200.00',
+        takeProfitOrderId: '',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([order]);
+      expect(result).toHaveLength(2);
+      expect(result[0].orderId).toBe('order-1');
+      expect(result[1].isSynthetic).toBe(true);
+      expect(result[1].detailedOrderType).toBe('Take Profit Limit');
+      expect(result[1].triggerPrice).toBe('3200');
+    });
+
+    it('adds synthetic SL row when stopLossPrice is set on parent', () => {
+      const order = makeOrder({
+        stopLossPrice: '2800.00',
+        stopLossOrderId: '',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([order]);
+      expect(result).toHaveLength(2);
+      expect(result[1].isSynthetic).toBe(true);
+      expect(result[1].detailedOrderType).toBe('Stop Limit');
+      expect(result[1].triggerPrice).toBe('2800');
+    });
+
+    it('adds both synthetic TP and SL rows when both are set', () => {
+      const order = makeOrder({
+        takeProfitPrice: '3200.00',
+        stopLossPrice: '2800.00',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([order]);
+      expect(result).toHaveLength(3);
+      expect(result[1].detailedOrderType).toBe('Take Profit Limit');
+      expect(result[2].detailedOrderType).toBe('Stop Limit');
+    });
+
+    it('uses market type for synthetic rows when parent is market order', () => {
+      const order = makeOrder({
+        orderType: 'market',
+        takeProfitPrice: '3200.00',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([order]);
+      expect(result[1].detailedOrderType).toBe('Take Profit Market');
+      expect(result[1].orderType).toBe('market');
+    });
+
+    it('does not add synthetic row when real trigger order already exists', () => {
+      const parentOrder = makeOrder({
+        orderId: 'parent-1',
+        side: 'buy',
+        takeProfitPrice: '3200.00',
+        takeProfitOrderId: 'tp-1',
+      });
+      const realTpOrder = makeOrder({
+        orderId: 'tp-1',
+        parentOrderId: 'parent-1',
+        side: 'sell',
+        symbol: 'ETH',
+        reduceOnly: true,
+        isTrigger: true,
+        triggerPrice: '3200.00',
+        price: '3200.00',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([
+        parentOrder,
+        realTpOrder,
+      ]);
+      const syntheticOrders = result.filter((o) => o.isSynthetic);
+      expect(syntheticOrders).toHaveLength(0);
+    });
+
+    it('skips synthetic rows for trigger orders (no recursion)', () => {
+      const triggerOrder = makeOrder({
+        isTrigger: true,
+        takeProfitPrice: '3200.00',
+      });
+      const result = buildDisplayOrdersWithSyntheticTpsl([triggerOrder]);
+      expect(result).toHaveLength(1);
+    });
+  });
+
+  describe('normalizeMarketDetailsOrders', () => {
+    it('shows limit orders without position', () => {
+      const limitOrder = makeOrder({
+        orderType: 'limit',
+        reduceOnly: false,
+      });
+      const result = normalizeMarketDetailsOrders({ orders: [limitOrder] });
+      expect(result).toHaveLength(1);
+      expect(result[0].orderId).toBe('order-1');
+    });
+
+    it('shows stop limit orders when not full-position TP/SL', () => {
+      const stopLimitOrder = makeOrder({
+        orderType: 'limit',
+        isTrigger: true,
+        triggerPrice: '3200.00',
+        detailedOrderType: 'Stop Limit',
+        reduceOnly: false,
+      });
+      const result = normalizeMarketDetailsOrders({
+        orders: [stopLimitOrder],
+      });
+      expect(result).toHaveLength(1);
+    });
+
+    it('hides full-position TP/SL reduce-only orders', () => {
+      const tpslOrder = makeOrder({
+        reduceOnly: true,
+        isPositionTpsl: true,
+        isTrigger: true,
+        triggerPrice: '3200.00',
+        detailedOrderType: 'Take Profit Limit',
+      });
+      const result = normalizeMarketDetailsOrders({ orders: [tpslOrder] });
+      expect(result).toHaveLength(0);
+    });
+
+    it('shows partial-close reduce-only orders', () => {
+      const partialClose = makeOrder({
+        reduceOnly: true,
+        symbol: 'ETH',
+        side: 'sell',
+        size: '0.5',
+        originalSize: '0.5',
+      });
+      const position = makePosition({ symbol: 'ETH', size: '1.0' });
+      const result = normalizeMarketDetailsOrders({
+        orders: [partialClose],
+        existingPosition: position,
+      });
+      expect(result).toHaveLength(1);
+    });
+
+    it('adds synthetic TP/SL rows and filters them through position check', () => {
+      const limitOrder = makeOrder({
+        orderType: 'limit',
+        reduceOnly: false,
+        takeProfitPrice: '3200.00',
+        stopLossPrice: '2800.00',
+      });
+      const result = normalizeMarketDetailsOrders({
+        orders: [limitOrder],
+      });
+      expect(result).toHaveLength(3);
+    });
+  });
+});
diff --git a/ui/components/app/perps/utils/orderUtils.ts b/ui/components/app/perps/utils/orderUtils.ts
new file mode 100644
index 000000000000..d993ae6f9812
--- /dev/null
+++ b/ui/components/app/perps/utils/orderUtils.ts
@@ -0,0 +1,327 @@
+import BigNumber from 'bignumber.js';
+import type { Order, Position } from '@metamask/perps-controller';
+
+const FULL_POSITION_SIZE_TOLERANCE = new BigNumber('0.00000001');
+const ORDER_PRICE_MATCH_TOLERANCE = new BigNumber('0.00000001');
+const SYNTHETIC_TP_ID_SUFFIX = '-synthetic-tp';
+const SYNTHETIC_SL_ID_SUFFIX = '-synthetic-sl';
+
+/**
+ * Safely creates a BigNumber, returning null for empty/invalid values.
+ * bignumber.js v4.x throws on empty strings and non-numeric values.
+ *
+ * @param value - The string value to parse
+ * @returns BigNumber or null
+ */
+const safeBigNumber = (value: string | undefined | null): BigNumber | null => {
+  if (!value || value.trim() === '') {
+    return null;
+  }
+  try {
+    const bn = new BigNumber(value);
+    return bn.isFinite() ? bn : null;
+  } catch {
+    return null;
+  }
+};
+
+const getAbsoluteOrderSize = (order: Order): BigNumber | null => {
+  const size = order.originalSize || order.size;
+  const parsedSize = safeBigNumber(size);
+  if (!parsedSize || parsedSize.lte(0)) {
+    return null;
+  }
+  return parsedSize.abs();
+};
+
+const getAbsolutePositionSize = (position?: Position): BigNumber | null => {
+  const parsedSize = safeBigNumber(position?.size);
+  if (!parsedSize || parsedSize.isZero()) {
+    return null;
+  }
+  return parsedSize.abs();
+};
+
+const getOrderTriggerPrice = (order: Order): BigNumber | null => {
+  const rawPrice = order.triggerPrice || order.price;
+  const parsedPrice = safeBigNumber(rawPrice);
+  if (!parsedPrice || parsedPrice.lte(0)) {
+    return null;
+  }
+  return parsedPrice;
+};
+
+const isClosingSideForPosition = (
+  order: Order,
+  position: Position,
+): boolean => {
+  const positionSize = safeBigNumber(position.size) ?? new BigNumber(0);
+  if (!positionSize.isFinite() || positionSize.isZero()) {
+    return false;
+  }
+  return positionSize.gt(0) ? order.side === 'sell' : order.side === 'buy';
+};
+
+const hasMatchingRealReduceOnlyTrigger = (
+  orders: Order[],
+  syntheticOrder: Order,
+): boolean => {
+  if (!syntheticOrder.parentOrderId) {
+    return false;
+  }
+
+  const parentOrder = orders.find(
+    (order) => order.orderId === syntheticOrder.parentOrderId,
+  );
+
+  return orders.some((order) => {
+    if (order.isSynthetic) {
+      return false;
+    }
+
+    const isSameParentByChildLink = Boolean(
+      order.parentOrderId &&
+        order.parentOrderId === syntheticOrder.parentOrderId,
+    );
+    const isSameParentByParentReference = Boolean(
+      parentOrder &&
+        (parentOrder.takeProfitOrderId === order.orderId ||
+          parentOrder.stopLossOrderId === order.orderId),
+    );
+
+    if (!isSameParentByChildLink && !isSameParentByParentReference) {
+      return false;
+    }
+
+    if (
+      order.symbol !== syntheticOrder.symbol ||
+      order.side !== syntheticOrder.side ||
+      order.reduceOnly !== true ||
+      order.isTrigger !== true
+    ) {
+      return false;
+    }
+
+    const existingOrderPrice = getOrderTriggerPrice(order);
+    const syntheticOrderPrice = getOrderTriggerPrice(syntheticOrder);
+
+    if (!existingOrderPrice || !syntheticOrderPrice) {
+      return false;
+    }
+
+    return existingOrderPrice
+      .minus(syntheticOrderPrice)
+      .abs()
+      .lte(ORDER_PRICE_MATCH_TOLERANCE);
+  });
+};
+
+/**
+ * Determines whether an order is associated with the full active position.
+ *
+ * Position association logic:
+ * 1. Order must be reduce-only.
+ * 2. Order and position must match symbol and closing side semantics.
+ * 3. Prefer native isPositionTpsl flag when available.
+ * 4. Fallback to full-size matching with decimal tolerance.
+ *
+ * @param order - The order to check
+ * @param position - The current position (if any)
+ * @returns Whether the order is associated with the full position
+ */
+export const isOrderAssociatedWithFullPosition = (
+  order: Order,
+  position?: Position,
+): boolean => {
+  if (!order.reduceOnly) {
+    return false;
+  }
+
+  if (order.isPositionTpsl === true) {
+    return true;
+  }
+
+  if (!position) {
+    return false;
+  }
+
+  if (
+    order.symbol !== position.symbol ||
+    !isClosingSideForPosition(order, position)
+  ) {
+    return false;
+  }
+
+  if (order.isPositionTpsl === false) {
+    return false;
+  }
+
+  const orderSize = getAbsoluteOrderSize(order);
+  const positionSize = getAbsolutePositionSize(position);
+  if (!orderSize || !positionSize) {
+    return false;
+  }
+
+  return orderSize.minus(positionSize).abs().lte(FULL_POSITION_SIZE_TOLERANCE);
+};
+
+/**
+ * Determines whether an order should be shown in Market Details > Orders.
+ *
+ * - All non-reduce-only orders are shown.
+ * - Reduce-only orders are shown only when they are NOT full-position TP/SL.
+ *
+ * @param order - The order to check
+ * @param position - The current position (if any)
+ * @returns Whether the order should be displayed
+ */
+export const shouldDisplayOrderInMarketDetailsOrders = (
+  order: Order,
+  position?: Position,
+): boolean => {
+  if (!order.reduceOnly) {
+    return true;
+  }
+  return !isOrderAssociatedWithFullPosition(order, position);
+};
+
+const buildSyntheticTriggerOrder = (
+  parentOrder: Order,
+  triggerType: 'tp' | 'sl',
+): Order | null => {
+  const triggerPrice =
+    triggerType === 'tp'
+      ? parentOrder.takeProfitPrice
+      : parentOrder.stopLossPrice;
+  const parsedTriggerPrice = safeBigNumber(triggerPrice);
+  if (!parsedTriggerPrice || parsedTriggerPrice.lte(0)) {
+    return null;
+  }
+  const normalizedTriggerPrice = parsedTriggerPrice.toFixed();
+
+  const syntheticSide = parentOrder.side === 'buy' ? 'sell' : 'buy';
+  const isMarketParent =
+    parentOrder.orderType === 'market' ||
+    (parentOrder.detailedOrderType || '').toLowerCase().includes('market');
+  const syntheticOrderType = isMarketParent ? 'market' : 'limit';
+  const executionStyle = isMarketParent ? 'Market' : 'Limit';
+  const syntheticDetailedType =
+    triggerType === 'tp'
+      ? `Take Profit ${executionStyle}`
+      : `Stop ${executionStyle}`;
+  const size = parentOrder.originalSize || parentOrder.size;
+  if (!size) {
+    return null;
+  }
+  const existingChildOrderId =
+    triggerType === 'tp'
+      ? parentOrder.takeProfitOrderId
+      : parentOrder.stopLossOrderId;
+  const syntheticOrderIdSuffix =
+    triggerType === 'tp' ? SYNTHETIC_TP_ID_SUFFIX : SYNTHETIC_SL_ID_SUFFIX;
+  const syntheticOrderId =
+    existingChildOrderId && existingChildOrderId.trim().length > 0
+      ? existingChildOrderId
+      : `${parentOrder.orderId}${syntheticOrderIdSuffix}`;
+
+  return {
+    orderId: syntheticOrderId,
+    parentOrderId: parentOrder.orderId,
+    isSynthetic: true,
+    isPositionTpsl: false,
+    symbol: parentOrder.symbol,
+    side: syntheticSide,
+    orderType: syntheticOrderType,
+    size,
+    originalSize: size,
+    price: normalizedTriggerPrice,
+    filledSize: '0',
+    remainingSize: size,
+    status: 'open',
+    timestamp: parentOrder.timestamp,
+    detailedOrderType: syntheticDetailedType,
+    isTrigger: true,
+    reduceOnly: true,
+    triggerPrice: normalizedTriggerPrice,
+    providerId: parentOrder.providerId,
+  };
+};
+
+/**
+ * Builds display orders with synthetic TP/SL rows for untriggered parent orders.
+ *
+ * Synthetic rows are display-only and are not created when a real reduce-only
+ * trigger already exists with matching symbol, side, and trigger price.
+ *
+ * @param orders - The orders to enrich with synthetic rows
+ * @returns Orders array with synthetic TP/SL rows added
+ */
+export const buildDisplayOrdersWithSyntheticTpsl = (
+  orders: Order[],
+): Order[] => {
+  if (!orders.length) {
+    return orders;
+  }
+
+  const displayOrders: Order[] = [];
+  const realOrderIds = new Set(orders.map((order) => order.orderId));
+
+  orders.forEach((order) => {
+    displayOrders.push(order);
+
+    if (order.isTrigger) {
+      return;
+    }
+
+    const syntheticTpOrder = buildSyntheticTriggerOrder(order, 'tp');
+    if (
+      syntheticTpOrder &&
+      !hasMatchingRealReduceOnlyTrigger(orders, syntheticTpOrder) &&
+      !realOrderIds.has(syntheticTpOrder.orderId) &&
+      !displayOrders.some(
+        (displayOrder) => displayOrder.orderId === syntheticTpOrder.orderId,
+      )
+    ) {
+      displayOrders.push(syntheticTpOrder);
+    }
+
+    const syntheticSlOrder = buildSyntheticTriggerOrder(order, 'sl');
+    if (
+      syntheticSlOrder &&
+      !hasMatchingRealReduceOnlyTrigger(orders, syntheticSlOrder) &&
+      !realOrderIds.has(syntheticSlOrder.orderId) &&
+      !displayOrders.some(
+        (displayOrder) => displayOrder.orderId === syntheticSlOrder.orderId,
+      )
+    ) {
+      displayOrders.push(syntheticSlOrder);
+    }
+  });
+
+  return displayOrders;
+};
+
+/**
+ * Normalizes orders for the Perps Market Details > Orders section.
+ *
+ * Composes display-order enrichment (synthetic TP/SL rows) with visibility
+ * filtering (hides full-position TP/SL, keeps everything else).
+ *
+ * @param options0 - Options object
+ * @param options0.orders - The orders to normalize
+ * @param options0.existingPosition - The current position (if any)
+ * @returns Normalized orders for display
+ */
+export const normalizeMarketDetailsOrders = ({
+  orders,
+  existingPosition,
+}: {
+  orders: Order[];
+  existingPosition?: Position;
+}): Order[] => {
+  const ordersWithSyntheticTpsl = buildDisplayOrdersWithSyntheticTpsl(orders);
+
+  return ordersWithSyntheticTpsl.filter((order) =>
+    shouldDisplayOrderInMarketDetailsOrders(order, existingPosition),
+  );
+};
diff --git a/ui/components/app/perps/utils/transactionTransforms.test.ts b/ui/components/app/perps/utils/transactionTransforms.test.ts
index e7a2ebe5e4a9..dd2aed84bfba 100644
--- a/ui/components/app/perps/utils/transactionTransforms.test.ts
+++ b/ui/components/app/perps/utils/transactionTransforms.test.ts
@@ -461,6 +461,8 @@ describe('Transaction Transform Utilities', () => {
       expect(result[0].type).toBe('withdrawal');
       expect(result[0].title).toBe('Withdrew 250.00 USDC');
       expect(result[0].depositWithdrawal?.amount).toBe('-$250.00');
+      expect(result[0].depositWithdrawal?.amountNumber).toBe(-250);
+      expect(result[0].depositWithdrawal?.isPositive).toBe(false);
     });
 
     it('filters out non-completed withdrawal requests', () => {
diff --git a/ui/components/app/perps/utils/transactionTransforms.ts b/ui/components/app/perps/utils/transactionTransforms.ts
index 3b716d1019b1..246ab49d9ac3 100644
--- a/ui/components/app/perps/utils/transactionTransforms.ts
+++ b/ui/components/app/perps/utils/transactionTransforms.ts
@@ -635,9 +635,10 @@ export function transformWithdrawalRequestsToTransactions(
       const amountBN = new BigNumber(amount);
       const displayAmount = `-$${amountBN.toFixed(2)}`;
 
-      // For completed withdrawals, status is always positive (green)
+      // Completion status is separate from amount polarity.
+      // Withdrawals are outflows, so they are always negative for styling.
       const statusText = 'Completed';
-      const isPositive = true;
+      const isPositive = false;
 
       return {
         id: `withdrawal-${id}`,
diff --git a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
index afd6f5660ca9..1004e18287ef 100644
--- a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
+++ b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
@@ -68,45 +68,12 @@ exports[`SnapUIAddress renders Bitcoin address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(35, 83, 225);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#03475E"
-              height="32"
-              transform="translate(2.93051364518973 1.22614695259726) rotate(127.9 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#F95801"
-              height="32"
-              transform="translate(7.17183210118496 11.07980552300802) rotate(153.0 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#017B8E"
-              height="32"
-              transform="translate(8.45143442708077 22.46860174935927) rotate(146.6 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for bip122:000000000019d6689c085ae165831e93:128Lkh3S7CkDTBZ8W7BbpsN3YYizJMp8p6"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMjA0IDYxJSA0MSUpIiBkPSJNMCwwSDhWOEgweiIvPjxwYXRoIGZpbGw9ImhzbCgxODQgNjMlIDUwJSkiIGQ9Ik0xLDBoMXYxaC0xek02LDBoMXYxaC0xek0yLDBoMXYxaC0xek01LDBoMXYxaC0xek0wLDFoMXYxaC0xek03LDFoMXYxaC0xek0yLDFoMXYxaC0xek01LDFoMXYxaC0xek0xLDJoMXYxaC0xek02LDJoMXYxaC0xek0zLDJoMXYxaC0xek00LDJoMXYxaC0xek0wLDNoMXYxaC0xek03LDNoMXYxaC0xek0yLDNoMXYxaC0xek01LDNoMXYxaC0xek0wLDVoMXYxaC0xek03LDVoMXYxaC0xek0xLDVoMXYxaC0xek02LDVoMXYxaC0xek0xLDZoMXYxaC0xek02LDZoMXYxaC0xeiIvPjxwYXRoIGZpbGw9ImhzbCgxODEgNjIlIDUyJSkiIGQ9Ik0zLDFoMXYxaC0xek00LDFoMXYxaC0xek0yLDJoMXYxaC0xek01LDJoMXYxaC0xek0yLDRoMXYxaC0xek01LDRoMXYxaC0xek0wLDZoMXYxaC0xek03LDZoMXYxaC0xek0yLDZoMXYxaC0xek01LDZoMXYxaC0xek0wLDdoMXYxaC0xek03LDdoMXYxaC0xeiIvPjwvc3ZnPg=="
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -186,45 +153,12 @@ exports[`SnapUIAddress renders Cosmos address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(3, 59, 94);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#2339E1"
-              height="32"
-              transform="translate(-10.57709536850356 1.27788532664115) rotate(258.6 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#FB182B"
-              height="32"
-              transform="translate(5.67733727066244 9.94368742032136) rotate(189.4 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#EDF500"
-              height="32"
-              transform="translate(-25.62998642818306 -17.79040578649136) rotate(296.0 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for cosmos:cosmoshub-3:cosmos1t2uflqwqe0fsj0shcfkrvpukewcw40yjj6hdc0"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMjQ3IDQ2JSAzNSUpIiBkPSJNMCwwSDhWOEgweiIvPjxwYXRoIGZpbGw9ImhzbCg4NiA3MSUgNTQlKSIgZD0iTTAsMGgxdjFoLTF6TTcsMGgxdjFoLTF6TTAsMmgxdjFoLTF6TTcsMmgxdjFoLTF6TTAsM2gxdjFoLTF6TTcsM2gxdjFoLTF6TTEsM2gxdjFoLTF6TTYsM2gxdjFoLTF6TTMsM2gxdjFoLTF6TTQsM2gxdjFoLTF6TTAsNGgxdjFoLTF6TTcsNGgxdjFoLTF6TTEsNGgxdjFoLTF6TTYsNGgxdjFoLTF6TTIsNGgxdjFoLTF6TTUsNGgxdjFoLTF6TTAsNWgxdjFoLTF6TTcsNWgxdjFoLTF6TTIsNWgxdjFoLTF6TTUsNWgxdjFoLTF6TTIsNmgxdjFoLTF6TTUsNmgxdjFoLTF6TTMsNmgxdjFoLTF6TTQsNmgxdjFoLTF6TTAsN2gxdjFoLTF6TTcsN2gxdjFoLTF6Ii8+PHBhdGggZmlsbD0iaHNsKDE4OSA2NSUgMzYlKSIgZD0iTTIsMGgxdjFoLTF6TTUsMGgxdjFoLTF6TTMsMWgxdjFoLTF6TTQsMWgxdjFoLTF6TTMsMmgxdjFoLTF6TTQsMmgxdjFoLTF6Ii8+PC9zdmc+"
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -304,45 +238,12 @@ exports[`SnapUIAddress renders Ethereum address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(200, 20, 83);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#F29602"
-              height="32"
-              transform="translate(-2.81750896228304 4.95191654400623) rotate(230.4 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#236CE1"
-              height="32"
-              transform="translate(-13.49865029263281 -9.44191867669309) rotate(245.3 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#018E8E"
-              height="32"
-              transform="translate(18.42469405222943 23.24877720627808) rotate(173.9 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for eip155:1:0xab16a96D359eC26a11e2C2b3d8f8B8942d5Bfcdb"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woNTIgNzAlIDU4JSkiIGQ9Ik0wLDBIOFY4SDB6Ii8+PHBhdGggZmlsbD0iaHNsKDI2MiA1MiUgNTYlKSIgZD0iTTEsMGgxdjFoLTF6TTYsMGgxdjFoLTF6TTIsMWgxdjFoLTF6TTUsMWgxdjFoLTF6TTIsMmgxdjFoLTF6TTUsMmgxdjFoLTF6TTMsMmgxdjFoLTF6TTQsMmgxdjFoLTF6TTAsM2gxdjFoLTF6TTcsM2gxdjFoLTF6TTEsM2gxdjFoLTF6TTYsM2gxdjFoLTF6TTIsM2gxdjFoLTF6TTUsM2gxdjFoLTF6TTMsM2gxdjFoLTF6TTQsM2gxdjFoLTF6TTMsNGgxdjFoLTF6TTQsNGgxdjFoLTF6TTAsNWgxdjFoLTF6TTcsNWgxdjFoLTF6TTEsNWgxdjFoLTF6TTYsNWgxdjFoLTF6TTIsNWgxdjFoLTF6TTUsNWgxdjFoLTF6TTAsNmgxdjFoLTF6TTcsNmgxdjFoLTF6TTEsNmgxdjFoLTF6TTYsNmgxdjFoLTF6TTEsN2gxdjFoLTF6TTYsN2gxdjFoLTF6Ii8+PHBhdGggZmlsbD0iaHNsKDggNjMlIDUzJSkiIGQ9IiIvPjwvc3ZnPg=="
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -422,45 +323,12 @@ exports[`SnapUIAddress renders Hedera address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(251, 24, 81);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#C81441"
-              height="32"
-              transform="translate(7.89293039869636 3.81505315001625) rotate(81.4 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#F95001"
-              height="32"
-              transform="translate(-15.11553225410416 5.65823114066517) rotate(249.8 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#034A5E"
-              height="32"
-              transform="translate(18.78211641009715 -20.96644138082799) rotate(321.3 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for hedera:mainnet:0.0.1234567890-zbhlt"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMTkgNzclIDU3JSkiIGQ9Ik0wLDBIOFY4SDB6Ii8+PHBhdGggZmlsbD0iaHNsKDEwMSA1OCUgMzMlKSIgZD0iTTAsMGgxdjFoLTF6TTcsMGgxdjFoLTF6TTIsMGgxdjFoLTF6TTUsMGgxdjFoLTF6TTIsMWgxdjFoLTF6TTUsMWgxdjFoLTF6TTAsMmgxdjFoLTF6TTcsMmgxdjFoLTF6TTIsMmgxdjFoLTF6TTUsMmgxdjFoLTF6TTMsMmgxdjFoLTF6TTQsMmgxdjFoLTF6TTAsM2gxdjFoLTF6TTcsM2gxdjFoLTF6TTAsNGgxdjFoLTF6TTcsNGgxdjFoLTF6TTMsNGgxdjFoLTF6TTQsNGgxdjFoLTF6TTAsN2gxdjFoLTF6TTcsN2gxdjFoLTF6TTEsN2gxdjFoLTF6TTYsN2gxdjFoLTF6Ii8+PHBhdGggZmlsbD0iaHNsKDM1NyA5NCUgNDUlKSIgZD0iTTEsMGgxdjFoLTF6TTYsMGgxdjFoLTF6TTMsMGgxdjFoLTF6TTQsMGgxdjFoLTF6TTEsMWgxdjFoLTF6TTYsMWgxdjFoLTF6TTEsM2gxdjFoLTF6TTYsM2gxdjFoLTF6TTIsNGgxdjFoLTF6TTUsNGgxdjFoLTF6TTAsNWgxdjFoLTF6TTcsNWgxdjFoLTF6TTEsNWgxdjFoLTF6TTYsNWgxdjFoLTF6TTIsNWgxdjFoLTF6TTUsNWgxdjFoLTF6TTMsNWgxdjFoLTF6TTQsNWgxdjFoLTF6TTIsN2gxdjFoLTF6TTUsN2gxdjFoLTF6Ii8+PC9zdmc+"
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -540,45 +408,12 @@ exports[`SnapUIAddress renders Polkadot address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(24, 198, 242);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#238CE1"
-              height="32"
-              transform="translate(-0.93263597805800 -0.77609792173980) rotate(228.7 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#018E77"
-              height="32"
-              transform="translate(14.63385912762450 0.17102681763595) rotate(175.0 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#F26E02"
-              height="32"
-              transform="translate(22.33401116585189 0.64465270748203) rotate(17.6 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for polkadot:b0a8d493285c2df73290dfb7e61f870f:5hmuyxw9xdgbpptgypokw4thfyoe3ryenebr381z9iaegmfy"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMTMgNjMlIDMzJSkiIGQ9Ik0wLDBIOFY4SDB6Ii8+PHBhdGggZmlsbD0iaHNsKDEzOCA3NSUgMjglKSIgZD0iTTAsMWgxdjFoLTF6TTcsMWgxdjFoLTF6TTIsMWgxdjFoLTF6TTUsMWgxdjFoLTF6TTAsMmgxdjFoLTF6TTcsMmgxdjFoLTF6TTIsMmgxdjFoLTF6TTUsMmgxdjFoLTF6TTMsMmgxdjFoLTF6TTQsMmgxdjFoLTF6TTAsM2gxdjFoLTF6TTcsM2gxdjFoLTF6TTEsM2gxdjFoLTF6TTYsM2gxdjFoLTF6TTEsNGgxdjFoLTF6TTYsNGgxdjFoLTF6TTMsNGgxdjFoLTF6TTQsNGgxdjFoLTF6TTAsNWgxdjFoLTF6TTcsNWgxdjFoLTF6TTEsNWgxdjFoLTF6TTYsNWgxdjFoLTF6TTIsNmgxdjFoLTF6TTUsNmgxdjFoLTF6TTAsN2gxdjFoLTF6TTcsN2gxdjFoLTF6TTEsN2gxdjFoLTF6TTYsN2gxdjFoLTF6TTMsN2gxdjFoLTF6TTQsN2gxdjFoLTF6Ii8+PHBhdGggZmlsbD0iaHNsKDczIDc3JSAzMyUpIiBkPSJNMCwwaDF2MWgtMXpNNywwaDF2MWgtMXpNMSwwaDF2MWgtMXpNNiwwaDF2MWgtMXpNMywwaDF2MWgtMXpNNCwwaDF2MWgtMXpNMSwyaDF2MWgtMXpNNiwyaDF2MWgtMXpNMiw1aDF2MWgtMXpNNSw1aDF2MWgtMXpNMyw1aDF2MWgtMXpNNCw1aDF2MWgtMXpNMCw2aDF2MWgtMXpNNyw2aDF2MWgtMXpNMyw2aDF2MWgtMXpNNCw2aDF2MWgtMXpNMiw3aDF2MWgtMXpNNSw3aDF2MWgtMXoiLz48L3N2Zz4="
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -658,45 +493,12 @@ exports[`SnapUIAddress renders Starknet address with blockie 1`] = `
     <div
       class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-8 w-8"
     >
-      <div
-        class="flex [&>div]:!rounded-none"
-      >
-        <div
-          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 32px; height: 32px; display: inline-block; background: rgb(250, 162, 0);"
-        >
-          <svg
-            height="32"
-            width="32"
-            x="0"
-            y="0"
-          >
-            <rect
-              fill="#03405E"
-              height="32"
-              transform="translate(2.06481943493039 4.67251827463514) rotate(110.8 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#FB1836"
-              height="32"
-              transform="translate(-11.72229395562091 -7.60164355296404) rotate(323.2 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-            <rect
-              fill="#F96C01"
-              height="32"
-              transform="translate(-21.47761817022074 15.26919418349953) rotate(281.7 16.00000000000000 16.00000000000000)"
-              width="32"
-              x="0"
-              y="0"
-            />
-          </svg>
-        </div>
-      </div>
+      <img
+        alt="Blockies for starknet:SN_GOERLI:0x02dd1b492765c064eac4039e3841aa5f382773b598097a40073bd8b48170ab57"
+        height="32"
+        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiIHNoYXBlLXJlbmRlcmluZz0ib3B0aW1pemVTcGVlZCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij48cGF0aCBmaWxsPSJoc2woMjM0IDUzJSA2MSUpIiBkPSJNMCwwSDhWOEgweiIvPjxwYXRoIGZpbGw9ImhzbCgxODIgNzIlIDMxJSkiIGQ9Ik0xLDBoMXYxaC0xek02LDBoMXYxaC0xek0xLDFoMXYxaC0xek02LDFoMXYxaC0xek0yLDFoMXYxaC0xek01LDFoMXYxaC0xek0wLDJoMXYxaC0xek03LDJoMXYxaC0xek0xLDJoMXYxaC0xek02LDJoMXYxaC0xek0zLDJoMXYxaC0xek00LDJoMXYxaC0xek0wLDNoMXYxaC0xek03LDNoMXYxaC0xek0zLDNoMXYxaC0xek00LDNoMXYxaC0xek0xLDVoMXYxaC0xek02LDVoMXYxaC0xek0yLDVoMXYxaC0xek01LDVoMXYxaC0xek0zLDVoMXYxaC0xek00LDVoMXYxaC0xek0xLDZoMXYxaC0xek02LDZoMXYxaC0xek0yLDZoMXYxaC0xek01LDZoMXYxaC0xek0xLDdoMXYxaC0xek02LDdoMXYxaC0xek0zLDdoMXYxaC0xek00LDdoMXYxaC0xeiIvPjxwYXRoIGZpbGw9ImhzbCg2OCA4NiUgNjYlKSIgZD0iTTMsMWgxdjFoLTF6TTQsMWgxdjFoLTF6TTIsMmgxdjFoLTF6TTUsMmgxdjFoLTF6TTAsNGgxdjFoLTF6TTcsNGgxdjFoLTF6TTMsNGgxdjFoLTF6TTQsNGgxdjFoLTF6TTAsNWgxdjFoLTF6TTcsNWgxdjFoLTF6TTAsNmgxdjFoLTF6TTcsNmgxdjFoLTF6Ii8+PC9zdmc+"
+        width="32"
+      />
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/components/app/snaps/snap-ui-address/snap-ui-address.test.tsx b/ui/components/app/snaps/snap-ui-address/snap-ui-address.test.tsx
index adecede3c948..1e1853f62bd9 100644
--- a/ui/components/app/snaps/snap-ui-address/snap-ui-address.test.tsx
+++ b/ui/components/app/snaps/snap-ui-address/snap-ui-address.test.tsx
@@ -10,7 +10,10 @@ const mockStoreWithBlockies = configureMockStore([])({
   ...mockState,
   metamask: {
     ...mockState.metamask,
-    useBlockie: true,
+    preferences: {
+      ...mockState.metamask.preferences,
+      avatarType: 'blockies',
+    },
   },
 });
 
diff --git a/ui/components/app/toast-master/selectors.test.ts b/ui/components/app/toast-master/selectors.test.ts
index 9a0ea5cbe717..ec935eba974c 100644
--- a/ui/components/app/toast-master/selectors.test.ts
+++ b/ui/components/app/toast-master/selectors.test.ts
@@ -122,6 +122,7 @@ describe('#selectShowConnectAccountGroupToast', () => {
       entropy: {
         groupIndex: 0,
       },
+      lastSelected: 0,
     },
     walletName: 'MetaMask HD Wallet',
     walletId: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ' as AccountWalletId,
diff --git a/ui/components/app/toast-master/toast-master.js b/ui/components/app/toast-master/toast-master.js
index e4d456672d77..1ad3c7805e3b 100644
--- a/ui/components/app/toast-master/toast-master.js
+++ b/ui/components/app/toast-master/toast-master.js
@@ -5,7 +5,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate, useLocation } from 'react-router-dom';
 import classnames from 'clsx';
 import { getAllScopesFromCaip25CaveatValue } from '@metamask/chain-agnostic-permission';
-import { AvatarAccountSize } from '@metamask/design-system-react';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+} from '@metamask/design-system-react';
 import { PRODUCT_TYPES } from '@metamask/subscription-controller';
 import { MILLISECOND, SECOND } from '../../../../shared/constants/time';
 import {
@@ -13,7 +16,6 @@ import {
   SURVEY_LINK,
 } from '../../../../shared/lib/ui-utils';
 import {
-  BorderColor,
   BorderRadius,
   IconColor,
   TextVariant,
@@ -40,12 +42,7 @@ import {
   addPermittedAccount,
   hidePermittedNetworkToast,
 } from '../../../store/actions';
-import {
-  AvatarNetwork,
-  Icon,
-  IconName,
-  IconSize,
-} from '../../component-library';
+import { Icon, IconName, IconSize } from '../../component-library';
 import { PreferredAvatar } from '../preferred-avatar';
 import { Toast, ToastContainer } from '../../multichain';
 import { SurveyToast } from '../../ui/survey-toast';
@@ -55,6 +52,7 @@ import {
   StorageWriteErrorType,
 } from '../../../../shared/constants/app-state';
 import { MerklClaimToast, MusdConversionToast } from '../musd';
+import { PerpsWithdrawToast } from '../perps/perps-withdraw-toast';
 import { getDappActiveNetwork } from '../../../selectors/dapp';
 import {
   getAccountGroupWithInternalAccounts,
@@ -147,6 +145,7 @@ export function ToastMaster() {
         <CopyAddressToast />
         <MerklClaimToast />
         <MusdConversionToast />
+        <PerpsWithdrawToast />
         <ShieldPausedToast />
         <ShieldEndingToast />
       </ToastContainer>
@@ -395,8 +394,8 @@ function PermittedNetworkToast() {
         key="switched-permitted-network-toast"
         startAdornment={
           <AvatarNetwork
-            size={AvatarAccountSize.Md}
-            borderColor={BorderColor.transparent}
+            size={AvatarNetworkSize.Md}
+            className="border-transparent"
             src={getNetworkImageUrl()}
             name={displayNetwork?.name || displayNetwork?.nickname}
           />
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts b/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
index 2ef02cb55ea9..c335b3ba4bd7 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
@@ -66,7 +66,6 @@ export const getTransactionBreakdownData = ({
         destinationTokenDecimals,
         undefined,
         undefined,
-        // @ts-expect-error TODO: fix this, ported directly from original code
         null,
       );
 
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 9f94be5cf5c6..e8c0488aee41 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
@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { ButtonSize } from '@metamask/design-system-react';
@@ -26,6 +26,7 @@ import {
   Display,
 } from '../../../helpers/constants/design-system';
 import { getCurrentNetwork } from '../../../selectors';
+import { useBoolean } from '../../../hooks/useBoolean';
 
 export default function SmartTransactionListItem({
   smartTransaction,
@@ -35,7 +36,7 @@ export default function SmartTransactionListItem({
 }) {
   const dispatch = useDispatch();
   const [cancelSwapLinkClicked, setCancelSwapLinkClicked] = useState(false);
-  const [showDetails, setShowDetails] = useState(false);
+  const { value: showDetails, toggle: toggleShowDetails } = useBoolean();
   const { title, category, primaryCurrency, recipientAddress, isPending } =
     useTransactionDisplayData(transactionGroup);
   const currentChain = useSelector(getCurrentNetwork);
@@ -51,9 +52,6 @@ export default function SmartTransactionListItem({
   const showCancelSwapLink =
     smartTransaction.cancellable && !cancelSwapLinkClicked;
   const className = 'transaction-list-item transaction-list-item--unconfirmed';
-  const toggleShowDetails = useCallback(() => {
-    setShowDetails((prev) => !prev);
-  }, []);
   const senderAddress = transactionGroup.initialTransaction.txParams?.from;
 
   return (
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 631c53817326..368a7a18c9e0 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
@@ -41,11 +41,8 @@ import {
   TransactionModalContextProvider,
   useTransactionModalContext,
 } from '../../../contexts/transaction-modal';
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
 import { formatDateWithYearContext } from '../../../helpers/utils/util';
 import CancelButton from '../cancel-button';
-import EditGasPopover from '../../../pages/confirmations/components/edit-gas-popover';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ActivityListItem } from '../../multichain/activity-list-item';
 import { abortTransactionSigning } from '../../../store/actions';
@@ -70,15 +67,11 @@ function TransactionListItemInner({
   setEditGasMode,
   isEarliestNonce = false,
   chainId,
-  supportsEIP1559,
 }) {
   const t = useI18nContext();
   const navigate = useNavigate();
   const { hasCancelled } = transactionGroup;
   const [showDetails, setShowDetails] = useState(false);
-  const [showCancelEditGasPopover, setShowCancelEditGasPopover] =
-    useState(false);
-  const [showRetryEditGasPopover, setShowRetryEditGasPopover] = useState(false);
   const { openModal } = useTransactionModalContext();
   const dispatch = useDispatch();
 
@@ -136,14 +129,10 @@ function TransactionListItemInner({
           legacy_event: true,
         },
       });
-      if (supportsEIP1559) {
-        setEditGasMode(EditGasModes.speedUp);
-        openModal('cancelSpeedUpTransaction');
-      } else {
-        setShowRetryEditGasPopover(true);
-      }
+      setEditGasMode(EditGasModes.speedUp);
+      openModal('cancelSpeedUpTransaction');
     },
-    [openModal, setEditGasMode, trackEvent, supportsEIP1559],
+    [openModal, setEditGasMode, trackEvent],
   );
 
   const cancelTransaction = useCallback(
@@ -159,22 +148,12 @@ function TransactionListItemInner({
       });
       if (status === TransactionStatus.approved) {
         dispatch(abortTransactionSigning(id));
-      } else if (supportsEIP1559) {
+      } else {
         setEditGasMode(EditGasModes.cancel);
         openModal('cancelSpeedUpTransaction');
-      } else {
-        setShowCancelEditGasPopover(true);
       }
     },
-    [
-      trackEvent,
-      openModal,
-      setEditGasMode,
-      supportsEIP1559,
-      status,
-      dispatch,
-      id,
-    ],
+    [trackEvent, openModal, setEditGasMode, status, dispatch, id],
   );
 
   const shouldShowSpeedUp = useShouldShowSpeedUp(
@@ -428,20 +407,6 @@ function TransactionListItemInner({
             chainId={chainId}
           />
         ))}
-      {!supportsEIP1559 && showRetryEditGasPopover && (
-        <EditGasPopover
-          onClose={() => setShowRetryEditGasPopover(false)}
-          mode={EditGasModes.speedUp}
-          transaction={transactionGroup.primaryTransaction}
-        />
-      )}
-      {!supportsEIP1559 && showCancelEditGasPopover && (
-        <EditGasPopover
-          onClose={() => setShowCancelEditGasPopover(false)}
-          mode={EditGasModes.cancel}
-          transaction={transactionGroup.primaryTransaction}
-        />
-      )}
     </>
   );
 }
@@ -451,7 +416,6 @@ TransactionListItemInner.propTypes = {
   isEarliestNonce: PropTypes.bool,
   setEditGasMode: PropTypes.func,
   chainId: PropTypes.string,
-  supportsEIP1559: PropTypes.bool,
 };
 
 const TransactionListItem = (props) => {
@@ -459,20 +423,10 @@ const TransactionListItem = (props) => {
   const [editGasMode, setEditGasMode] = useState();
   const transaction = transactionGroup.primaryTransaction;
 
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-
   return (
     <TransactionModalContextProvider>
-      <TransactionListItemInner
-        {...props}
-        setEditGasMode={setEditGasMode}
-        supportsEIP1559={supportsEIP1559}
-      />
-      {supportsEIP1559 && (
-        <CancelSpeedup transaction={transaction} editGasMode={editGasMode} />
-      )}
+      <TransactionListItemInner {...props} setEditGasMode={setEditGasMode} />
+      <CancelSpeedup transaction={transaction} editGasMode={editGasMode} />
     </TransactionModalContextProvider>
   );
 };
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.test.js b/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
index 9ec99801fc63..de1c45408681 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
@@ -1,6 +1,6 @@
 import { NameType } from '@metamask/name-controller';
 import { TransactionStatus } from '@metamask/transaction-controller';
-import { fireEvent } from '@testing-library/react';
+import { act, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import configureStore from 'redux-mock-store';
@@ -111,6 +111,11 @@ jest.mock('react', () => {
 jest.mock('../../../store/actions.ts', () => ({
   tryReverseResolveAddress: jest.fn().mockReturnValue({ type: 'TYPE' }),
   abortTransactionSigning: jest.fn(),
+  getGasFeeTimeEstimate: jest.fn().mockResolvedValue({}),
+  updatePreviousGasParams: jest.fn().mockReturnValue({ type: 'TYPE' }),
+  updateTransactionGasFees: jest.fn().mockReturnValue({ type: 'TYPE' }),
+  createCancelTransaction: jest.fn().mockReturnValue({ type: 'TYPE' }),
+  createSpeedUpTransaction: jest.fn().mockReturnValue({ type: 'TYPE' }),
 }));
 
 const mockStore = configureStore();
@@ -254,24 +259,25 @@ describe('TransactionListItem', () => {
       expect(queryByTestId('not-enough-gas__tooltip')).not.toBeInTheDocument();
     });
 
-    it(`should open the edit gas popover when cancel is clicked`, () => {
+    it(`should open the cancel/speedup modal when cancel is clicked`, async () => {
       useSelector.mockImplementation(
         generateUseSelectorRouter({
           balance: '2AA1EFB94E0000',
         }),
       );
-      const { getByText, queryByText } = renderWithProvider(
+      useDispatch.mockReturnValue(jest.fn());
+      const { getByText, queryByTestId } = renderWithProvider(
         <TransactionListItem transactionGroup={transactionGroup} />,
       );
       expect(
-        queryByText(messages.cancelPopoverTitle.message),
+        queryByTestId('speed-up-and-cancel-modal'),
       ).not.toBeInTheDocument();
 
       const cancelButton = getByText(messages.cancel.message);
-      fireEvent.click(cancelButton);
-      expect(
-        getByText(messages.cancelPopoverTitle.message),
-      ).toBeInTheDocument();
+      await act(async () => {
+        fireEvent.click(cancelButton);
+      });
+      expect(queryByTestId('speed-up-and-cancel-modal')).toBeInTheDocument();
     });
   });
 
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index 0a13fa92b653..4a49a3f3dc35 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -101,6 +101,7 @@ describe('EthOverview', () => {
     },
     metamask: {
       ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
+      selectedAccountGroup: 'entropy:wallet1/group1',
       accountTree: {
         wallets: {
           'entropy:wallet1': {
@@ -114,12 +115,12 @@ describe('EthOverview', () => {
                   name: 'Account 1',
                   hidden: false,
                   pinned: false,
+                  lastSelected: 0,
                 },
               },
             },
           },
         },
-        selectedAccountGroup: 'entropy:wallet1/group1',
       },
       tokenBalances: {
         [CHAIN_IDS.MAINNET]: {},
diff --git a/ui/components/app/wallet-overview/non-evm-overview.test.tsx b/ui/components/app/wallet-overview/non-evm-overview.test.tsx
index 2bb5e32d4a88..1b1175da024b 100644
--- a/ui/components/app/wallet-overview/non-evm-overview.test.tsx
+++ b/ui/components/app/wallet-overview/non-evm-overview.test.tsx
@@ -142,6 +142,7 @@ const mockMetamaskStore = {
     selectedAccount: mockNonEvmAccount.id,
   },
   // Account tree required by CoinOverview/AccountGroupBalance after BIP-44 refactor
+  selectedAccountGroup: 'entropy:wallet1/group1',
   accountTree: {
     wallets: {
       'entropy:wallet1': {
@@ -155,12 +156,12 @@ const mockMetamaskStore = {
               name: 'Account',
               hidden: false,
               pinned: false,
+              lastSelected: 0,
             },
           },
         },
       },
     },
-    selectedAccountGroup: 'entropy:wallet1/group1',
   },
   // MultichainBalancesController
   balances: {
diff --git a/ui/components/component-library/picker-network/picker-network.test.tsx b/ui/components/component-library/picker-network/picker-network.test.tsx
index 98956c0bd338..43f2a9203fec 100644
--- a/ui/components/component-library/picker-network/picker-network.test.tsx
+++ b/ui/components/component-library/picker-network/picker-network.test.tsx
@@ -97,7 +97,7 @@ describe('PickerNetwork', () => {
           avatarType: AvatarType.NETWORK,
         }}
       />,
-      configureStore({ metamask: { useBlockie: false } }),
+      configureStore({ metamask: {} }),
     );
     expect(container).toMatchSnapshot();
   });
@@ -118,7 +118,7 @@ describe('PickerNetwork', () => {
           avatarType: AvatarType.NETWORK,
         }}
       />,
-      configureStore({ metamask: { useBlockie: true } }),
+      configureStore({ metamask: {} }),
     );
     expect(container).toMatchSnapshot();
   });
diff --git a/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.stories.tsx b/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.stories.tsx
index a37af2bbc6ea..c8f3ffc53381 100644
--- a/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.stories.tsx
+++ b/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.stories.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import mockState from '../../../../test/data/mock-state.json';
 import configureStore from '../../../store/store';
 
-const mockSelectedAccountGroup = mockState.metamask.accountTree
+const mockSelectedAccountGroup = mockState.metamask
   .selectedAccountGroup as AccountGroupId;
 
 const defaultArgs: MultichainAccountListProps = {
diff --git a/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.test.tsx b/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.test.tsx
index 7936f2d6833a..1fef3a7047c7 100644
--- a/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.test.tsx
+++ b/ui/components/multichain-accounts/multichain-account-list/multichain-account-list.test.tsx
@@ -138,6 +138,7 @@ const mockWallets = {
           },
           pinned: false,
           hidden: false,
+          lastSelected: 0,
         },
         accounts: ['cf8dace4-9439-4bd4-b3a8-88c821c8fcb3'],
       },
@@ -163,6 +164,7 @@ const mockWallets = {
           },
           pinned: false,
           hidden: false,
+          lastSelected: 0,
         },
         accounts: ['784225f4-d30b-4e77-a900-c8bbce735b88'],
       },
diff --git a/ui/components/multichain-accounts/multichain-account-menu/multichain-account-menu.test.tsx b/ui/components/multichain-accounts/multichain-account-menu/multichain-account-menu.test.tsx
index f65b3240c388..b076c179b29a 100644
--- a/ui/components/multichain-accounts/multichain-account-menu/multichain-account-menu.test.tsx
+++ b/ui/components/multichain-accounts/multichain-account-menu/multichain-account-menu.test.tsx
@@ -48,6 +48,7 @@ const mockState = {
                 name: 'Test Account',
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
             },
           },
@@ -514,7 +515,7 @@ describe('MultichainAccountMenu', () => {
   });
 
   describe('tracing', () => {
-    const groupId = mockDefaultState.metamask.accountTree
+    const groupId = mockDefaultState.metamask
       .selectedAccountGroup as AccountGroupId;
 
     beforeEach(() => {
diff --git a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-aggregated-list-row.test.tsx b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-aggregated-list-row.test.tsx
index d9358ba4fc71..9cbe59ed222c 100644
--- a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-aggregated-list-row.test.tsx
+++ b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-aggregated-list-row.test.tsx
@@ -81,7 +81,6 @@ const createTestProps = (
 
 const createMockState = () => ({
   metamask: {
-    useBlockie: false,
     networkConfigurationsByChainId: {
       '0x1': {
         chainId: '0x1',
diff --git a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.stories.tsx b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.stories.tsx
index dfba1c1f5a17..ab34801289f7 100644
--- a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.stories.tsx
+++ b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.stories.tsx
@@ -119,6 +119,7 @@ const createMockState = () => ({
                 },
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
               accounts: Object.keys(accounts).map(
                 (key) => accounts[key as keyof typeof accounts].id,
diff --git a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.test.tsx b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.test.tsx
index 9fae8d8ed8a1..765225f464dd 100644
--- a/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.test.tsx
+++ b/ui/components/multichain-accounts/multichain-address-rows-hovered-list/multichain-hovered-address-rows-hovered-list.test.tsx
@@ -289,6 +289,7 @@ const createMockAccountGroup = (
     },
     pinned: false,
     hidden: false,
+    lastSelected: 0,
   },
   accounts,
 });
diff --git a/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.stories.tsx b/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.stories.tsx
index 16a8f66cb7a7..9c50deb784be 100644
--- a/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.stories.tsx
+++ b/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.stories.tsx
@@ -52,6 +52,7 @@ const createMockAccountGroup = (
     entropy: {
       groupIndex: index,
     },
+    lastSelected: 0,
   },
   accounts: [
     createMockInternalAccount({
diff --git a/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.test.tsx b/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.test.tsx
index 2f8760518833..b788d9dc8898 100644
--- a/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.test.tsx
+++ b/ui/components/multichain-accounts/multichain-site-cell/multichain-site-cell.test.tsx
@@ -69,6 +69,7 @@ const mockAccountGroups: AccountGroupWithInternalAccounts[] = [
       entropy: {
         groupIndex: 0,
       },
+      lastSelected: 0,
     },
     accounts: [mockEvmAccount1, mockSolAccount1],
     walletName: 'Test Wallet',
@@ -84,6 +85,7 @@ const mockAccountGroups: AccountGroupWithInternalAccounts[] = [
       entropy: {
         groupIndex: 1,
       },
+      lastSelected: 0,
     },
     accounts: [mockEvmAccount2, mockSolAccount2],
     walletName: 'Test Wallet',
@@ -148,7 +150,6 @@ const mockTestNetworks: EvmAndMultichainNetworkConfigurationsWithCaipChainId[] =
 
 const createMockState = (overrides = {}) => ({
   metamask: {
-    useBlockie: false,
     keyrings: [
       {
         type: 'HD Key Tree',
@@ -159,8 +160,8 @@ const createMockState = (overrides = {}) => ({
         accounts: [mockSolAccount1.address, mockSolAccount2.address],
       },
     ],
+    selectedAccountGroup: MOCK_GROUP_ID_1,
     accountTree: {
-      selectedAccountGroup: MOCK_GROUP_ID_1,
       wallets: {
         [MOCK_WALLET_ID]: {
           id: MOCK_WALLET_ID,
@@ -182,6 +183,7 @@ const createMockState = (overrides = {}) => ({
                 entropy: {
                   groupIndex: 0,
                 },
+                lastSelected: 0,
               },
               accounts: [mockEvmAccount1.id, mockSolAccount1.id],
             },
@@ -195,6 +197,7 @@ const createMockState = (overrides = {}) => ({
                 entropy: {
                   groupIndex: 1,
                 },
+                lastSelected: 0,
               },
               accounts: [mockEvmAccount2.id, mockSolAccount2.id],
             },
diff --git a/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.stories.tsx b/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.stories.tsx
index 03c7f2ec7500..e381d39cfa78 100644
--- a/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.stories.tsx
+++ b/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.stories.tsx
@@ -33,6 +33,7 @@ const mockAccountGroups: AccountGroupWithInternalAccounts[] = [
       entropy: {
         groupIndex: 0,
       },
+      lastSelected: 0,
     },
     accounts: [
       createMockInternalAccount({
@@ -54,6 +55,7 @@ const mockAccountGroups: AccountGroupWithInternalAccounts[] = [
       entropy: {
         groupIndex: 1,
       },
+      lastSelected: 0,
     },
     walletName: 'Test Wallet 1',
     walletId: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ',
diff --git a/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.test.tsx b/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.test.tsx
index 7a5c2ec0e5af..295a5b907f97 100644
--- a/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.test.tsx
+++ b/ui/components/multichain-accounts/multichain-site-cell/tool-tip/multichain-site-cell-tooltip.test.tsx
@@ -66,6 +66,7 @@ describe('MultichainSiteCellTooltip', () => {
         name: 'Account 1',
         pinned: false,
         hidden: false,
+        lastSelected: 0,
       },
       accounts: [
         createMockInternalAccount({
@@ -84,6 +85,7 @@ describe('MultichainSiteCellTooltip', () => {
         name: 'Account 2',
         pinned: false,
         hidden: false,
+        lastSelected: 0,
       },
       accounts: [
         createMockInternalAccount({
@@ -98,6 +100,7 @@ describe('MultichainSiteCellTooltip', () => {
         name: 'Snap Account 1',
         pinned: false,
         hidden: false,
+        lastSelected: 0,
       },
       accounts: [
         createMockInternalAccount({
@@ -253,6 +256,7 @@ describe('MultichainSiteCellTooltip', () => {
         name: `Account ${index + 1}`,
         pinned: false,
         hidden: false,
+        lastSelected: 0,
       },
       accounts: [
         createMockInternalAccount({
@@ -323,6 +327,7 @@ describe('MultichainSiteCellTooltip', () => {
         name: `Account ${index + 1}`,
         pinned: false,
         hidden: false,
+        lastSelected: 0,
       },
       accounts: [
         createMockInternalAccount({
diff --git a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-account-wrapper.test.tsx b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-account-wrapper.test.tsx
index 6019aaa4e5b2..e3fc7bef8f2b 100644
--- a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-account-wrapper.test.tsx
+++ b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-account-wrapper.test.tsx
@@ -72,6 +72,7 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
       entropy: {
         groupIndex: 0,
       },
+      lastSelected: 0,
     },
     accounts: [
       {
@@ -96,6 +97,7 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
       entropy: {
         groupIndex: 1,
       },
+      lastSelected: 0,
     },
     accounts: [
       {
@@ -110,7 +112,6 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
 
 const createMockState = (overrides = {}) => {
   const accountTreeState = {
-    selectedAccountGroup: MOCK_GROUP_ID_1,
     wallets: {
       [MOCK_WALLET_ID]: {
         id: MOCK_WALLET_ID,
@@ -132,6 +133,7 @@ const createMockState = (overrides = {}) => {
               entropy: {
                 groupIndex: 0,
               },
+              lastSelected: 0,
             },
             accounts: [mockEvmAccount1.id, mockSolAccount1.id],
           },
@@ -145,6 +147,7 @@ const createMockState = (overrides = {}) => {
               entropy: {
                 groupIndex: 1,
               },
+              lastSelected: 0,
             },
             accounts: [mockEvmAccount2.id],
           },
@@ -174,6 +177,8 @@ const createMockState = (overrides = {}) => {
   const mockMultichainState = createMockMultichainAccountsState(
     accountTreeState as unknown as AccountTreeState,
     internalAccountsState as unknown as InternalAccountsState,
+    undefined,
+    MOCK_GROUP_ID_1,
   );
 
   return {
diff --git a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.stories.tsx b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.stories.tsx
index 231af1447ef1..349cc1f55cf5 100644
--- a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.stories.tsx
+++ b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.stories.tsx
@@ -57,6 +57,7 @@ const mockSupportedAccountGroups: AccountGroupWithInternalAccounts[] = [
       },
       hidden: false,
       pinned: false,
+      lastSelected: 0,
     },
     accounts: [
       {
diff --git a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.test.tsx b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.test.tsx
index d07c31d770b5..bf982f9db846 100644
--- a/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.test.tsx
+++ b/ui/components/multichain-accounts/permissions/multichain-edit-accounts-page/multichain-edit-accounts-page.test.tsx
@@ -97,6 +97,7 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
       entropy: {
         groupIndex: 0,
       },
+      lastSelected: 0,
     },
     accounts: [
       {
@@ -121,6 +122,7 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
       entropy: {
         groupIndex: 1,
       },
+      lastSelected: 0,
     },
     accounts: [
       {
@@ -145,6 +147,7 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
       entropy: {
         groupIndex: 2,
       },
+      lastSelected: 0,
     },
     accounts: [
       {
@@ -163,7 +166,6 @@ const createMockAccountGroups = (): AccountGroupWithInternalAccounts[] => [
 
 const createMockState = (overrides = {}) => {
   const accountTreeState = {
-    selectedAccountGroup: MOCK_GROUP_ID_1,
     wallets: {
       [MOCK_WALLET_ID]: {
         id: MOCK_WALLET_ID,
@@ -185,6 +187,7 @@ const createMockState = (overrides = {}) => {
               entropy: {
                 groupIndex: 0,
               },
+              lastSelected: 0,
             },
             accounts: [mockEvmAccount1.id, mockSolAccount1.id],
           },
@@ -198,6 +201,7 @@ const createMockState = (overrides = {}) => {
               entropy: {
                 groupIndex: 1,
               },
+              lastSelected: 0,
             },
             accounts: [mockEvmAccount2.id, mockSolAccount2.id],
           },
@@ -211,6 +215,7 @@ const createMockState = (overrides = {}) => {
               entropy: {
                 groupIndex: 2,
               },
+              lastSelected: 0,
             },
             accounts: [mockEvmAccount3.id, mockSolAccount3.id],
           },
@@ -252,6 +257,8 @@ const createMockState = (overrides = {}) => {
   const mockMultichainState = createMockMultichainAccountsState(
     accountTreeState as unknown as AccountTreeState,
     internalAccountsState as unknown as InternalAccountsState,
+    undefined,
+    MOCK_GROUP_ID_1,
   );
 
   return {
diff --git a/ui/components/multichain-accounts/permissions/permission-review-page/multichain-review-permissions-page.test.tsx b/ui/components/multichain-accounts/permissions/permission-review-page/multichain-review-permissions-page.test.tsx
index 9e53c0f7a03a..6b57f932f623 100644
--- a/ui/components/multichain-accounts/permissions/permission-review-page/multichain-review-permissions-page.test.tsx
+++ b/ui/components/multichain-accounts/permissions/permission-review-page/multichain-review-permissions-page.test.tsx
@@ -89,6 +89,7 @@ const mockAccountGroups = [
       entropy: { groupIndex: 0 },
       pinned: false,
       hidden: false,
+      lastSelected: 0,
     },
     walletName: 'Test Wallet 1',
     walletId: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ' as const,
@@ -108,6 +109,7 @@ const mockAccountGroups = [
       entropy: { groupIndex: 1 },
       pinned: false,
       hidden: false,
+      lastSelected: 0,
     },
     walletName: 'Test Wallet 2',
     walletId: 'entropy:01JKAF3PJ247KAM6C03G5Q0NP8' as const,
diff --git a/ui/components/multichain/account-overview/account-overview-layout.tsx b/ui/components/multichain/account-overview/account-overview-layout.tsx
index 5befddb3fb10..f744296432bc 100644
--- a/ui/components/multichain/account-overview/account-overview-layout.tsx
+++ b/ui/components/multichain/account-overview/account-overview-layout.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { NetworkConnectionBanner } from '../../app/network-connection-banner';
 import {
   AccountOverviewTabsProps,
@@ -14,9 +14,21 @@ export const AccountOverviewLayout = ({
   children,
   ...tabsProps
 }: AccountOverviewLayoutProps) => {
+  const heroRef = useCallback((node: HTMLDivElement | null) => {
+    if (node) {
+      node.setAttribute('elementtiming', 'hero');
+      requestAnimationFrame(() => {
+        performance.mark('mm-hero-painted');
+      });
+    }
+  }, []);
+
   return (
     <>
-      <div className="account-overview__balance-wrapper flex flex-col p-4 gap-4">
+      <div
+        ref={heroRef}
+        className="account-overview__balance-wrapper flex flex-col p-4 gap-4"
+      >
         <NetworkConnectionBanner />
 
         {children}
diff --git a/ui/components/multichain/account-picker/account-picker.test.js b/ui/components/multichain/account-picker/account-picker.test.js
index 22eacf81d25d..e4c61126f8b4 100644
--- a/ui/components/multichain/account-picker/account-picker.test.js
+++ b/ui/components/multichain/account-picker/account-picker.test.js
@@ -28,7 +28,7 @@ const render = (props = {}, state = {}) => {
 
 describe('AccountPicker', () => {
   it('renders properly', () => {
-    const { container } = render({}, { useBlockie: true });
+    const { container } = render({});
     expect(container).toMatchSnapshot();
   });
 
diff --git a/ui/components/multichain/activity-v2/activity-list.test.tsx b/ui/components/multichain/activity-v2/activity-list.test.tsx
index c852807d9899..6f9f23ec67dc 100644
--- a/ui/components/multichain/activity-v2/activity-list.test.tsx
+++ b/ui/components/multichain/activity-v2/activity-list.test.tsx
@@ -77,8 +77,8 @@ function createStore({
 } = {}) {
   return configureMockStore()({
     metamask: {
+      selectedAccountGroup: 'entropy:01-group-1',
       accountTree: {
-        selectedAccountGroup: 'entropy:01-group-1',
         wallets: {
           'entropy:01': {
             id: 'entropy:01',
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 25877f3c0cf1..994364509f01 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
@@ -237,7 +237,6 @@ exports[`App Header unlocked state matches snapshot: unlocked 1`] = `
         <div
           class="mm-box mm-box--display-flex mm-box--gap-2"
         >
-           
           <div
             class="mm-box mm-box--display-flex mm-box--justify-content-flex-end mm-box--width-full"
             style="position: relative;"
diff --git a/ui/components/multichain/app-header/app-header-unlocked-content.tsx b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
index 1dc068745118..091a27a09dc4 100644
--- a/ui/components/multichain/app-header/app-header-unlocked-content.tsx
+++ b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
-import browser from 'webextension-polyfill';
 
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -24,31 +23,19 @@ import {
 } from '../../../../shared/constants/metametrics';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { setShowSupportDataConsentModal } from '../../../store/actions';
-import ConnectedStatusIndicator from '../../app/connected-status-indicator';
 import { AccountPicker } from '../account-picker';
 import { GlobalMenuDrawerWithList } from '../global-menu-drawer';
 import {
   getSelectedInternalAccount,
-  getOriginOfCurrentTab,
   getIsDefaultAddressEnabled,
 } from '../../../selectors';
 // TODO: Remove restricted import
 // eslint-disable-next-line import-x/no-restricted-paths
-import { getEnvironmentType } from '../../../../app/scripts/lib/util';
-// TODO: Remove restricted import
-// eslint-disable-next-line import-x/no-restricted-paths
 import { normalizeSafeAddress } from '../../../../app/scripts/lib/multichain/address';
-import {
-  ENVIRONMENT_TYPE_POPUP,
-  ENVIRONMENT_TYPE_SIDEPANEL,
-} from '../../../../shared/constants/app';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { NotificationsTagCounter } from '../notifications-tag-counter';
-import {
-  ACCOUNT_LIST_PAGE_ROUTE,
-  REVIEW_PERMISSIONS,
-} from '../../../helpers/constants/routes';
+import { ACCOUNT_LIST_PAGE_ROUTE } from '../../../helpers/constants/routes';
 import { transitionForward } from '../../ui/transition';
 import VisitSupportDataConsentModal from '../../app/modals/visit-support-data-consent-modal';
 import {
@@ -77,7 +64,6 @@ export const AppHeaderUnlockedContent = ({
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const [searchParams, setSearchParams] = useSearchParams();
-  const origin = useSelector(getOriginOfCurrentTab);
   // Derive from URL so drawer state survives route changes (e.g. homepage mount) without render>close>render flash
   const accountOptionsMenuOpen = searchParams.get('drawerOpen') === 'true';
   const selectedMultichainAccountId = useSelector(getSelectedAccountGroup);
@@ -129,11 +115,6 @@ export const AppHeaderUnlockedContent = ({
     }
   }, [copied, dispatch]);
 
-  const showConnectedStatus =
-    (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ||
-      getEnvironmentType() === ENVIRONMENT_TYPE_SIDEPANEL) &&
-    origin !== browser.runtime.id;
-
   const handleMainMenuToggle = useCallback(() => {
     const isMenuOpen = !accountOptionsMenuOpen;
     if (isMenuOpen) {
@@ -156,10 +137,6 @@ export const AppHeaderUnlockedContent = ({
     });
   }, [accountOptionsMenuOpen, trackEvent, setSearchParams]);
 
-  const handleConnectionsRoute = () => {
-    navigate(`${REVIEW_PERMISSIONS}?origin=${encodeURIComponent(origin)}`);
-  };
-
   const multichainAccountAppContent = useMemo(() => {
     return (
       <BoxDeprecated style={{ overflow: 'hidden' }}>
@@ -257,13 +234,6 @@ export const AppHeaderUnlockedContent = ({
         style={{ marginLeft: 'auto' }}
       >
         <BoxDeprecated display={Display.Flex} gap={2}>
-          {showConnectedStatus && (
-            <BoxDeprecated data-testid="connection-menu" margin="auto">
-              <ConnectedStatusIndicator
-                onClick={() => handleConnectionsRoute()}
-              />
-            </BoxDeprecated>
-          )}{' '}
           <BoxDeprecated
             display={Display.Flex}
             justifyContent={JustifyContent.flexEnd}
diff --git a/ui/components/multichain/app-header/app-header.test.js b/ui/components/multichain/app-header/app-header.test.js
index d233cc0fdf5e..a45abc251abf 100644
--- a/ui/components/multichain/app-header/app-header.test.js
+++ b/ui/components/multichain/app-header/app-header.test.js
@@ -3,19 +3,10 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import configureStore from '../../../store/store';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import mockState from '../../../../test/data/mock-state.json';
-// TODO: Remove restricted import
-// eslint-disable-next-line import-x/no-restricted-paths
-import { getEnvironmentType } from '../../../../app/scripts/lib/util';
-import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import { openWindow } from '../../../helpers/utils/window';
 import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
 import { AppHeader } from '.';
 
-jest.mock('../../../../app/scripts/lib/util', () => ({
-  ...jest.requireActual('../../../../app/scripts/lib/util'),
-  getEnvironmentType: jest.fn(),
-}));
-
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   // eslint-disable-next-line react/prop-types
@@ -92,15 +83,6 @@ describe('App Header', () => {
       });
     });
 
-    it('can open the dapp connection', () => {
-      getEnvironmentType.mockReturnValue(ENVIRONMENT_TYPE_POPUP);
-      const { container } = render();
-      const connectionPickerButton = container.querySelector(
-        '[data-testid="connection-menu"]',
-      );
-      expect(connectionPickerButton).toBeInTheDocument();
-    });
-
     describe('Drawer support button', () => {
       beforeEach(async () => {
         const { container } = render();
@@ -194,15 +176,5 @@ describe('App Header', () => {
       );
       expect(settingsButton).not.toBeInTheDocument();
     });
-
-    it('does not show dapp connection', () => {
-      const { container } = render({
-        isUnlocked: false,
-      });
-      const connectionPickerButton = container.querySelector(
-        '[data-testid="connection-menu"]',
-      );
-      expect(connectionPickerButton).not.toBeInTheDocument();
-    });
   });
 });
diff --git a/ui/components/multichain/badge-status/badge-status.test.js b/ui/components/multichain/badge-status/badge-status.test.js
index 146f70e123d3..38cddf528c39 100644
--- a/ui/components/multichain/badge-status/badge-status.test.js
+++ b/ui/components/multichain/badge-status/badge-status.test.js
@@ -30,17 +30,14 @@ describe('Badge Status', () => {
     );
   };
   it('should render correctly', () => {
-    const { container } = render({}, { useBlockie: true });
+    const { container } = render({});
     expect(container).toMatchSnapshot();
     const badge = container.querySelector('.multichain-badge-status__badge');
     expect(badge).toBeInTheDocument();
   });
 
   it('should not render the badge if showConnectedStatus is false', () => {
-    const { container } = render(
-      { showConnectedStatus: false },
-      { useBlockie: true },
-    );
+    const { container } = render({ showConnectedStatus: false });
     expect(container).toMatchSnapshot();
     const badge = container.querySelector('.multichain-badge-status__badge');
     expect(badge).not.toBeInTheDocument();
diff --git a/ui/components/multichain/connected-site-menu/connected-site-menu.js b/ui/components/multichain/connected-site-menu/connected-site-menu.js
index c6f684bfe64a..f90f624f30ef 100644
--- a/ui/components/multichain/connected-site-menu/connected-site-menu.js
+++ b/ui/components/multichain/connected-site-menu/connected-site-menu.js
@@ -1,117 +1,38 @@
-import React, { useState, useRef } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'clsx';
-import { useSelector } from 'react-redux';
 import {
   AlignItems,
   BackgroundColor,
-  BorderColor,
   BorderRadius,
   Display,
   IconColor,
   JustifyContent,
-  Size,
 } from '../../../helpers/constants/design-system';
-import {
-  AvatarFavicon,
-  AvatarNetwork,
-  AvatarNetworkSize,
-  BadgeWrapper,
-  Box,
-  Icon,
-  IconName,
-  IconSize,
-} from '../../component-library';
-import {
-  getAllPermittedAccounts,
-  getOriginOfCurrentTab,
-  getSubjectMetadata,
-} from '../../../selectors';
-import { getDappActiveNetwork } from '../../../selectors/dapp';
-import { ConnectedSitePopover } from '../connected-site-popover';
-import { STATUS_CONNECTED } from '../../../helpers/constants/connected-sites';
-import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
-
-export const ConnectedSiteMenu = ({ className, disabled, onClick, status }) => {
-  const [showPopover, setShowPopover] = useState(false);
-
-  const referenceElement = useRef(null);
-
-  const subjectMetadata = useSelector(getSubjectMetadata);
-  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
-  const permittedAccountsByOrigin = useSelector((state) =>
-    getAllPermittedAccounts(state, activeTabOrigin),
-  );
-  const dappActiveNetwork = useSelector(getDappActiveNetwork);
-  const currentTabHasNoAccounts = !permittedAccountsByOrigin?.length;
-  const connectedSubjectsMetadata = subjectMetadata[activeTabOrigin];
-
-  // Get network image URL for the badge
-  const getNetworkImageSrc = () => {
-    if (dappActiveNetwork?.chainId) {
-      return CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[dappActiveNetwork.chainId];
-    }
-    return undefined;
-  };
+import { Box, Icon, IconName, IconSize } from '../../component-library';
 
-  const iconElement = currentTabHasNoAccounts ? (
-    <Icon
-      name={IconName.Global}
-      size={IconSize.Lg}
-      color={IconColor.iconDefault}
-    />
-  ) : (
-    <BadgeWrapper
-      badge={
-        dappActiveNetwork && (
-          <AvatarNetwork
-            size={AvatarNetworkSize.Xs}
-            name={dappActiveNetwork.name || dappActiveNetwork.nickname}
-            src={getNetworkImageSrc()}
-            backgroundColor={BackgroundColor.backgroundSection}
-            borderWidth={2}
-            borderColor={BorderColor.backgroundDefault}
-          />
-        )
-      }
-    >
-      <AvatarFavicon
-        name={connectedSubjectsMetadata?.name}
-        size={Size.SM}
-        src={connectedSubjectsMetadata?.iconUrl}
-      />
-    </BadgeWrapper>
-  );
+export const ConnectedSiteMenu = ({ className, disabled, onClick }) => {
   return (
-    <>
-      <Box
-        className={classNames(
-          `multichain-connected-site-menu${disabled ? '--disabled' : ''}`,
-          className,
-        )}
-        data-testid="connection-menu"
-        as="button"
-        display={Display.Flex}
-        alignItems={AlignItems.center}
-        justifyContent={JustifyContent.center}
-        backgroundColor={BackgroundColor.backgroundDefault}
-        ref={referenceElement}
-        onClick={() => setShowPopover(true)}
-        borderRadius={BorderRadius.LG}
-      >
-        <>{iconElement}</>
-      </Box>
-      {showPopover && (
-        <ConnectedSitePopover
-          referenceElement={referenceElement}
-          isOpen={showPopover}
-          isConnected={status === STATUS_CONNECTED}
-          onClick={onClick}
-          onClose={() => setShowPopover(false)}
-          connectedOrigin={activeTabOrigin}
-        />
+    <Box
+      className={classNames(
+        `multichain-connected-site-menu${disabled ? '--disabled' : ''}`,
+        className,
       )}
-    </>
+      data-testid="connection-menu"
+      as="button"
+      display={Display.Flex}
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.center}
+      backgroundColor={BackgroundColor.backgroundDefault}
+      onClick={onClick}
+      borderRadius={BorderRadius.LG}
+    >
+      <Icon
+        name={IconName.Global}
+        size={IconSize.Lg}
+        color={IconColor.iconDefault}
+      />
+    </Box>
   );
 };
 
@@ -128,8 +49,4 @@ ConnectedSiteMenu.propTypes = {
    *  Disable the connected site menu if the account is non-evm
    */
   disabled: PropTypes.bool,
-  /**
-   * The status of the connected site menu
-   */
-  status: PropTypes.string,
 };
diff --git a/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.test.tsx b/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.test.tsx
new file mode 100644
index 000000000000..e1c02c03621c
--- /dev/null
+++ b/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.test.tsx
@@ -0,0 +1,339 @@
+import React from 'react';
+import { fireEvent, waitFor } from '@testing-library/react';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { DappConnectionControlBar } from './dapp-connection-control-bar';
+
+const mockNavigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
+
+const mockRemovePermissionsFor = jest.fn(
+  (_subjects: Record<string, string[]>) => () => Promise.resolve(),
+);
+const mockHidePermittedNetworkToast = jest.fn(() => ({
+  type: 'SHOW_PERMITTED_NETWORK_TOAST_CLOSE',
+}));
+jest.mock('../../../store/actions', () => ({
+  ...jest.requireActual('../../../store/actions'),
+  removePermissionsFor: (subjects: Record<string, string[]>) =>
+    mockRemovePermissionsFor(subjects),
+  hidePermittedNetworkToast: () => mockHidePermittedNetworkToast(),
+}));
+
+const ACCOUNT_1_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+const ACCOUNT_1_ID = 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3';
+const ACCOUNT_2_ADDRESS = '0xeb9e64b93097bc15f01f13eae97015c57ab64823';
+const ACCOUNT_2_ID = '784225f4-d30b-4e77-a900-c8bbce735b88';
+const GROUP_1_ID = 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0';
+const LEDGER_GROUP_ID =
+  'keyring:Ledger Hardware/0xc42edfcc21ed14dda456aa0756c153f7985d8813';
+const DAPP_ORIGIN = 'https://metamask.github.io';
+
+const sharedMetamaskOverrides = {
+  completedOnboarding: true,
+  domains: {
+    [DAPP_ORIGIN]: 'sepolia-test-client',
+  },
+  networkConfigurationsByChainId: {
+    ...mockState.metamask.networkConfigurationsByChainId,
+    '0xaa36a7': {
+      chainId: '0xaa36a7',
+      name: 'Sepolia',
+      nativeCurrency: 'ETH',
+      rpcEndpoints: [
+        {
+          type: 'custom',
+          url: 'https://sepolia.test',
+          networkClientId: 'sepolia-test-client',
+        },
+      ],
+      defaultRpcEndpointIndex: 0,
+    },
+  },
+  selectedMultichainNetworkChainId: 'eip155:11155111',
+  isEvmSelected: true,
+  selectedNetworkClientId: 'sepolia-test-client',
+  multichainNetworkConfigurationsByChainId: {
+    ...mockState.metamask.multichainNetworkConfigurationsByChainId,
+    'eip155:11155111': {
+      chainId: 'eip155:11155111',
+      name: 'Sepolia',
+      nativeCurrency: 'ETH',
+      isEvm: true,
+    },
+  },
+  subjectMetadata: {
+    ...mockState.metamask.subjectMetadata,
+    [DAPP_ORIGIN]: {
+      name: 'E2E Test Dapp',
+      iconUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+      subjectType: 'website',
+      origin: DAPP_ORIGIN,
+    },
+  },
+};
+
+const activeTab = {
+  id: 113,
+  title: 'E2E Test Dapp',
+  origin: DAPP_ORIGIN,
+  protocol: 'https:',
+  url: 'https://metamask.github.io/test-dapp/',
+};
+
+const makeCaip25Permission = (accounts: string[]) => ({
+  'endowment:caip25': {
+    parentCapability: 'endowment:caip25',
+    caveats: [
+      {
+        type: 'authorizedScopes',
+        value: {
+          requiredScopes: {},
+          optionalScopes: {
+            'eip155:0': { accounts },
+          },
+          isMultichainOrigin: false,
+        },
+      },
+    ],
+  },
+});
+
+const connectedMockState = {
+  metamask: {
+    ...mockState.metamask,
+    ...sharedMetamaskOverrides,
+    accountTree: {
+      ...mockState.metamask.accountTree,
+      selectedAccountGroup: GROUP_1_ID,
+    },
+    internalAccounts: {
+      ...mockState.metamask.internalAccounts,
+      accounts: {
+        ...mockState.metamask.internalAccounts.accounts,
+        [ACCOUNT_1_ID]: {
+          ...mockState.metamask.internalAccounts.accounts[ACCOUNT_1_ID],
+          metadata: {
+            ...mockState.metamask.internalAccounts.accounts[ACCOUNT_1_ID]
+              .metadata,
+            lastSelected: 1000,
+          },
+        },
+      },
+      selectedAccount: ACCOUNT_1_ID,
+    },
+    subjects: {
+      [DAPP_ORIGIN]: {
+        permissions: makeCaip25Permission([`eip155:0:${ACCOUNT_1_ADDRESS}`]),
+      },
+    },
+  },
+  activeTab,
+};
+
+const disconnectedMockState = {
+  metamask: {
+    ...mockState.metamask,
+    ...sharedMetamaskOverrides,
+    subjects: {},
+  },
+  activeTab,
+};
+
+describe('DappConnectionControlBar', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when connected to a dapp', () => {
+    const renderConnected = () => {
+      const store = configureStore(connectedMockState);
+      return renderWithProvider(<DappConnectionControlBar />, store);
+    };
+
+    it('renders the control bar', () => {
+      const { getByTestId } = renderConnected();
+      expect(getByTestId('dapp-connection-control-bar')).toBeInTheDocument();
+    });
+
+    it('displays the site origin', () => {
+      const { getByText } = renderConnected();
+      expect(getByText('metamask.github.io')).toBeInTheDocument();
+    });
+
+    it('displays the dapp favicon', () => {
+      const { getByTestId } = renderConnected();
+      expect(
+        getByTestId('dapp-connection-control-bar__favicon'),
+      ).toBeInTheDocument();
+    });
+
+    it('displays the green connection dot on the favicon', () => {
+      const { getByTestId } = renderConnected();
+      expect(
+        getByTestId('dapp-connection-control-bar__connection-dot'),
+      ).toBeInTheDocument();
+    });
+
+    it('displays the network button', () => {
+      const { getByTestId } = renderConnected();
+      expect(
+        getByTestId('dapp-connection-control-bar__network-button'),
+      ).toBeInTheDocument();
+    });
+
+    it('displays the permissions button', () => {
+      const { getByTestId } = renderConnected();
+      expect(
+        getByTestId('dapp-connection-control-bar__permissions-button'),
+      ).toBeInTheDocument();
+    });
+
+    it('displays the disconnect button', () => {
+      const { getByTestId } = renderConnected();
+      expect(
+        getByTestId('dapp-connection-control-bar__disconnect-button'),
+      ).toBeInTheDocument();
+    });
+
+    it('navigates to permissions page when permissions button is clicked', () => {
+      const { getByTestId } = renderConnected();
+      fireEvent.click(
+        getByTestId('dapp-connection-control-bar__permissions-button'),
+      );
+      expect(mockNavigate).toHaveBeenCalledWith(
+        '/review-permissions?origin=https%3A%2F%2Fmetamask.github.io',
+      );
+    });
+
+    it('opens disconnect modal when disconnect button is clicked', () => {
+      const { getByTestId } = renderConnected();
+      fireEvent.click(
+        getByTestId('dapp-connection-control-bar__disconnect-button'),
+      );
+      expect(getByTestId('disconnect-all-modal')).toBeInTheDocument();
+    });
+
+    it('displays the account label', () => {
+      const { getByTestId } = renderConnected();
+      const accountEl = getByTestId(
+        'dapp-connection-control-bar__account-name',
+      );
+      expect(accountEl).toBeInTheDocument();
+      expect(accountEl.textContent).toContain('Account 1');
+    });
+
+    it('dispatches removePermissionsFor when disconnect is confirmed', async () => {
+      const { getByTestId, queryByTestId } = renderConnected();
+      fireEvent.click(
+        getByTestId('dapp-connection-control-bar__disconnect-button'),
+      );
+      fireEvent.click(getByTestId('disconnect-all'));
+      await waitFor(() => {
+        expect(mockRemovePermissionsFor).toHaveBeenCalledWith({
+          [DAPP_ORIGIN]: ['endowment:caip25'],
+        });
+        expect(mockHidePermittedNetworkToast).toHaveBeenCalled();
+        expect(queryByTestId('disconnect-all-modal')).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when an unconnected account group is selected', () => {
+    it('falls back to the most recently selected connected account', () => {
+      const state = {
+        metamask: {
+          ...mockState.metamask,
+          ...sharedMetamaskOverrides,
+          accountTree: {
+            ...mockState.metamask.accountTree,
+            selectedAccountGroup: LEDGER_GROUP_ID,
+          },
+          internalAccounts: {
+            ...mockState.metamask.internalAccounts,
+            accounts: {
+              ...mockState.metamask.internalAccounts.accounts,
+              [ACCOUNT_1_ID]: {
+                ...mockState.metamask.internalAccounts.accounts[ACCOUNT_1_ID],
+                metadata: {
+                  ...mockState.metamask.internalAccounts.accounts[ACCOUNT_1_ID]
+                    .metadata,
+                  lastSelected: 2000,
+                },
+              },
+              [ACCOUNT_2_ID]: {
+                ...mockState.metamask.internalAccounts.accounts[ACCOUNT_2_ID],
+                metadata: {
+                  ...mockState.metamask.internalAccounts.accounts[ACCOUNT_2_ID]
+                    .metadata,
+                  lastSelected: 1000,
+                },
+              },
+            },
+            selectedAccount: ACCOUNT_2_ID,
+          },
+          subjects: {
+            [DAPP_ORIGIN]: {
+              permissions: makeCaip25Permission([
+                `eip155:0:${ACCOUNT_1_ADDRESS}`,
+                `eip155:0:${ACCOUNT_2_ADDRESS}`,
+              ]),
+            },
+          },
+        },
+        activeTab,
+      };
+      const store = configureStore(state);
+      const { getByTestId } = renderWithProvider(
+        <DappConnectionControlBar />,
+        store,
+      );
+      const accountEl = getByTestId(
+        'dapp-connection-control-bar__account-name',
+      );
+      expect(accountEl.textContent).toContain('Account 1');
+    });
+  });
+
+  describe('when not connected to a dapp', () => {
+    it('does not render the control bar', () => {
+      const store = configureStore(disconnectedMockState);
+      const { queryByTestId } = renderWithProvider(
+        <DappConnectionControlBar />,
+        store,
+      );
+      expect(
+        queryByTestId('dapp-connection-control-bar'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not render when activeTabOrigin is empty', () => {
+      const state = {
+        metamask: {
+          ...mockState.metamask,
+          ...sharedMetamaskOverrides,
+          subjects: {
+            [DAPP_ORIGIN]: {
+              permissions: makeCaip25Permission([
+                `eip155:0:${ACCOUNT_1_ADDRESS}`,
+              ]),
+            },
+          },
+        },
+        activeTab: { ...activeTab, origin: '' },
+      };
+      const store = configureStore(state);
+      const { queryByTestId } = renderWithProvider(
+        <DappConnectionControlBar />,
+        store,
+      );
+      expect(
+        queryByTestId('dapp-connection-control-bar'),
+      ).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.tsx b/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.tsx
new file mode 100644
index 000000000000..b1f2b24349b6
--- /dev/null
+++ b/ui/components/multichain/dapp-connection-control-bar/dapp-connection-control-bar.tsx
@@ -0,0 +1,369 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+import { NonEmptyArray, parseCaipAccountId } from '@metamask/utils';
+import { isInternalAccountInPermittedAccountIds } from '@metamask/chain-agnostic-permission';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import {
+  AvatarFavicon,
+  AvatarFaviconSize,
+  AvatarNetwork,
+  AvatarNetworkSize,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  getAllPermittedAccountsForCurrentTab,
+  getOriginOfCurrentTab,
+  getPermissionSubjects,
+  getSubjectMetadata,
+} from '../../../selectors';
+import {
+  getAccountGroupsByAddress,
+  getInternalAccountsFromGroupById,
+  getSelectedAccountGroup,
+} from '../../../selectors/multichain-accounts/account-tree';
+import { getDappActiveNetwork } from '../../../selectors/dapp';
+import {
+  hidePermittedNetworkToast,
+  removePermissionsFor,
+  toggleNetworkMenu,
+} from '../../../store/actions';
+import { REVIEW_PERMISSIONS } from '../../../helpers/constants/routes';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
+import { getURLHost } from '../../../helpers/utils/util';
+import { DisconnectAllModal } from '../disconnect-all-modal/disconnect-all-modal';
+
+/**
+ * DappConnectionControlBar - A contextual bar shown only during active dapp
+ * connections. Rendered at the bottom of the wallet screen.
+ *
+ * Layout (single row):
+ * [Favicon+dot] [Origin / Account] ... [Network ↓] [Settings | Disconnect]
+ */
+const EMPTY_ACCOUNT_GROUPS: never[] = [];
+
+export const DappConnectionControlBar: React.FC = () => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  const [showDisconnectModal, setShowDisconnectModal] = useState(false);
+
+  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
+  const subjectMetadata = useSelector(getSubjectMetadata);
+  const permittedAccounts = useSelector(getAllPermittedAccountsForCurrentTab);
+  const subjects = useSelector(getPermissionSubjects) as Record<
+    string,
+    { permissions: Record<string, { parentCapability: string }> }
+  >;
+  const dappActiveNetwork = useSelector(getDappActiveNetwork);
+  const selectedAccountGroupId = useSelector(getSelectedAccountGroup);
+  const accountGroupInternalAccounts = useSelector((state) =>
+    getInternalAccountsFromGroupById(
+      state as Parameters<typeof getInternalAccountsFromGroupById>[0],
+      selectedAccountGroupId,
+    ),
+  );
+
+  const allPermittedAddresses = useMemo(() => {
+    return permittedAccounts
+      .map((caipId) => {
+        try {
+          return parseCaipAccountId(caipId).address;
+        } catch {
+          return undefined;
+        }
+      })
+      .filter((addr): addr is string => Boolean(addr));
+  }, [permittedAccounts]);
+
+  const allPermittedAccountGroups = useSelector((state) =>
+    allPermittedAddresses.length > 0
+      ? getAccountGroupsByAddress(
+          state as Parameters<typeof getAccountGroupsByAddress>[0],
+          allPermittedAddresses,
+        )
+      : EMPTY_ACCOUNT_GROUPS,
+  );
+
+  const activePermittedAddress = useMemo(() => {
+    if (permittedAccounts.length === 0) {
+      return undefined;
+    }
+    if (accountGroupInternalAccounts?.length) {
+      const matchingAccount = accountGroupInternalAccounts.find((account) =>
+        isInternalAccountInPermittedAccountIds(account, permittedAccounts),
+      );
+      if (matchingAccount) {
+        return matchingAccount.address;
+      }
+    }
+    // Current account group is not connected — find the most recently
+    // selected permitted account across all connected account groups.
+    let mostRecent: { address: string; lastSelected: number } | undefined;
+    for (const group of allPermittedAccountGroups) {
+      for (const account of group.accounts) {
+        if (
+          isInternalAccountInPermittedAccountIds(account, permittedAccounts)
+        ) {
+          const ts = account.metadata.lastSelected ?? 0;
+          if (!mostRecent || ts > mostRecent.lastSelected) {
+            mostRecent = { address: account.address, lastSelected: ts };
+          }
+        }
+      }
+    }
+    return mostRecent?.address ?? allPermittedAddresses[0];
+  }, [
+    permittedAccounts,
+    accountGroupInternalAccounts,
+    allPermittedAccountGroups,
+    allPermittedAddresses,
+  ]);
+
+  const connectedAccountGroups = useMemo(() => {
+    if (!activePermittedAddress) {
+      return [];
+    }
+    return allPermittedAccountGroups.filter((group) =>
+      group.accounts.some((account) =>
+        isEvmAccountType(account.type)
+          ? account.address.toLowerCase() ===
+            activePermittedAddress.toLowerCase()
+          : account.address === activePermittedAddress,
+      ),
+    );
+  }, [activePermittedAddress, allPermittedAccountGroups]);
+
+  const isConnected = permittedAccounts.length > 0;
+
+  const selectedAccountName =
+    connectedAccountGroups.length > 0
+      ? connectedAccountGroups[0].metadata.name
+      : '';
+
+  const connectedSubjectsMetadata = activeTabOrigin
+    ? subjectMetadata[activeTabOrigin]
+    : undefined;
+
+  const siteName = useMemo(() => {
+    if (!activeTabOrigin) {
+      return '';
+    }
+    const isWebOrigin =
+      activeTabOrigin.startsWith('http://') ||
+      activeTabOrigin.startsWith('https://');
+    const siteHost = isWebOrigin ? getURLHost(activeTabOrigin) : '';
+    return siteHost || connectedSubjectsMetadata?.name || activeTabOrigin;
+  }, [activeTabOrigin, connectedSubjectsMetadata?.name]);
+
+  const networkImageSrc = dappActiveNetwork?.chainId
+    ? CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+        dappActiveNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+      ]
+    : undefined;
+
+  const handleNetworkClick = useCallback(() => {
+    dispatch(
+      toggleNetworkMenu({
+        isAccessedFromDappConnectedSitePopover: true,
+        isAddingNewNetwork: false,
+        isMultiRpcOnboarding: false,
+      }),
+    );
+  }, [dispatch]);
+
+  const handlePermissionsClick = useCallback(() => {
+    if (activeTabOrigin) {
+      navigate(
+        `${REVIEW_PERMISSIONS}?origin=${encodeURIComponent(activeTabOrigin)}`,
+      );
+    }
+  }, [navigate, activeTabOrigin]);
+
+  const handleDisconnect = useCallback(() => {
+    if (!activeTabOrigin) {
+      return;
+    }
+    const subject = subjects[activeTabOrigin];
+    if (subject) {
+      const permissionMethodNames = Object.values(subject.permissions).map(
+        (permission) => permission.parentCapability,
+      );
+      if (permissionMethodNames.length > 0) {
+        const permissionsRecord = {
+          [activeTabOrigin]: permissionMethodNames as NonEmptyArray<string>,
+        };
+        dispatch(removePermissionsFor(permissionsRecord));
+      }
+    }
+    dispatch(hidePermittedNetworkToast());
+    setShowDisconnectModal(false);
+  }, [dispatch, subjects, activeTabOrigin]);
+
+  const handleDisconnectClick = useCallback(() => {
+    setShowDisconnectModal(true);
+  }, []);
+
+  const handleCloseDisconnectModal = useCallback(() => {
+    setShowDisconnectModal(false);
+  }, []);
+
+  if (!isConnected || !activeTabOrigin) {
+    return null;
+  }
+
+  return (
+    <>
+      <Box
+        className="dapp-connection-control-bar w-full"
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.End}
+        padding={3}
+        paddingLeft={4}
+        paddingRight={4}
+        gap={2}
+        data-testid="dapp-connection-control-bar"
+      >
+        {/* Left side: Favicon with green dot + Identity */}
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.End}
+          gap={2}
+          className="dapp-connection-control-bar__left-group"
+        >
+          {/* Favicon with connection dot overlay */}
+          <Box className="dapp-connection-control-bar__favicon-wrapper">
+            <AvatarFavicon
+              name={connectedSubjectsMetadata?.name}
+              size={AvatarFaviconSize.Md}
+              src={connectedSubjectsMetadata?.iconUrl}
+              data-testid="dapp-connection-control-bar__favicon"
+            />
+            <Box
+              className="dapp-connection-control-bar__connection-dot"
+              data-testid="dapp-connection-control-bar__connection-dot"
+            />
+          </Box>
+
+          {/* Origin + Account stacked */}
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            className="dapp-connection-control-bar__identity"
+          >
+            <Text
+              variant={TextVariant.BodySm}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextDefault}
+              ellipsis
+            >
+              {siteName}
+            </Text>
+            {selectedAccountName && (
+              <Text
+                variant={TextVariant.BodyXs}
+                color={TextColor.TextAlternative}
+                ellipsis
+                data-testid="dapp-connection-control-bar__account-name"
+              >
+                {selectedAccountName}
+              </Text>
+            )}
+          </Box>
+        </Box>
+
+        {/* Right side: Network selector + Combined action icons */}
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.End}
+          gap={2}
+          className="ml-auto"
+        >
+          {/* Network selector (icon-only, same size as action icons) */}
+          {dappActiveNetwork && (
+            <button
+              className="dapp-connection-control-bar__network-button flex items-center gap-1"
+              onClick={handleNetworkClick}
+              data-testid="dapp-connection-control-bar__network-button"
+              type="button"
+            >
+              <AvatarNetwork
+                className="dapp-connection-control-bar__network-icon"
+                size={AvatarNetworkSize.Xs}
+                name={
+                  (dappActiveNetwork as { name?: string })?.name ??
+                  (dappActiveNetwork as { nickname?: string })?.nickname ??
+                  ''
+                }
+                src={networkImageSrc}
+              />
+              <Icon
+                name={IconName.ArrowDown}
+                size={IconSize.Xs}
+                color={IconColor.IconDefault}
+              />
+            </button>
+          )}
+
+          {/* Combined settings + disconnect container */}
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.End}
+            className="dapp-connection-control-bar__combined-actions"
+          >
+            {/* Permissions button */}
+            <button
+              className="dapp-connection-control-bar__action-button flex items-center"
+              onClick={handlePermissionsClick}
+              data-testid="dapp-connection-control-bar__permissions-button"
+              aria-label={t('managePermissions')}
+              type="button"
+            >
+              <Icon
+                name={IconName.Setting}
+                size={IconSize.Sm}
+                color={IconColor.IconDefault}
+              />
+            </button>
+
+            {/* Vertical divider */}
+            <Box className="dapp-connection-control-bar__divider" />
+
+            {/* Disconnect button */}
+            <button
+              className="dapp-connection-control-bar__action-button flex items-center"
+              onClick={handleDisconnectClick}
+              data-testid="dapp-connection-control-bar__disconnect-button"
+              aria-label={t('disconnect')}
+              type="button"
+            >
+              <Icon
+                name={IconName.Logout}
+                size={IconSize.Sm}
+                color={IconColor.ErrorDefault}
+              />
+            </button>
+          </Box>
+        </Box>
+      </Box>
+
+      {/* Disconnect confirmation modal */}
+      {showDisconnectModal && (
+        <DisconnectAllModal
+          onClose={handleCloseDisconnectModal}
+          onClick={handleDisconnect}
+        />
+      )}
+    </>
+  );
+};
diff --git a/ui/components/multichain/dapp-connection-control-bar/index.scss b/ui/components/multichain/dapp-connection-control-bar/index.scss
new file mode 100644
index 000000000000..71313974ecfe
--- /dev/null
+++ b/ui/components/multichain/dapp-connection-control-bar/index.scss
@@ -0,0 +1,92 @@
+.dapp-connection-control-bar {
+  flex-shrink: 0;
+  background-color: var(--color-background-default);
+  border-top: 1px solid var(--color-border-muted);
+
+  &__left-group {
+    min-width: 0; // allow truncation
+  }
+
+  &__identity {
+    min-width: 0;
+    flex: 1 1 0;
+    padding-bottom: 2px;
+  }
+
+  &__favicon-wrapper {
+    position: relative;
+    flex-shrink: 0;
+  }
+
+  &__connection-dot {
+    position: absolute;
+    bottom: 5px;
+    right: 0;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: var(--color-success-default);
+    border: 2px solid var(--color-background-default);
+  }
+
+  &__network-button {
+    cursor: pointer;
+    border: 1px solid var(--color-border-muted);
+    border-radius: 12px;
+    background-color: var(--color-background-muted);
+    height: 36px;
+    flex-shrink: 0;
+    justify-content: center;
+    padding-left: 9px;
+    padding-right: 9px;
+    margin-bottom: 4px;
+
+    &:hover {
+      background-color: var(--color-background-hover);
+    }
+
+    > * {
+      border: none !important;
+      box-shadow: none;
+      background-color: transparent !important;
+    }
+  }
+
+  &__network-icon {
+    width: 1.25rem !important;
+    height: 1.25rem !important;
+    border-radius: 0.375rem !important;
+  }
+
+  &__combined-actions {
+    border: 1px solid var(--color-border-muted);
+    border-radius: 12px;
+    background-color: var(--color-background-muted);
+    height: 36px;
+    flex-shrink: 0;
+    margin-bottom: 4px;
+  }
+
+  &__action-button {
+    cursor: pointer;
+    background: none;
+    border: none;
+    height: 100%;
+    width: 34px;
+    justify-content: center;
+    flex-shrink: 0;
+    border-radius: 12px;
+
+    &:hover {
+      background-color: var(--color-background-hover);
+    }
+  }
+
+  &__divider {
+    width: 1px;
+    height: 18px;
+    margin-bottom: 8px;
+    background-color: var(--color-border-muted);
+    flex-shrink: 0;
+  }
+}
diff --git a/ui/components/multichain/dapp-connection-control-bar/index.ts b/ui/components/multichain/dapp-connection-control-bar/index.ts
new file mode 100644
index 000000000000..cd9bd959c89d
--- /dev/null
+++ b/ui/components/multichain/dapp-connection-control-bar/index.ts
@@ -0,0 +1 @@
+export { DappConnectionControlBar } from './dapp-connection-control-bar';
diff --git a/ui/components/multichain/global-menu-drawer/useGlobalMenuSections.tsx b/ui/components/multichain/global-menu-drawer/useGlobalMenuSections.tsx
index 504a114b6ce5..4e781ef48285 100644
--- a/ui/components/multichain/global-menu-drawer/useGlobalMenuSections.tsx
+++ b/ui/components/multichain/global-menu-drawer/useGlobalMenuSections.tsx
@@ -445,7 +445,7 @@ export function useGlobalMenuSections(
           id: 'global-menu-settings',
           iconName: IconName.Setting,
           label: t('settings'),
-          to: SETTINGS_ROUTE,
+          to: `${SETTINGS_ROUTE}?drawerOpen=true`,
           onClick: () => {
             trackEvent({
               category: MetaMetricsEventCategory.Navigation,
diff --git a/ui/components/multichain/multi-srp/srp-list/srp-list.test.tsx b/ui/components/multichain/multi-srp/srp-list/srp-list.test.tsx
index 65e574b47c44..1bab9cc597e8 100644
--- a/ui/components/multichain/multi-srp/srp-list/srp-list.test.tsx
+++ b/ui/components/multichain/multi-srp/srp-list/srp-list.test.tsx
@@ -53,6 +53,7 @@ const mockSecondWallet = {
         entropy: { groupIndex: 0 },
         hidden: false,
         pinned: false,
+        lastSelected: 0,
       },
     },
   },
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index 12ab2fd88c20..693708064837 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -15,6 +15,7 @@
 @import 'activity-list-item';
 @import 'app-header';
 @import 'connected-site-menu';
+@import 'dapp-connection-control-bar';
 @import 'dropdown-editor';
 @import "edit-accounts-modal";
 @import "edit-networks-modal";
diff --git a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.tsx.snap b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.tsx.snap
index ea55244f7130..823cd1c9fecb 100644
--- a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.tsx.snap
+++ b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.tsx.snap
@@ -905,6 +905,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       />
                     </div>
                     <input
+                      data-testid="network-menu-show-test-networks"
                       style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                       type="checkbox"
                       value="false"
@@ -2132,6 +2133,7 @@ exports[`NetworkListMenu should match snapshot when editing a network 1`] = `
                       />
                     </div>
                     <input
+                      data-testid="network-menu-show-test-networks"
                       style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                       type="checkbox"
                       value="false"
diff --git a/ui/components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover.tsx b/ui/components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover.tsx
index 520394fb8e03..8df8efc52c98 100644
--- a/ui/components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover.tsx
+++ b/ui/components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover.tsx
@@ -1,13 +1,18 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { ApprovalType } from '@metamask/controller-utils';
 import { ORIGIN_METAMASK } from '@metamask/approval-controller';
 import Popover from '../../../ui/popover';
 import ConfirmationPage from '../../../../pages/confirmations/confirmation/confirmation';
 import { getUnapprovedConfirmations } from '../../../../selectors';
+import { useBoolean } from '../../../../hooks/useBoolean';
 
 const NetworkConfirmationPopover = () => {
-  const [showPopover, setShowPopover] = useState(false);
+  const {
+    value: isOpen,
+    setTrue: openPopover,
+    setFalse: closePopover,
+  } = useBoolean();
 
   const unapprovedConfirmations = useSelector(getUnapprovedConfirmations);
 
@@ -19,14 +24,14 @@ const NetworkConfirmationPopover = () => {
           confirmation.type === ApprovalType.AddEthereumChain,
       );
 
-    if (!showPopover && anAddNetworkConfirmationFromMetaMaskExists) {
-      setShowPopover(true);
-    } else if (showPopover && !anAddNetworkConfirmationFromMetaMaskExists) {
-      setShowPopover(false);
+    if (!isOpen && anAddNetworkConfirmationFromMetaMaskExists) {
+      openPopover();
+    } else if (isOpen && !anAddNetworkConfirmationFromMetaMaskExists) {
+      closePopover();
     }
-  }, [unapprovedConfirmations, showPopover]);
+  }, [closePopover, openPopover, isOpen, unapprovedConfirmations]);
 
-  if (!showPopover) {
+  if (!isOpen) {
     return null;
   }
 
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.tsx b/ui/components/multichain/network-list-menu/network-list-menu.tsx
index 863fe413d35c..edb059c268ed 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.tsx
+++ b/ui/components/multichain/network-list-menu/network-list-menu.tsx
@@ -716,6 +716,7 @@ export const NetworkListMenu = ({ onClose }: NetworkListMenuProps) => {
                     {t('showTestnetNetworks')}
                   </Text>
                   <ToggleButton
+                    dataTestId="network-menu-show-test-networks"
                     value={showTestnets || currentlyOnTestnet}
                     disabled={currentlyOnTestnet}
                     onToggle={(value: boolean) => {
diff --git a/ui/components/multichain/network-list-menu/popular-network-list/popular-network-list.tsx b/ui/components/multichain/network-list-menu/popular-network-list/popular-network-list.tsx
index c07bdb7cb07a..4b72c27ea6ca 100644
--- a/ui/components/multichain/network-list-menu/popular-network-list/popular-network-list.tsx
+++ b/ui/components/multichain/network-list-menu/popular-network-list/popular-network-list.tsx
@@ -40,6 +40,7 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
+import { useBoolean } from '../../../../hooks/useBoolean';
 
 const PopularNetworkList = ({
   searchAddNetworkResults,
@@ -49,15 +50,7 @@ const PopularNetworkList = ({
   const t = useI18nContext();
   const isPopUp = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
   const dispatch = useDispatch();
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleMouseEnter = () => {
-    setIsOpen(true);
-  };
-
-  const handleMouseLeave = () => {
-    setIsOpen(false);
-  };
+  const { value: isOpen, setTrue: open, setFalse: close } = useBoolean();
 
   const [referenceElement, setReferenceElement] = useState();
 
@@ -88,7 +81,7 @@ const PopularNetworkList = ({
           <Box
             display={Display.Flex}
             alignItems={AlignItems.center}
-            onMouseEnter={handleMouseEnter}
+            onMouseEnter={open}
           >
             <Box marginLeft={2} display={Display.Flex}>
               <Icon
@@ -107,7 +100,7 @@ const PopularNetworkList = ({
               isOpen={isOpen}
               flip
               backgroundColor={BackgroundColor.backgroundSection}
-              onMouseLeave={handleMouseLeave}
+              onMouseLeave={close}
               style={{
                 width: '326px',
               }}
@@ -156,7 +149,7 @@ const PopularNetworkList = ({
             paddingTop={4}
             className="new-network-list__list-of-networks"
             data-testid={`popular-network-${network.chainId}`}
-            onMouseEnter={handleMouseLeave}
+            onMouseEnter={close}
           >
             <Box display={Display.Flex} alignItems={AlignItems.center}>
               <AvatarNetwork
diff --git a/ui/components/multichain/notification-detail-network-fee/notification-detail-network-fee.tsx b/ui/components/multichain/notification-detail-network-fee/notification-detail-network-fee.tsx
index b05fe28a1504..15e52de9be15 100644
--- a/ui/components/multichain/notification-detail-network-fee/notification-detail-network-fee.tsx
+++ b/ui/components/multichain/notification-detail-network-fee/notification-detail-network-fee.tsx
@@ -35,6 +35,7 @@ import {
   FlexDirection,
 } from '../../../helpers/constants/design-system';
 import Preloader from '../../ui/icon/preloader/preloader-icon.component';
+import { useBoolean } from '../../../hooks/useBoolean';
 
 type NetworkFees = {
   transactionFee: {
@@ -89,7 +90,7 @@ const NotificationDetailNetworkFee_: FC<NotificationDetailNetworkFeeProps> = ({
 }) => {
   const t = useI18nContext();
   const { trackEvent } = useContext(MetaMetricsContext);
-  const [isOpen, setIsOpen] = useState<boolean>(false);
+  const { value: isOpen, toggle } = useBoolean();
   const [networkFees, setNetworkFees] = useState<NetworkFees>(null);
   const [networkFeesError, setNetworkFeesError] = useState<boolean>(false);
 
@@ -144,7 +145,7 @@ const NotificationDetailNetworkFee_: FC<NotificationDetailNetworkFeeProps> = ({
         },
       });
     }
-    setIsOpen(!isOpen);
+    toggle();
   };
 
   if (!networkFees && !networkFeesError) {
diff --git a/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx
index affd55cfaa66..0061b92e7aa5 100644
--- a/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx
@@ -6,9 +6,7 @@ import { SiteCell } from './site-cell';
 
 describe('SiteCell', () => {
   const store = configureStore({
-    metamask: {
-      useBlockie: false,
-    },
+    metamask: {},
   });
 
   describe('toast handling', () => {
diff --git a/ui/components/multichain/toast/index.scss b/ui/components/multichain/toast/index.scss
index b277f48babbb..97a79fa46ac1 100644
--- a/ui/components/multichain/toast/index.scss
+++ b/ui/components/multichain/toast/index.scss
@@ -21,3 +21,12 @@
 .toast-text {
   word-break: break-word;
 }
+
+/* react-hot-toast override */
+.toast-container {
+  view-transition-name: toast;
+
+  [role=status] {
+    justify-content: flex-start;
+  }
+}
diff --git a/ui/components/ui/icon/status-icon.test.tsx b/ui/components/ui/icon/status-icon.test.tsx
new file mode 100644
index 000000000000..5d917a77b79e
--- /dev/null
+++ b/ui/components/ui/icon/status-icon.test.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { StatusIcon } from './status-icon';
+
+jest.mock('@rive-app/react-canvas', () => ({
+  useRive: () => ({
+    rive: null,
+    RiveComponent: () => <div data-testid="rive-component" />,
+  }),
+  useStateMachineInput: () => null,
+}));
+
+jest.mock('../../../hooks/useTheme', () => ({
+  useTheme: () => 'light',
+}));
+
+jest.mock('../../../hooks/useRiveFileLavamoat', () => ({
+  useRiveFileLavamoat: () => ({ riveFile: {}, status: 'success' }),
+}));
+
+const states = ['loading', 'success', 'fail'] as const;
+
+describe('StatusIcon', () => {
+  for (const state of states) {
+    it(`renders for ${state} status`, () => {
+      render(<StatusIcon state={state} />);
+      expect(screen.getByTestId('rive-component')).toBeInTheDocument();
+    });
+  }
+});
diff --git a/ui/components/ui/icon/status-icon.tsx b/ui/components/ui/icon/status-icon.tsx
new file mode 100644
index 000000000000..319495c981d0
--- /dev/null
+++ b/ui/components/ui/icon/status-icon.tsx
@@ -0,0 +1,66 @@
+import { useRive, useStateMachineInput } from '@rive-app/react-canvas';
+import React, { useEffect } from 'react';
+import cn from 'clsx';
+import { ThemeType } from '../../../../shared/constants/preferences';
+import { useTheme } from '../../../hooks/useTheme';
+import { useRiveFileLavamoat } from '../../../hooks/useRiveFileLavamoat';
+
+const source = './images/riv_animations/spinner_loader_with_states.riv';
+const stateMachine = 'SpinnerLoader';
+
+type Props = {
+  state: 'loading' | 'success' | 'fail';
+  className?: string;
+};
+
+export function StatusIcon({ state, className }: Props) {
+  const theme = useTheme();
+  const isDark = theme === ThemeType.dark;
+
+  const { riveFile, status: fileStatus } = useRiveFileLavamoat({ src: source });
+  const { rive, RiveComponent } = useRive({
+    riveFile: riveFile ?? undefined,
+    stateMachines: riveFile ? stateMachine : undefined,
+    autoplay: true,
+  });
+  const darkInput = useStateMachineInput(rive, stateMachine, 'Dark');
+
+  useEffect(() => {
+    if (!darkInput) {
+      return;
+    }
+
+    try {
+      // eslint-disable-next-line react-compiler/react-compiler
+      darkInput.value = isDark;
+    } catch {
+      // Rive WASM runtime may have been cleaned up
+    }
+  }, [rive, darkInput, isDark]);
+
+  useEffect(() => {
+    if (!rive) {
+      return;
+    }
+
+    try {
+      const inputs = rive.stateMachineInputs(stateMachine);
+      const trigger = inputs?.find((i) => i.name.toLowerCase() === state);
+      trigger?.fire();
+    } catch {
+      // Rive WASM runtime may have been cleaned up
+    }
+  }, [rive, state]);
+
+  useEffect(() => {
+    return () => {
+      rive?.cleanup();
+    };
+  }, [rive]);
+
+  if (fileStatus !== 'success') {
+    return null;
+  }
+
+  return <RiveComponent className={cn('size-6', className)} />;
+}
diff --git a/ui/components/ui/survey-toast/__snapshots__/survey-toast.test.tsx.snap b/ui/components/ui/survey-toast/__snapshots__/survey-toast.test.tsx.snap
index 1d4646c0e3c8..94fab00763db 100644
--- a/ui/components/ui/survey-toast/__snapshots__/survey-toast.test.tsx.snap
+++ b/ui/components/ui/survey-toast/__snapshots__/survey-toast.test.tsx.snap
@@ -13,6 +13,20 @@ exports[`SurveyToast should match snapshot 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3"
         data-testid="survey-toast"
       >
+        <div
+          class="mm-box flex-shrink-0"
+        >
+          <svg
+            class="inline-block w-6 h-6 text-icon-default"
+            fill="currentColor"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 15q.424 0 .713-.287c.289-.287.287-.43.287-.713s-.096-.52-.287-.712S12.283 13 12 13s-.52.096-.712.288S11 13.717 11 14s.096.52.288.713.429.287.712.287m-1-4h2V5h-2zM2 22V4q0-.824.588-1.412C3.175 1.999 3.45 2 4 2h16q.824 0 1.413.588C22.002 3.175 22 3.45 22 4v12q0 .824-.587 1.413c-.587.589-.863.587-1.413.587H6zm3.15-6H20V4H4v13.125z"
+            />
+          </svg>
+        </div>
         <div
           class="mm-box"
         >
diff --git a/ui/components/ui/survey-toast/survey-toast.tsx b/ui/components/ui/survey-toast/survey-toast.tsx
index 66d5077d7033..cac2714584f3 100644
--- a/ui/components/ui/survey-toast/survey-toast.tsx
+++ b/ui/components/ui/survey-toast/survey-toast.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState, useContext, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
+import { Icon, IconName, IconSize } from '@metamask/design-system-react';
 import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import { DAY } from '../../../../shared/constants/time';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -21,6 +22,7 @@ import { Toast } from '../../multichain';
 type Survey = {
   url: string;
   description: string;
+  content?: string;
   cta: string;
   id: number;
 };
@@ -138,10 +140,11 @@ export function SurveyToast() {
       dataTestId="survey-toast"
       key="survey-toast"
       text={survey.description}
+      description={survey.content}
       actionText={survey.cta}
       onActionClick={handleActionClick}
       onClose={handleClose}
-      startAdornment={null}
+      startAdornment={<Icon name={IconName.Feedback} size={IconSize.Lg} />}
     />
   );
 }
diff --git a/ui/components/ui/toast/toast-listener.test.tsx b/ui/components/ui/toast/toast-listener.test.tsx
new file mode 100644
index 000000000000..09259a99df84
--- /dev/null
+++ b/ui/components/ui/toast/toast-listener.test.tsx
@@ -0,0 +1,181 @@
+import React from 'react';
+import { type BridgeHistoryItem } from '@metamask/bridge-status-controller';
+import { render } from '@testing-library/react';
+import { useSelector } from 'react-redux';
+import { toast } from 'react-hot-toast';
+import {
+  selectEvmTransactionsForToast,
+  selectNonEvmTransactionsForToast,
+} from '../../../selectors/toast';
+import { selectBridgeHistoryForToast } from '../../../ducks/bridge-status/selectors';
+import { ToastListener } from './toast-listener';
+
+jest.mock('react-redux', () => ({ useSelector: jest.fn() }));
+
+jest.mock('react-hot-toast', () => ({
+  toast: {
+    loading: jest.fn(),
+    success: jest.fn(),
+    error: jest.fn(),
+    dismiss: jest.fn(),
+  },
+}));
+
+jest.mock('../../../selectors', () => ({
+  selectEvmTransactionsForToast: jest.fn(),
+  selectNonEvmTransactionsForToast: jest.fn(),
+}));
+
+jest.mock('../../../ducks/bridge-status/selectors', () => ({
+  selectBridgeHistoryForToast: jest.fn(),
+}));
+
+jest.mock('./toast', () => ({ ToastContent: () => null }));
+
+const mockUseSelector = jest.mocked(useSelector);
+
+type TestState = {
+  evmTxs: object[];
+  nonEvmTxs: object[];
+  bridgeHistory: Record<string, BridgeHistoryItem>;
+};
+
+let state: TestState;
+
+const makeBridgeItem = (status: string) =>
+  ({
+    quote: { srcChainId: 1, destChainId: 137 },
+    status: { status },
+    account: '0x123',
+  }) as unknown as BridgeHistoryItem;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  state = {
+    evmTxs: [],
+    nonEvmTxs: [],
+    bridgeHistory: {},
+  };
+  mockUseSelector.mockImplementation((selector: unknown) => {
+    if (selector === selectEvmTransactionsForToast) {
+      return state.evmTxs;
+    }
+    if (selector === selectNonEvmTransactionsForToast) {
+      return state.nonEvmTxs;
+    }
+    if (selector === selectBridgeHistoryForToast) {
+      return state.bridgeHistory;
+    }
+    return undefined;
+  });
+});
+
+describe('ToastListener', () => {
+  describe('EVM transactions', () => {
+    it('shows a loading toast when a pending tx appears', () => {
+      const { rerender } = render(<ToastListener />);
+
+      state.evmTxs = [{ id: 'tx1', status: 'submitted' }];
+      rerender(<ToastListener />);
+
+      expect(toast.loading).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'tx-tx1' }),
+      );
+    });
+
+    it('shows a success toast when a tx becomes confirmed', () => {
+      state.evmTxs = [{ id: 'tx1', status: 'submitted' }];
+      const { rerender } = render(<ToastListener />);
+
+      state.evmTxs = [{ id: 'tx1', status: 'confirmed' }];
+      rerender(<ToastListener />);
+
+      expect(toast.success).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'tx-tx1' }),
+      );
+    });
+
+    it('shows an error toast when a tx becomes failed', () => {
+      state.evmTxs = [{ id: 'tx1', status: 'submitted' }];
+      const { rerender } = render(<ToastListener />);
+
+      state.evmTxs = [{ id: 'tx1', status: 'failed' }];
+      rerender(<ToastListener />);
+
+      expect(toast.error).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'tx-tx1' }),
+      );
+    });
+  });
+
+  describe('non-EVM transactions', () => {
+    it('shows a success toast when a non-EVM tx becomes confirmed', () => {
+      state.nonEvmTxs = [{ id: 'sol-tx1', status: 'submitted' }];
+      const { rerender } = render(<ToastListener />);
+
+      state.nonEvmTxs = [{ id: 'sol-tx1', status: 'confirmed' }];
+      rerender(<ToastListener />);
+
+      expect(toast.success).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'non-evm-tx-sol-tx1' }),
+      );
+    });
+
+    it('shows an error toast when a non-EVM tx becomes failed', () => {
+      state.nonEvmTxs = [{ id: 'sol-tx1', status: 'submitted' }];
+      const { rerender } = render(<ToastListener />);
+
+      state.nonEvmTxs = [{ id: 'sol-tx1', status: 'failed' }];
+      rerender(<ToastListener />);
+
+      expect(toast.error).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'non-evm-tx-sol-tx1' }),
+      );
+    });
+  });
+
+  describe('bridge history', () => {
+    it('shows a loading toast when a new pending bridge tx appears', () => {
+      const { rerender } = render(<ToastListener />);
+
+      state.bridgeHistory = { 'bridge-1': makeBridgeItem('PENDING') };
+      rerender(<ToastListener />);
+
+      expect(toast.loading).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'bridge-tx-bridge-1' }),
+      );
+    });
+
+    it('shows a success toast when a bridge tx becomes complete', () => {
+      state.bridgeHistory = { 'bridge-1': makeBridgeItem('PENDING') };
+      const { rerender } = render(<ToastListener />);
+
+      state.bridgeHistory = { 'bridge-1': makeBridgeItem('COMPLETE') };
+      rerender(<ToastListener />);
+
+      expect(toast.success).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'bridge-tx-bridge-1' }),
+      );
+    });
+
+    it('shows an error toast when a bridge tx becomes failed', () => {
+      state.bridgeHistory = { 'bridge-1': makeBridgeItem('PENDING') };
+      const { rerender } = render(<ToastListener />);
+
+      state.bridgeHistory = { 'bridge-1': makeBridgeItem('FAILED') };
+      rerender(<ToastListener />);
+
+      expect(toast.error).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({ id: 'bridge-tx-bridge-1' }),
+      );
+    });
+  });
+});
diff --git a/ui/components/ui/toast/toast-listener.tsx b/ui/components/ui/toast/toast-listener.tsx
new file mode 100644
index 000000000000..026e8fe0a30e
--- /dev/null
+++ b/ui/components/ui/toast/toast-listener.tsx
@@ -0,0 +1,114 @@
+import React, { useMemo } from 'react';
+import { toast } from 'react-hot-toast';
+import { useSelector } from 'react-redux';
+import {
+  selectNonEvmTransactionsForToast,
+  selectEvmTransactionsForToast,
+} from '../../../selectors/toast';
+import { selectBridgeHistoryForToast } from '../../../ducks/bridge-status/selectors';
+import { useTransactionLifecycle } from '../../../hooks/useTransactionLifecycle';
+import { useNonEvmTransactionLifecycle } from '../../../hooks/useNonEvmTransactionLifecycle';
+import { useBridgeHistoryLifecycle } from '../../../hooks/useBridgeHistoryLifecycle';
+import { ToastContent } from './toast';
+import type { Handlers } from './types';
+
+type EvmTx = ReturnType<typeof selectEvmTransactionsForToast>[number];
+type NonEvmTx = ReturnType<typeof selectNonEvmTransactionsForToast>[number];
+
+/**
+ * Watches EVM transactions for status transitions and shows toast notifications
+ */
+function useEvmTransactionToasts() {
+  const data = useSelector(selectEvmTransactionsForToast);
+
+  const handlers = useMemo<Handlers<EvmTx>>(
+    () => ({
+      onPending: (tx) => {
+        toast.loading(<ToastContent status="pending" />, {
+          id: `tx-${tx.id}`,
+        });
+      },
+      onSuccess: (tx) => {
+        toast.success(<ToastContent status="success" />, {
+          id: `tx-${tx.id}`,
+        });
+      },
+      onFailure: (tx) => {
+        toast.error(<ToastContent status="failed" />, {
+          id: `tx-${tx.id}`,
+        });
+      },
+    }),
+    [],
+  );
+
+  useTransactionLifecycle(data, handlers);
+}
+
+/**
+ * Watches non-EVM transactions for status transitions and shows toast notifications
+ */
+function useNonEvmTransactionToasts() {
+  const data = useSelector(selectNonEvmTransactionsForToast);
+
+  const handlers = useMemo<Handlers<NonEvmTx>>(
+    () => ({
+      onPending: (tx) => {
+        toast.loading(<ToastContent status="pending" />, {
+          id: `non-evm-tx-${tx.id}`,
+        });
+      },
+      onSuccess: (tx) => {
+        toast.success(<ToastContent status="success" />, {
+          id: `non-evm-tx-${tx.id}`,
+        });
+      },
+      onFailure: (tx) => {
+        toast.error(<ToastContent status="failed" />, {
+          id: `non-evm-tx-${tx.id}`,
+        });
+      },
+    }),
+    [],
+  );
+
+  useNonEvmTransactionLifecycle(data, handlers);
+}
+
+/**
+ * Watches bridge history for status transitions and shows toast notifications
+ */
+function useBridgeHistoryToasts() {
+  const data = useSelector(selectBridgeHistoryForToast);
+
+  const handlers = useMemo(
+    () => ({
+      onPending: (key: string) => {
+        toast.loading(<ToastContent status="pending" />, {
+          id: `bridge-tx-${key}`,
+        });
+      },
+      onSuccess: (key: string) => {
+        toast.success(<ToastContent status="success" />, {
+          id: `bridge-tx-${key}`,
+        });
+      },
+      onFailure: (key: string) => {
+        toast.error(<ToastContent status="failed" />, {
+          id: `bridge-tx-${key}`,
+        });
+      },
+    }),
+    [],
+  );
+
+  useBridgeHistoryLifecycle(data, handlers);
+}
+
+export function ToastListener() {
+  useEvmTransactionToasts();
+  useNonEvmTransactionToasts();
+  useBridgeHistoryToasts();
+
+  return null;
+}
diff --git a/ui/components/ui/toast/toast.test.tsx b/ui/components/ui/toast/toast.test.tsx
new file mode 100644
index 000000000000..588d2a6831d8
--- /dev/null
+++ b/ui/components/ui/toast/toast.test.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { ToastContent } from './toast';
+
+jest.mock('../../../helpers/utils/transaction-display', () => ({
+  useTransactionDisplay: (variant: string) => ({
+    title: `${variant} title`,
+  }),
+}));
+
+jest.mock('../icon/status-icon', () => ({
+  StatusIcon: () => null,
+}));
+
+describe('ToastContent', () => {
+  it('renders the title for the pending variant', () => {
+    render(<ToastContent status="pending" />);
+    expect(screen.getByText('pending title')).toBeInTheDocument();
+  });
+
+  it('renders the title for the success variant', () => {
+    render(<ToastContent status="success" />);
+    expect(screen.getByText('success title')).toBeInTheDocument();
+  });
+
+  it('renders the title for the failed variant', () => {
+    render(<ToastContent status="failed" />);
+    expect(screen.getByText('failed title')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/ui/toast/toast.tsx b/ui/components/ui/toast/toast.tsx
new file mode 100644
index 000000000000..a89076278b3d
--- /dev/null
+++ b/ui/components/ui/toast/toast.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { useLocation } from 'react-router-dom';
+import { toast, ToastBar, Toaster as ToasterBase } from 'react-hot-toast';
+import {
+  ButtonIcon,
+  ButtonIconSize,
+  IconName,
+} from '@metamask/design-system-react';
+import { isInteractiveUI } from '../../../../shared/lib/environment-type';
+import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+import {
+  useTransactionDisplay,
+  type TransactionStatus,
+} from '../../../helpers/utils/transaction-display';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { StatusIcon } from '../icon/status-icon';
+
+const statusMap = {
+  loading: 'loading',
+  success: 'success',
+  error: 'fail',
+} as const;
+
+export function Toaster() {
+  const t = useI18nContext();
+  const { pathname } = useLocation();
+
+  if (!isInteractiveUI() || process.env.IN_TEST) {
+    return null;
+  }
+
+  // Only show toast on the default (home) route
+  const style = pathname === DEFAULT_ROUTE ? undefined : { display: 'none' };
+
+  return (
+    <ToasterBase
+      position="bottom-center"
+      containerClassName="toast-container"
+      containerStyle={style}
+      toastOptions={{
+        className: 'w-[360px] max-w-[360px] border border-border-muted',
+        style: {
+          background: 'var(--color-background-section)',
+          color: 'var(--color-text-default)',
+          borderRadius: 12,
+          padding: 12,
+        },
+      }}
+    >
+      {(item) => (
+        <ToastBar toast={item} position={item.position ?? 'bottom-center'}>
+          {({ message }) => (
+            <>
+              <StatusIcon
+                state={
+                  statusMap[item.type as keyof typeof statusMap] ??
+                  statusMap.loading
+                }
+              />
+
+              {message}
+
+              <ButtonIcon
+                ariaLabel={t('close')}
+                iconName={IconName.Close}
+                size={ButtonIconSize.Sm}
+                onClick={() => toast.dismiss(item.id)}
+              />
+            </>
+          )}
+        </ToastBar>
+      )}
+    </ToasterBase>
+  );
+}
+
+export const ToastContent = ({ status }: { status: TransactionStatus }) => {
+  const { title } = useTransactionDisplay(status);
+
+  return (
+    <div>
+      <p className="text-m-body-md">{title}</p>
+    </div>
+  );
+};
diff --git a/ui/components/ui/toast/types.ts b/ui/components/ui/toast/types.ts
new file mode 100644
index 000000000000..b2080d41a513
--- /dev/null
+++ b/ui/components/ui/toast/types.ts
@@ -0,0 +1,5 @@
+export type Handlers<TTxn> = {
+  onPending?: (transaction: TTxn) => void;
+  onSuccess?: (transaction: TTxn) => void;
+  onFailure?: (transaction: TTxn) => void;
+};
diff --git a/ui/contexts/gasFee.js b/ui/contexts/gasFee.js
deleted file mode 100644
index 5f7bf003c448..000000000000
--- a/ui/contexts/gasFee.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { createContext, useContext } from 'react';
-import PropTypes from 'prop-types';
-import { useGasFeeInputs } from '../pages/confirmations/hooks/useGasFeeInputs';
-
-export const GasFeeContext = createContext({});
-
-export const GasFeeContextProvider = ({
-  children,
-  defaultEstimateToUse,
-  transaction,
-  minimumGasLimit,
-  editGasMode,
-}) => {
-  const gasFeeDetails = useGasFeeInputs(
-    defaultEstimateToUse,
-    transaction,
-    minimumGasLimit,
-    editGasMode,
-  );
-  return (
-    <GasFeeContext.Provider value={gasFeeDetails}>
-      {children}
-    </GasFeeContext.Provider>
-  );
-};
-
-export function useGasFeeContext() {
-  return useContext(GasFeeContext);
-}
-
-GasFeeContextProvider.propTypes = {
-  children: PropTypes.node.isRequired,
-  defaultEstimateToUse: PropTypes.string,
-  transaction: PropTypes.object,
-  minimumGasLimit: PropTypes.string,
-  editGasMode: PropTypes.string,
-};
diff --git a/ui/contexts/hardware-wallets/HardwareWalletContext.tsx b/ui/contexts/hardware-wallets/HardwareWalletContext.tsx
index 2e65d89b9da6..5ac0cf945b89 100644
--- a/ui/contexts/hardware-wallets/HardwareWalletContext.tsx
+++ b/ui/contexts/hardware-wallets/HardwareWalletContext.tsx
@@ -7,6 +7,7 @@ import React, {
   useRef,
   type ReactNode,
 } from 'react';
+import { resetHardwareWalletRecoveryInlineCtaViewCount } from '../../../shared/lib/hardware-wallet-recovery-metrics';
 import { ConnectionState } from './connectionState';
 import { useHardwareWalletStateManager } from './HardwareWalletStateManager';
 import { useDeviceEventHandlers } from './HardwareWalletEventHandlers';
@@ -200,6 +201,7 @@ export const HardwareWalletProvider: React.FC<{ children: ReactNode }> = ({
     });
 
   const setConnectionReady = useCallback(() => {
+    resetHardwareWalletRecoveryInlineCtaViewCount();
     updateConnectionState(ConnectionState.ready());
   }, [updateConnectionState]);
 
@@ -250,6 +252,7 @@ export const HardwareWalletProvider: React.FC<{ children: ReactNode }> = ({
   }, []);
 
   const resetHardwareWalletConnection = useCallback(() => {
+    resetHardwareWalletRecoveryInlineCtaViewCount();
     if (refs.adapterRef.current) {
       refs.adapterRef.current.destroy();
       refs.adapterRef.current = null;
diff --git a/ui/contexts/hardware-wallets/index.ts b/ui/contexts/hardware-wallets/index.ts
index 5f77f6fe35e6..5268215639dc 100644
--- a/ui/contexts/hardware-wallets/index.ts
+++ b/ui/contexts/hardware-wallets/index.ts
@@ -12,6 +12,8 @@ export {
 } from './HardwareWalletErrorProvider';
 export { ConnectionState } from './connectionState';
 export { useHardwareFooter } from './useHardwareFooter';
+export type { SubmitPreflightCheckOptions } from './useHardwareFooter';
+export { useHardwareWalletMetrics } from './useHardwareWalletMetrics';
 export * from './errors';
 export * from './types';
 export * from './webConnectionUtils';
diff --git a/ui/contexts/hardware-wallets/useHardwareFooter.test.ts b/ui/contexts/hardware-wallets/useHardwareFooter.test.ts
index e9eaf3c2f751..a1e341d6e353 100644
--- a/ui/contexts/hardware-wallets/useHardwareFooter.test.ts
+++ b/ui/contexts/hardware-wallets/useHardwareFooter.test.ts
@@ -14,8 +14,13 @@ import {
   isUserRejectedHardwareWalletError,
 } from './rpcErrorUtils';
 import { useHardwareFooter } from './useHardwareFooter';
+import { useHardwareWalletMetrics } from './useHardwareWalletMetrics';
 import { ConnectionStatus, HardwareWalletType } from './types';
 
+jest.mock('./useHardwareWalletMetrics', () => ({
+  useHardwareWalletMetrics: jest.fn(),
+}));
+
 jest.mock('./HardwareWalletContext', () => ({
   useHardwareWalletState: jest.fn(),
   useHardwareWalletConfig: jest.fn(),
@@ -31,10 +36,13 @@ jest.mock('./rpcErrorUtils', () => ({
   isUserRejectedHardwareWalletError: jest.fn(),
 }));
 
+const mockUseHardwareWalletMetrics = jest.mocked(useHardwareWalletMetrics);
+
 describe('useHardwareFooter', () => {
   let mockConnectionState: { status: ConnectionStatus };
   let mockEnsureDeviceReady: jest.Mock<Promise<boolean>, [unknown?]>;
   let mockShowErrorModal: jest.Mock;
+  let mockTrackConnectCtaClicked: jest.Mock;
   let mockOnUserRejectedHardwareWalletError: jest.Mock<
     Promise<void>,
     [],
@@ -75,6 +83,11 @@ describe('useHardwareFooter', () => {
     });
     (isHardwareWalletError as jest.Mock).mockReturnValue(false);
     (isUserRejectedHardwareWalletError as jest.Mock).mockReturnValue(false);
+
+    mockTrackConnectCtaClicked = jest.fn();
+    mockUseHardwareWalletMetrics.mockReturnValue({
+      trackConnectCtaClicked: mockTrackConnectCtaClicked,
+    });
   });
 
   afterEach(() => {
@@ -225,6 +238,47 @@ describe('useHardwareFooter', () => {
       expect(isReady).toBe(true);
       expect(mockEnsureDeviceReady).not.toHaveBeenCalled();
     });
+
+    it('invokes trackConnectCtaClicked when trackConnectCta is true', async () => {
+      mockConnectionState.status = ConnectionStatus.Connected;
+      mockEnsureDeviceReady.mockResolvedValue(true);
+
+      const { result } = renderHook(() =>
+        useHardwareFooter({
+          currentConfirmation: createConfirmation(TransactionType.simpleSend),
+          currentConfirmationId: 'confirmation-id',
+          onUserRejectedHardwareWalletError:
+            mockOnUserRejectedHardwareWalletError,
+        }),
+      );
+
+      await act(async () => {
+        await result.current.onSubmitPreflightCheck({ trackConnectCta: true });
+      });
+
+      expect(mockTrackConnectCtaClicked).toHaveBeenCalledTimes(1);
+      expect(mockEnsureDeviceReady).toHaveBeenCalled();
+    });
+
+    it('does not invoke trackConnectCtaClicked when trackConnectCta is omitted', async () => {
+      mockConnectionState.status = ConnectionStatus.Connected;
+      mockEnsureDeviceReady.mockResolvedValue(true);
+
+      const { result } = renderHook(() =>
+        useHardwareFooter({
+          currentConfirmation: createConfirmation(TransactionType.simpleSend),
+          currentConfirmationId: 'confirmation-id',
+          onUserRejectedHardwareWalletError:
+            mockOnUserRejectedHardwareWalletError,
+        }),
+      );
+
+      await act(async () => {
+        await result.current.onSubmitPreflightCheck();
+      });
+
+      expect(mockTrackConnectCtaClicked).not.toHaveBeenCalled();
+    });
   });
 
   describe('readiness reset behavior', () => {
diff --git a/ui/contexts/hardware-wallets/useHardwareFooter.ts b/ui/contexts/hardware-wallets/useHardwareFooter.ts
index 5643b5097548..f1ca229b4710 100644
--- a/ui/contexts/hardware-wallets/useHardwareFooter.ts
+++ b/ui/contexts/hardware-wallets/useHardwareFooter.ts
@@ -16,6 +16,7 @@ import {
   isUserRejectedHardwareWalletError,
 } from './rpcErrorUtils';
 import { ConnectionStatus, type EnsureDeviceReadyOptions } from './types';
+import { useHardwareWalletMetrics } from './useHardwareWalletMetrics';
 
 type UseHardwareFooterArgs = {
   currentConfirmation?: TransactionMeta;
@@ -23,11 +24,21 @@ type UseHardwareFooterArgs = {
   onUserRejectedHardwareWalletError: () => Promise<void>;
 };
 
+export type SubmitPreflightCheckOptions = {
+  /**
+   * When true, runs hardware-wallet Connect-CTA metrics before device readiness (e.g. dedicated “Connect device” button).
+   * Omit or set to false for preflight from the main Confirm action.
+   */
+  trackConnectCta?: boolean;
+};
+
 type UseHardwareFooterResult = {
   walletType: ReturnType<typeof useHardwareWalletConfig>['walletType'];
   shouldRunHardwareWalletPreflight: boolean;
   isHardwareWalletReady: boolean;
-  onSubmitPreflightCheck: () => Promise<boolean>;
+  onSubmitPreflightCheck: (
+    options?: SubmitPreflightCheckOptions,
+  ) => Promise<boolean>;
   withHardwareWalletModalHandling: (
     request: () => Promise<void>,
   ) => () => Promise<void>;
@@ -38,6 +49,7 @@ export const useHardwareFooter = ({
   currentConfirmationId,
   onUserRejectedHardwareWalletError,
 }: UseHardwareFooterArgs): UseHardwareFooterResult => {
+  const { trackConnectCtaClicked } = useHardwareWalletMetrics();
   const inE2e =
     process.env.IN_TEST && process.env.JEST_WORKER_ID === 'undefined';
   const { connectionState } = useHardwareWalletState();
@@ -105,21 +117,29 @@ export const useHardwareFooter = ({
     isHardwareWalletAccount,
   ]);
 
-  const onSubmitPreflightCheck = useCallback(async (): Promise<boolean> => {
-    if (inE2e || !isHardwareWalletAccount) {
-      return true;
-    }
+  const onSubmitPreflightCheck = useCallback(
+    async (options?: SubmitPreflightCheckOptions): Promise<boolean> => {
+      if (inE2e || !isHardwareWalletAccount) {
+        return true;
+      }
 
-    const isDeviceReady = await ensureDeviceReady(ensureDeviceReadyOptions);
-    setHasPreflightSucceeded(isDeviceReady);
+      if (options?.trackConnectCta) {
+        trackConnectCtaClicked();
+      }
 
-    return isDeviceReady;
-  }, [
-    inE2e,
-    isHardwareWalletAccount,
-    ensureDeviceReady,
-    ensureDeviceReadyOptions,
-  ]);
+      const isDeviceReady = await ensureDeviceReady(ensureDeviceReadyOptions);
+      setHasPreflightSucceeded(isDeviceReady);
+
+      return isDeviceReady;
+    },
+    [
+      inE2e,
+      isHardwareWalletAccount,
+      trackConnectCtaClicked,
+      ensureDeviceReady,
+      ensureDeviceReadyOptions,
+    ],
+  );
 
   const withHardwareWalletModalHandling = useCallback(
     (request: () => Promise<void>) => {
diff --git a/ui/contexts/hardware-wallets/useHardwareWalletMetrics.test.tsx b/ui/contexts/hardware-wallets/useHardwareWalletMetrics.test.tsx
new file mode 100644
index 000000000000..1fa2ecb4e3a7
--- /dev/null
+++ b/ui/contexts/hardware-wallets/useHardwareWalletMetrics.test.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { MetaMetricsHardwareWalletRecoveryLocation } from '../../../shared/constants/metametrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from '../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked';
+import { useHardwareWalletRecoveryLocation } from '../../hooks/useHardwareWalletRecoveryLocation';
+import { MetaMetricsContext } from '../metametrics';
+import {
+  useHardwareWalletConfig,
+  useHardwareWalletState,
+} from './HardwareWalletContext';
+import { ConnectionStatus, HardwareWalletType } from './types';
+import { useHardwareWalletMetrics } from './useHardwareWalletMetrics';
+
+jest.mock(
+  '../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked',
+);
+jest.mock('../../hooks/useHardwareWalletRecoveryLocation');
+jest.mock('./HardwareWalletContext', () => ({
+  useHardwareWalletConfig: jest.fn(),
+  useHardwareWalletState: jest.fn(),
+}));
+
+const mockTrackHardwareWalletRecoveryConnectCtaClicked = jest.mocked(
+  trackHardwareWalletRecoveryConnectCtaClicked,
+);
+
+describe('useHardwareWalletMetrics', () => {
+  const mockTrackEvent = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useHardwareWalletRecoveryLocation as jest.Mock).mockReturnValue(
+      MetaMetricsHardwareWalletRecoveryLocation.Send,
+    );
+    (useHardwareWalletConfig as jest.Mock).mockReturnValue({
+      walletType: HardwareWalletType.Ledger,
+    });
+    (useHardwareWalletState as jest.Mock).mockReturnValue({
+      connectionState: { status: ConnectionStatus.Disconnected },
+    });
+  });
+
+  it('returns a callback that forwards to trackHardwareWalletRecoveryConnectCtaClicked', () => {
+    const { result } = renderHook(() => useHardwareWalletMetrics(), {
+      wrapper: ({ children }) => (
+        <MetaMetricsContext.Provider
+          value={{
+            trackEvent: mockTrackEvent,
+            bufferedTrace: jest.fn(),
+            bufferedEndTrace: jest.fn(),
+            onboardingParentContext: { current: null },
+          }}
+        >
+          {children}
+        </MetaMetricsContext.Provider>
+      ),
+    });
+
+    result.current.trackConnectCtaClicked();
+
+    expect(
+      mockTrackHardwareWalletRecoveryConnectCtaClicked,
+    ).toHaveBeenCalledWith(mockTrackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: { status: ConnectionStatus.Disconnected },
+    });
+  });
+});
diff --git a/ui/contexts/hardware-wallets/useHardwareWalletMetrics.ts b/ui/contexts/hardware-wallets/useHardwareWalletMetrics.ts
new file mode 100644
index 000000000000..d35b946faef8
--- /dev/null
+++ b/ui/contexts/hardware-wallets/useHardwareWalletMetrics.ts
@@ -0,0 +1,29 @@
+import { useCallback, useContext } from 'react';
+import { MetaMetricsContext } from '../metametrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from '../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked';
+import { useHardwareWalletRecoveryLocation } from '../../hooks/useHardwareWalletRecoveryLocation';
+import {
+  useHardwareWalletConfig,
+  useHardwareWalletState,
+} from './HardwareWalletContext';
+
+/**
+ * Hardware wallet MetaMetrics helpers for surfaces that integrate with confirmation flows.
+ * Keeps Segment payload construction out of generic confirmation UI.
+ */
+export function useHardwareWalletMetrics() {
+  const { trackEvent } = useContext(MetaMetricsContext);
+  const location = useHardwareWalletRecoveryLocation();
+  const { walletType } = useHardwareWalletConfig();
+  const { connectionState } = useHardwareWalletState();
+
+  const trackConnectCtaClicked = useCallback(() => {
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location,
+      walletType,
+      connectionState,
+    });
+  }, [connectionState, location, trackEvent, walletType]);
+
+  return { trackConnectCtaClicked };
+}
diff --git a/ui/contexts/metametrics.test.tsx b/ui/contexts/metametrics.test.tsx
new file mode 100644
index 000000000000..30794ce07c0b
--- /dev/null
+++ b/ui/contexts/metametrics.test.tsx
@@ -0,0 +1,162 @@
+import React, { useContext, useEffect } from 'react';
+import { render, waitFor } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import { Provider } from 'react-redux';
+import { createMemoryRouter, RouterProvider } from 'react-router-dom';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../shared/constants/metametrics';
+import { submitRequestToBackground } from '../store/background-connection';
+import { trackMetaMetricsEvent } from '../store/actions';
+import { MetaMetricsContext, MetaMetricsProvider } from './metametrics';
+
+jest.mock('../hooks/useSegmentContext', () => ({
+  useSegmentContext: jest.fn(() => ({})),
+}));
+
+jest.mock('../store/actions', () => ({
+  trackMetaMetricsEvent: jest.fn(),
+  trackMetaMetricsPage: jest.fn(),
+}));
+
+jest.mock('../store/background-connection', () => ({
+  generateActionId: jest.fn(() => 'test-action-id'),
+  submitRequestToBackground: jest.fn().mockResolvedValue(undefined),
+}));
+
+const mockStore = configureMockStore([]);
+
+const renderProvider = ({
+  event,
+  state,
+}: {
+  event: MetaMetricsEventName;
+  state: {
+    metamask: {
+      participateInMetaMetrics: boolean | null;
+      metaMetricsId: string | null;
+    };
+  };
+}) => {
+  const store = mockStore(state);
+
+  const TestComponent = () => {
+    const { trackEvent } = useContext(MetaMetricsContext);
+
+    useEffect(() => {
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event,
+      });
+    }, [event, trackEvent]);
+
+    return null;
+  };
+
+  const router = createMemoryRouter(
+    [
+      {
+        path: '*',
+        element: (
+          <MetaMetricsProvider>
+            <TestComponent />
+          </MetaMetricsProvider>
+        ),
+      },
+    ],
+    { initialEntries: ['/onboarding/metametrics'] },
+  );
+
+  return render(
+    <Provider store={store}>
+      <RouterProvider router={router} />
+    </Provider>,
+  );
+};
+
+describe('MetaMetricsProvider', () => {
+  const mockedTrackMetaMetricsEvent = jest.mocked(trackMetaMetricsEvent);
+  const mockedSubmitRequestToBackground = jest.mocked(
+    submitRequestToBackground,
+  );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('buffers events when participation is enabled but metaMetricsId is missing', async () => {
+    renderProvider({
+      event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+      state: {
+        metamask: {
+          participateInMetaMetrics: true,
+          metaMetricsId: null,
+        },
+      },
+    });
+
+    await waitFor(() => {
+      expect(mockedSubmitRequestToBackground).toHaveBeenCalledWith(
+        'addEventBeforeMetricsOptIn',
+        [
+          expect.objectContaining({
+            actionId: 'test-action-id',
+            category: MetaMetricsEventCategory.Onboarding,
+            event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+          }),
+        ],
+      );
+    });
+
+    expect(mockedTrackMetaMetricsEvent).not.toHaveBeenCalled();
+  });
+
+  it('tracks events immediately when participation is enabled and metaMetricsId exists', async () => {
+    renderProvider({
+      event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+      state: {
+        metamask: {
+          participateInMetaMetrics: true,
+          metaMetricsId: '0x123',
+        },
+      },
+    });
+
+    await waitFor(() => {
+      expect(mockedTrackMetaMetricsEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        }),
+        undefined,
+      );
+    });
+
+    expect(mockedSubmitRequestToBackground).not.toHaveBeenCalled();
+  });
+
+  it('tracks metrics opt out immediately without a metaMetricsId', async () => {
+    renderProvider({
+      event: MetaMetricsEventName.MetricsOptOut,
+      state: {
+        metamask: {
+          participateInMetaMetrics: false,
+          metaMetricsId: null,
+        },
+      },
+    });
+
+    await waitFor(() => {
+      expect(mockedTrackMetaMetricsEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.MetricsOptOut,
+        }),
+        undefined,
+      );
+    });
+
+    expect(mockedSubmitRequestToBackground).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/contexts/metametrics.tsx b/ui/contexts/metametrics.tsx
index 81875b555473..fcc80506c043 100644
--- a/ui/contexts/metametrics.tsx
+++ b/ui/contexts/metametrics.tsx
@@ -37,7 +37,7 @@ import {
   type MetaMetricsEventPayload,
 } from '../../shared/constants/metametrics';
 import { useSegmentContext } from '../hooks/useSegmentContext';
-import { getParticipateInMetaMetrics } from '../selectors';
+import { getMetaMetricsId, getParticipateInMetaMetrics } from '../selectors';
 import {
   generateActionId,
   submitRequestToBackground,
@@ -145,6 +145,9 @@ export function MetaMetricsProvider({ children }: MetaMetricsProviderProps) {
   const location = useLocation();
   const context = useSegmentContext();
   const isMetricsEnabled = useSelector(getParticipateInMetaMetrics);
+  const metaMetricsId = useSelector(getMetaMetricsId);
+  // Buffer events until the background has minted the MetaMetrics ID used to submit them.
+  const canTrackImmediately = isMetricsEnabled && Boolean(metaMetricsId);
 
   const onboardingParentContext = useRef<TraceParentContext>(null);
 
@@ -177,7 +180,7 @@ export function MetaMetricsProvider({ children }: MetaMetricsProviderProps) {
       };
 
       if (
-        isMetricsEnabled ||
+        canTrackImmediately ||
         payload.event === MetaMetricsEventName.MetricsOptOut // We wanna track the MetricsOptOut event when user opts out of metrics and basic functionality is not "DISABLED"
       ) {
         // If metrics are enabled, track immediately
@@ -189,7 +192,7 @@ export function MetaMetricsProvider({ children }: MetaMetricsProviderProps) {
         ]);
       }
     },
-    [addContextPropsIntoEventProperties, context, isMetricsEnabled],
+    [addContextPropsIntoEventProperties, canTrackImmediately, context],
   );
 
   const bufferedTrace: UITraceMethod = useCallback((request, fn) => {
diff --git a/ui/contexts/query-client.ts b/ui/contexts/query-client.ts
index 6d46de5917ba..57a6ea171ef0 100644
--- a/ui/contexts/query-client.ts
+++ b/ui/contexts/query-client.ts
@@ -1,3 +1,28 @@
-import { QueryClient } from '@tanstack/react-query';
+import { createUIQueryClient } from '@metamask/react-data-query';
+import { NamespacedName } from '@metamask/messenger';
+import { Json } from '@metamask/utils';
+import { DATA_SERVICES } from '../../shared/constants/data-services';
+import {
+  submitRequestToBackground,
+  subscribeToMessengerEvent,
+} from '../store/background-connection';
 
-export const queryClient = new QueryClient();
+type JsonSubscriptionCallback = (data: Json) => void;
+
+const subscriptions = new Map();
+
+const adapter = {
+  call: (method: string, ...params: Json[]) =>
+    submitRequestToBackground<Json>('messengerCall', [method, params]),
+  subscribe: (event: string, callback: JsonSubscriptionCallback) => {
+    subscribeToMessengerEvent(event as NamespacedName, callback)
+      .then((unsubscribe) => subscriptions.set(callback, unsubscribe))
+      .catch(console.error);
+  },
+  unsubscribe: (_event: string, callback: JsonSubscriptionCallback) => {
+    const unsubscribe = subscriptions.get(callback);
+    unsubscribe?.().catch(console.error);
+  },
+};
+
+export const queryClient = createUIQueryClient(DATA_SERVICES, adapter);
diff --git a/ui/ducks/bridge-status/selectors.test.ts b/ui/ducks/bridge-status/selectors.test.ts
index d08ac400a0e3..656b0e1b806e 100644
--- a/ui/ducks/bridge-status/selectors.test.ts
+++ b/ui/ducks/bridge-status/selectors.test.ts
@@ -1,9 +1,83 @@
+import type { BridgeStatusControllerState } from '@metamask/bridge-status-controller';
+import type { TransactionControllerState } from '@metamask/transaction-controller';
 import {
   selectBridgeHistoryForApprovalTxId,
   selectBridgeHistoryForOriginalTxMetaId,
+  selectBridgeHistoryForToast,
+  selectNonEvmBridgeSourceTxIds,
 } from './selectors';
 
+type BridgeStatusAppState = {
+  metamask: BridgeStatusControllerState & TransactionControllerState;
+};
+
+const EMPTY: never[] = [];
+
+jest.mock('../../selectors/multichain-accounts/account-tree', () => ({
+  getSelectedAccountGroup: () => undefined,
+  getInternalAccountsFromGroupById: () => EMPTY,
+}));
+
+jest.mock('../../selectors/multichain-transactions', () => ({
+  selectCurrentAccountNonEvmTransactions: () => EMPTY,
+}));
+
 describe('bridge-status selectors', () => {
+  describe('selectBridgeHistoryForToast', () => {
+    it('returns cross-chain items whose source tx exists in transactions', () => {
+      const state = {
+        metamask: {
+          txHistory: {
+            // cross-chain ✅ with matching source tx
+            'tx-1': { quote: { srcChainId: 1, destChainId: 10 } },
+            // same-chain with matching source tx
+            'tx-2': { quote: { srcChainId: 1, destChainId: 1 } },
+            // cross-chain with no matching source tx
+            'tx-3': { quote: { srcChainId: 1, destChainId: 10 } },
+          },
+          transactions: [{ id: 'tx-1' }, { id: 'tx-2' }],
+        },
+      };
+
+      const result = selectBridgeHistoryForToast(
+        state as unknown as BridgeStatusAppState,
+      );
+      expect(Object.keys(result)).toStrictEqual(['tx-1']);
+    });
+  });
+
+  describe('selectNonEvmBridgeSourceTxIds', () => {
+    it('returns ids for cross-chain non-EVM source entries', () => {
+      const solChainId = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
+      const state = {
+        metamask: {
+          txHistory: {
+            // cross-chain, non-EVM source ✅
+            'sol-tx': {
+              quote: { srcChainId: solChainId, destChainId: 10 },
+              originalTransactionId: 'orig-1',
+            },
+            // same-chain, EVM source
+            'evm-tx': { quote: { srcChainId: 1, destChainId: 10 } },
+            // same-chain, non-EVM source
+            'same-chain': {
+              quote: {
+                srcChainId: solChainId,
+                destChainId: solChainId,
+              },
+            },
+          },
+          transactions: [],
+        },
+      };
+
+      const result = selectNonEvmBridgeSourceTxIds(
+        state as unknown as BridgeStatusAppState,
+      );
+      expect(result).toStrictEqual(new Set(['sol-tx', 'orig-1']));
+    });
+  });
+
   describe('selectBridgeHistoryForOriginalTxMetaId', () => {
     it('returns the history item that matches the original transaction id', () => {
       const matchingBridgeHistoryItem = {
diff --git a/ui/ducks/bridge-status/selectors.ts b/ui/ducks/bridge-status/selectors.ts
index 59ec92e54832..313c715c2f93 100644
--- a/ui/ducks/bridge-status/selectors.ts
+++ b/ui/ducks/bridge-status/selectors.ts
@@ -1,3 +1,4 @@
+import { isNonEvmChainId } from '@metamask/bridge-controller';
 import { createSelector } from 'reselect';
 import type {
   BridgeHistoryItem,
@@ -11,6 +12,9 @@ import {
   getInternalAccountsFromGroupById,
   getSelectedAccountGroup,
 } from '../../selectors/multichain-accounts/account-tree';
+import { EMPTY_OBJECT } from '../../selectors/shared';
+import { selectCurrentAccountNonEvmTransactions } from '../../selectors/multichain-transactions';
+import { selectTransactionIds } from '../../selectors/toast';
 
 type BridgeStatusAppState = {
   metamask: BridgeStatusControllerState & TransactionControllerState;
@@ -29,6 +33,10 @@ const selectBridgeHistory = (state: BridgeStatusAppState) =>
 const selectBridgeHistoryForAccount = createSelector(
   [(_, selectedAddresses?: string[]) => selectedAddresses, selectBridgeHistory],
   (selectedAddresses, txHistory) => {
+    if (!txHistory) {
+      return EMPTY_OBJECT as Record<string, BridgeHistoryItem>;
+    }
+
     if (!selectedAddresses || selectedAddresses.length === 0) {
       return txHistory;
     }
@@ -68,6 +76,72 @@ export const selectBridgeHistoryForAccountGroup = createSelector(
   },
 );
 
+export const selectBridgeHistoryForToast = createSelector(
+  [
+    selectBridgeHistoryForAccountGroup,
+    selectCurrentAccountNonEvmTransactions,
+    selectTransactionIds,
+  ],
+  (bridgeHistory, nonEvmTxs, evmTxIds) => {
+    if (!bridgeHistory) {
+      return EMPTY_OBJECT as Record<string, BridgeHistoryItem>;
+    }
+
+    const nonEvmTxIds = new Set(nonEvmTxs.map((tx) => tx.id));
+
+    return Object.entries(bridgeHistory).reduce<
+      Record<string, BridgeHistoryItem>
+    >((acc, [key, item]) => {
+      if (!item.quote) {
+        return acc;
+      }
+      // Same-chain swaps are handled by their respective transaction watchers
+      if (item.quote.srcChainId === item.quote.destChainId) {
+        return acc;
+      }
+      // Only include items whose source transaction exists in transactions
+      const hasMatchingTx = isNonEvmChainId(item.quote.srcChainId)
+        ? nonEvmTxIds.has(key)
+        : evmTxIds.has(key);
+
+      if (hasMatchingTx) {
+        acc[key] = item;
+      }
+      return acc;
+    }, {});
+  },
+);
+
+export const selectNonEvmBridgeSourceTxIds = createSelector(
+  [selectBridgeHistoryForAccountGroup],
+  (bridgeHistory) => {
+    const ids = new Set<string>();
+
+    for (const [key, item] of Object.entries(bridgeHistory ?? {})) {
+      if (!item.quote) {
+        continue;
+      }
+      if (!isNonEvmChainId(item.quote.srcChainId)) {
+        continue;
+      }
+      // Same-chain non-EVM swaps are handled by the non-EVM transaction watcher
+      if (item.quote.srcChainId === item.quote.destChainId) {
+        continue;
+      }
+
+      ids.add(key);
+
+      const { originalTransactionId } = item;
+
+      if (originalTransactionId) {
+        ids.add(originalTransactionId);
+      }
+    }
+
+    return ids;
+  },
+);
+
 // eslint-disable-next-line jsdoc/require-param
 /**
  * @deprecated use selectBridgeHistoryItemForTransactionHash instead
diff --git a/ui/ducks/bridge/actions.ts b/ui/ducks/bridge/actions.ts
index d16f7742b983..96fbdd7955aa 100644
--- a/ui/ducks/bridge/actions.ts
+++ b/ui/ducks/bridge/actions.ts
@@ -78,7 +78,7 @@ const callBridgeControllerMethod = (
 };
 
 // Background actions
-export const resetBridgeControllerAndCache = () => {
+export const resetBridgeController = () => {
   return async (dispatch: MetaMaskReduxDispatch) => {
     dispatch(callBridgeControllerMethod(BridgeBackgroundAction.RESET_STATE));
     await clearAllBridgeCacheItems();
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index c9305fb80b66..116baca090be 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -11,16 +11,17 @@ import { createBridgeMockStore } from '../../../test/data/bridge/mock-bridge-sto
 import { setBackgroundConnection } from '../../store/background-connection';
 import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
 import { SlippageValue } from '../../pages/bridge/utils/slippage-service';
+import * as cacheUtils from '../../pages/bridge/utils/cache';
 import bridgeReducer, { initialState } from './bridge';
 import {
   setFromToken,
   setFromTokenInputValue,
   setToToken,
-  resetInputFields,
   updateQuoteRequestParams,
-  resetBridgeControllerAndCache,
   setWasTxDeclined,
   setSlippage,
+  resetBridgeController,
+  resetInputFields,
 } from './actions';
 
 const middleware = [thunk];
@@ -76,6 +77,7 @@ describe('Ducks - Bridge', () => {
           "chainId": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
           "decimals": 9,
           "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/solana/5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token/So11111111111111111111111111111111111111112.png",
+          "isVerified": undefined,
           "name": "SYMBOL",
           "rwaData": undefined,
           "symbol": "SYMBOL",
@@ -109,6 +111,7 @@ describe('Ducks - Bridge', () => {
         balance: '0',
         chainId: 'eip155:10',
         rwaData: undefined,
+        isVerified: undefined,
         iconUrl:
           'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/10/erc20/0x13341431.png',
       });
@@ -131,7 +134,7 @@ describe('Ducks - Bridge', () => {
   describe('resetInputFields', () => {
     it('resets to initalState', async () => {
       const state = store.getState().bridge;
-      store.dispatch(resetInputFields());
+      store.dispatch(resetInputFields() as never);
       const actions = store.getActions();
       expect(actions[0].type).toStrictEqual('bridge/resetInputFields');
       const newState = bridgeReducer(state, actions[0]);
@@ -204,8 +207,8 @@ describe('Ducks - Bridge', () => {
     });
   });
 
-  describe('resetBridgeState', () => {
-    it('dispatches action to the bridge controller', () => {
+  describe('resetBridgeController', () => {
+    it('dispatches action to the bridge controller', async () => {
       // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const mockStore = configureMockStore<any>(middleware)(
@@ -214,19 +217,23 @@ describe('Ducks - Bridge', () => {
         }),
       );
       const mockResetBridgeState = jest.fn();
+      const mockClearAllBridgeCacheItems = jest.spyOn(
+        cacheUtils,
+        'clearAllBridgeCacheItems',
+      );
       setBackgroundConnection({
         [BridgeBackgroundAction.RESET_STATE]: mockResetBridgeState,
         getStatePatches: jest.fn(),
       } as never);
 
-      mockStore.dispatch(resetBridgeControllerAndCache() as never);
+      await mockStore.dispatch((await resetBridgeController()) as never);
 
       expect(mockResetBridgeState).toHaveBeenCalledTimes(1);
-      expect(mockResetBridgeState).toHaveBeenCalledWith();
       const actions = mockStore.getActions();
       expect(actions.map((action) => action.type)).not.toContain(
         'bridge/resetInputFields',
       );
+      expect(mockClearAllBridgeCacheItems).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index 1cb7a6070c6c..2ddd97d0e113 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -616,6 +616,7 @@ describe('Bridge selectors', () => {
         symbol: 'ETH',
         tokenFiatAmount: undefined,
         rwaData: undefined,
+        isVerified: undefined,
       });
     });
   });
@@ -648,6 +649,7 @@ describe('Bridge selectors', () => {
           "chainId": "eip155:1",
           "decimals": 18,
           "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x567.png",
+          "isVerified": undefined,
           "name": "DEST",
           "rwaData": undefined,
           "symbol": "DEST",
@@ -682,6 +684,7 @@ describe('Bridge selectors', () => {
         symbol: 'mUSD',
         tokenFiatAmount: undefined,
         rwaData: undefined,
+        isVerified: undefined,
       });
     });
 
@@ -749,6 +752,7 @@ describe('Bridge selectors', () => {
         symbol: 'ETH',
         tokenFiatAmount: undefined,
         rwaData: undefined,
+        isVerified: undefined,
       });
     });
   });
@@ -2049,10 +2053,8 @@ describe('Bridge selectors', () => {
           internalAccounts: {
             selectedAccount: MOCK_EVM_ACCOUNT.id,
           },
-          accountTree: {
-            // This account group only has 1 Solana account
-            selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/2',
-          },
+          // This account group only has 1 Solana account
+          selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/2',
         },
       });
 
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 5b41d0513312..a5004c0820c9 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -179,9 +179,7 @@ export const getPriceImpactThresholds = createDeepEqualSelector(
   ],
   (priceImpactThreshold) => ({
     ...(priceImpactThreshold ?? {}),
-    // @ts-expect-error - priceImpactThreshold type has not been updated yet
     warning: priceImpactThreshold?.warning ?? 0.05,
-    // @ts-expect-error - priceImpactThreshold type has not been updated yet
     error: priceImpactThreshold?.error ?? 0.25,
   }),
 );
diff --git a/ui/ducks/bridge/utils.test.ts b/ui/ducks/bridge/utils.test.ts
new file mode 100644
index 000000000000..d2560395da3c
--- /dev/null
+++ b/ui/ducks/bridge/utils.test.ts
@@ -0,0 +1,45 @@
+import { type CaipAssetType } from '@metamask/utils';
+import { toBridgeToken } from './utils';
+
+const BASE_PAYLOAD = {
+  assetId:
+    'eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da' as CaipAssetType,
+  symbol: 'mUSD',
+  name: 'MetaMask USD',
+  decimals: 18,
+};
+
+describe('toBridgeToken', () => {
+  describe('isVerified', () => {
+    it('includes isVerified: true from the payload', () => {
+      const token = toBridgeToken({ ...BASE_PAYLOAD, isVerified: true });
+      expect(token.isVerified).toBe(true);
+    });
+
+    it('includes isVerified: false from the payload', () => {
+      const token = toBridgeToken({ ...BASE_PAYLOAD, isVerified: false });
+      expect(token.isVerified).toBe(false);
+    });
+
+    it('leaves isVerified undefined when absent from the payload', () => {
+      const token = toBridgeToken(BASE_PAYLOAD);
+      expect(token.isVerified).toBeUndefined();
+    });
+
+    it('lets tokenMetadata.isVerified override the payload value', () => {
+      const token = toBridgeToken(
+        { ...BASE_PAYLOAD, isVerified: false },
+        { isVerified: true },
+      );
+      expect(token.isVerified).toBe(true);
+    });
+
+    it('falls back to payload isVerified when tokenMetadata.isVerified is undefined', () => {
+      const token = toBridgeToken(
+        { ...BASE_PAYLOAD, isVerified: true },
+        { balance: '50' },
+      );
+      expect(token.isVerified).toBe(true);
+    });
+  });
+});
diff --git a/ui/ducks/bridge/utils.ts b/ui/ducks/bridge/utils.ts
index aa4e59d45468..a7febbec4ac3 100644
--- a/ui/ducks/bridge/utils.ts
+++ b/ui/ducks/bridge/utils.ts
@@ -207,6 +207,7 @@ export const toBridgeToken = (
     tokenFiatAmount,
     accountType,
     rwaData,
+    isVerified,
   } = payload;
   const { chainId } = parseCaipAssetType(assetId);
   return {
@@ -220,6 +221,7 @@ export const toBridgeToken = (
     tokenFiatAmount: tokenMetadata?.tokenFiatAmount ?? tokenFiatAmount,
     accountType: tokenMetadata?.accountType ?? accountType,
     rwaData: tokenMetadata?.rwaData ?? rwaData,
+    isVerified: tokenMetadata?.isVerified ?? isVerified,
   };
 };
 
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index e802d6d73912..e3af951d5098 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -39,7 +39,6 @@ const initialState = {
   transactions: [],
   networkConfigurations: {},
   addressBook: [],
-  useBlockie: false,
   featureFlags: {},
   currentLocale: '',
   preferences: {
diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts
index bf1df14ed566..018fe2ea7981 100644
--- a/ui/helpers/constants/common.ts
+++ b/ui/helpers/constants/common.ts
@@ -19,18 +19,18 @@ export const PASSWORD_MIN_LENGTH = 8;
 export const OUTDATED_BROWSER_VERSIONS = {
   // Chrome and Edge should match the latest Chrome version released ~2 years ago,
   // or the earliest version that supports our MV3 functionality, whichever is higher
-  chrome: '<113',
-  edge: '<113',
+  chrome: '<123',
+  edge: '<123',
   // Firefox should match the previous extended support release
-  // Current ESR: 128 - first available to ESR 2024/07/09
-  // Previous ESR: 115 - first released to ESR 2023/07/04
-  // per https://whattrainisitnow.com/calendar/firefox ("Click to toggle past releases table data")
-  firefox: '<115',
+  // Current ESR: 140 - first released to ESR 2025/06/24
+  // Previous ESR: 128 - first released to ESR 2024/07/09
+  // per https://whattrainisitnow.com/release/?version=esr
+  firefox: '<128',
   // Opera versions correspond to differently numbered Chromium versions.
   // Opera should be set to the equivalent of the Chromium version set
-  // Opera 99 is based on Chromium 113
+  // Opera 109 is based on Chromium 123
   // See https://en.wikipedia.org/wiki/History_of_the_Opera_web_browser
-  opera: '<99',
+  opera: '<109',
 };
 
 /**
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index d9263f29b811..4db6828099ee 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -14,24 +14,30 @@ export const UNLOCK_ROUTE = '/unlock';
 export const LOCK_ROUTE = '/lock';
 export const ASSET_ROUTE = '/asset';
 export const SETTINGS_ROUTE = '/settings';
-export const SETTINGS_V2_ROUTE = '/settings-v2';
-export const ASSETS_ROUTE = '/settings-v2/assets';
-export const CURRENCY_ROUTE = '/settings-v2/assets/currency';
-export const TRANSACTIONS_ROUTE = '/settings-v2/transactions';
+export const LEGACY_SETTINGS_V2_ROUTE = '/settings-v2';
+export const SETTINGS_V2_ROUTE = SETTINGS_ROUTE;
+export const ASSETS_ROUTE = '/settings/assets';
+export const CURRENCY_ROUTE = '/settings/assets/currency';
+export const TRANSACTIONS_ROUTE = '/settings/transactions';
 export const PREFERENCES_AND_DISPLAY_ROUTE =
-  '/settings-v2/preferences-and-display';
-export const THEME_ROUTE = '/settings-v2/preferences-and-display/theme';
-export const LANGUAGE_ROUTE = '/settings-v2/preferences-and-display/language';
+  '/settings/preferences-and-display';
+export const THEME_ROUTE = '/settings/preferences-and-display/theme';
+export const LANGUAGE_ROUTE = '/settings/preferences-and-display/language';
 export const ACCOUNT_IDENTICON_ROUTE =
-  '/settings-v2/preferences-and-display/account-identicon';
-export const PRIVACY_ROUTE = '/settings-v2/privacy';
-export const THIRD_PARTY_APIS_ROUTE = '/settings-v2/privacy/third-party-apis';
-export const SECURITY_AND_PASSWORD_ROUTE = '/settings-v2/security-and-password';
-export const AUTO_LOCK_ROUTE = '/settings-v2/security-and-password/auto-lock';
-export const DEVELOPER_OPTIONS_V2_ROUTE = '/settings-v2/developer-options';
+  '/settings/preferences-and-display/account-identicon';
+export const PRIVACY_ROUTE = '/settings/privacy';
+export const THIRD_PARTY_APIS_ROUTE = '/settings/privacy/third-party-apis';
+export const SECURITY_AND_PASSWORD_ROUTE = '/settings/security-and-password';
+export const AUTO_LOCK_ROUTE = '/settings/security-and-password/auto-lock';
+export const MANAGE_WALLET_RECOVERY_V2_ROUTE =
+  '/settings/security-and-password/manage-wallet-recovery';
+export const SECURITY_PASSWORD_CHANGE_V2_ROUTE =
+  '/settings/security-and-password/password';
+export const DEVELOPER_TOOLS_ROUTE = '/settings/developer-tools';
+export const DEBUG_ROUTE = '/settings/debug';
 export const GENERAL_ROUTE = '/settings/general';
 export const ADVANCED_ROUTE = '/settings/advanced';
-export const DEVELOPER_OPTIONS_ROUTE = '/settings/developer-options';
+export const DEVELOPER_OPTIONS_ROUTE = DEBUG_ROUTE;
 export const EXPERIMENTAL_ROUTE = '/settings/experimental';
 export const TRANSACTION_SHIELD_ROUTE = '/settings/transaction-shield';
 export const TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE =
@@ -165,6 +171,7 @@ export const PERPS_ROUTE = '/perps';
 export const PERPS_MARKET_DETAIL_ROUTE = '/perps/market';
 export const PERPS_ORDER_ENTRY_ROUTE = '/perps/trade';
 export const PERPS_ACTIVITY_ROUTE = '/perps/activity';
+export const PERPS_WITHDRAW_ROUTE = '/perps/withdraw';
 export const PERPS_MARKET_LIST_ROUTE = '/perps/market-list';
 
 export const SHIELD_PLAN_ROUTE = '/shield-plan';
@@ -197,6 +204,11 @@ export const ROUTES = [
     label: 'Perps Activity',
     trackInAnalytics: true,
   },
+  {
+    path: PERPS_WITHDRAW_ROUTE,
+    label: 'Perps Withdraw',
+    trackInAnalytics: true,
+  },
   {
     path: ACCOUNT_LIST_PAGE_ROUTE,
     label: 'Account List Page',
@@ -229,7 +241,7 @@ export const ROUTES = [
   },
   { path: SETTINGS_ROUTE, label: 'Settings Page', trackInAnalytics: true },
   {
-    path: SETTINGS_V2_ROUTE,
+    path: LEGACY_SETTINGS_V2_ROUTE,
     label: 'Settings V2 Page',
     trackInAnalytics: true,
   },
@@ -239,6 +251,16 @@ export const ROUTES = [
     label: 'Currency Settings Page',
     trackInAnalytics: true,
   },
+  {
+    path: MANAGE_WALLET_RECOVERY_V2_ROUTE,
+    label: 'Manage Wallet Recovery Settings Page',
+    trackInAnalytics: true,
+  },
+  {
+    path: SECURITY_PASSWORD_CHANGE_V2_ROUTE,
+    label: 'Password Settings Page',
+    trackInAnalytics: true,
+  },
   {
     path: PREFERENCES_AND_DISPLAY_ROUTE,
     label: 'Preferences And Display Settings Page',
diff --git a/ui/helpers/constants/transactions.js b/ui/helpers/constants/transactions.js
index 6bfe11563eb8..d03d31e84168 100644
--- a/ui/helpers/constants/transactions.js
+++ b/ui/helpers/constants/transactions.js
@@ -2,6 +2,7 @@ import {
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { SmartTransactionStatus } from '../../../shared/constants/transaction';
 
 export const PENDING_STATUS_HASH = {
   [TransactionStatus.unapproved]: true,
@@ -28,3 +29,33 @@ export const EXCLUDED_TRANSACTION_TYPES = new Set([
   TransactionType.gasPayment,
   TransactionType.relayDeposit,
 ]);
+
+// EVM transaction types excluded from toast notifications
+export const TOAST_EXCLUDED_TRANSACTION_TYPES = new Set([
+  TransactionType.swapApproval,
+  TransactionType.bridgeApproval,
+  TransactionType.bridge,
+  TransactionType.shieldSubscriptionApprove,
+]);
+
+// Non-EVM transaction types excluded from toast notifications.
+export const TOAST_EXCLUDED_NON_EVM_TRANSACTION_TYPES = new Set([
+  'approve',
+  'receive',
+]);
+
+export const TRANSACTION_PENDING_STATUSES = new Set([
+  TransactionStatus.submitted,
+  SmartTransactionStatus.pending,
+]);
+
+export const TRANSACTION_SUCCESS_STATUSES = new Set([
+  TransactionStatus.confirmed,
+  SmartTransactionStatus.success,
+]);
+
+export const TRANSACTION_FAILED_STATUSES = new Set([
+  TransactionStatus.failed,
+  TransactionStatus.dropped,
+  SmartTransactionStatus.cancelled,
+]);
diff --git a/ui/helpers/utils/gas.js b/ui/helpers/utils/gas.js
index d77669e10e29..32df526f3da3 100644
--- a/ui/helpers/utils/gas.js
+++ b/ui/helpers/utils/gas.js
@@ -20,14 +20,19 @@ export const gasEstimateGreaterThanGasUsedPlusTenPercent = (
   gasFeeEstimates,
   estimate,
 ) => {
-  let { maxFeePerGas: maxFeePerGasInTransaction } = gasUsed;
-  maxFeePerGasInTransaction = new BigNumber(
-    hexWEIToDecGWEI(addTenPercentAndRound(maxFeePerGasInTransaction)),
-  );
+  const gasInTransaction = gasUsed?.maxFeePerGas ?? gasUsed?.gasPrice;
+  const bumped = addTenPercentAndRound(gasInTransaction);
+  if (!bumped) {
+    return false;
+  }
+  const bumpedGwei = new BigNumber(hexWEIToDecGWEI(bumped));
 
-  const maxFeePerGasFromEstimate =
-    gasFeeEstimates?.[estimate]?.suggestedMaxFeePerGas;
-  return bnGreaterThan(maxFeePerGasFromEstimate, maxFeePerGasInTransaction);
+  const levelEstimate = gasFeeEstimates?.[estimate];
+  const estimateGwei =
+    typeof levelEstimate === 'object'
+      ? levelEstimate?.suggestedMaxFeePerGas
+      : levelEstimate;
+  return bnGreaterThan(estimateGwei, bumpedGwei);
 };
 
 /**
@@ -117,6 +122,41 @@ export function editGasModeIsSpeedUpOrCancel(editGasMode) {
  * @returns {object} Gas values safe for replacement (at least previousGas × rate).
  */
 export function getGasValuesForReplacement(txParams, previousGas, rate) {
+  // Normalize hex so BigNumber can parse (0x prefix). Values may be 0x-prefixed
+  // or raw hex from .toString(16); addHexPrefix handles both (idempotent with 0x).
+  const hexForBN = (v) =>
+    v === null || v === undefined
+      ? new BigNumber(0)
+      : new BigNumber(addHexPrefix(String(v)));
+
+  const effectiveGasLimit =
+    txParams?.gas ??
+    txParams?.gasLimit ??
+    previousGas?.gas ??
+    previousGas?.gasLimit;
+
+  // Legacy (gasPrice) flow
+  if (previousGas?.gasPrice && !previousGas?.maxFeePerGas) {
+    const minGasPrice = new Numeric(previousGas.gasPrice, 16)
+      .times(new Numeric(rate, 10))
+      .round(0)
+      .toPrefixedHexString();
+
+    const gasPrice = hexForBN(txParams?.gasPrice).gte(
+      new BigNumber(minGasPrice),
+    )
+      ? txParams.gasPrice
+      : minGasPrice;
+
+    return {
+      ...txParams,
+      gasPrice,
+      gas: effectiveGasLimit,
+      gasLimit: effectiveGasLimit,
+    };
+  }
+
+  // EIP-1559 flow
   if (!previousGas?.maxFeePerGas || !previousGas?.maxPriorityFeePerGas) {
     return txParams ?? {};
   }
@@ -132,13 +172,6 @@ export function getGasValuesForReplacement(txParams, previousGas, rate) {
     .round(0)
     .toPrefixedHexString();
 
-  // Normalize hex so BigNumber can parse (0x prefix). Values may be 0x-prefixed
-  // or raw hex from .toString(16); addHexPrefix handles both (idempotent with 0x).
-  const hexForBN = (v) =>
-    v === null || v === undefined
-      ? new BigNumber(0)
-      : new BigNumber(addHexPrefix(String(v)));
-
   const maxFeePerGas = hexForBN(txParams?.maxFeePerGas).gte(
     new BigNumber(previousMaxFeePerGas),
   )
@@ -150,12 +183,6 @@ export function getGasValuesForReplacement(txParams, previousGas, rate) {
     ? txParams.maxPriorityFeePerGas
     : previousMaxPriorityFeePerGas;
 
-  const effectiveGasLimit =
-    txParams?.gas ??
-    txParams?.gasLimit ??
-    previousGas?.gas ??
-    previousGas?.gasLimit;
-
   return {
     ...txParams,
     maxFeePerGas,
diff --git a/ui/helpers/utils/gas.test.js b/ui/helpers/utils/gas.test.js
index 88681a22fa15..5162a50149f5 100644
--- a/ui/helpers/utils/gas.test.js
+++ b/ui/helpers/utils/gas.test.js
@@ -36,6 +36,44 @@ describe('Gas utils', () => {
       });
       expect(result).toStrictEqual(false);
     });
+
+    it('returns false when txParams has no maxFeePerGas and no gasPrice', () => {
+      const result = gasEstimateGreaterThanGasUsedPlusTenPercent(
+        { gas: '0x5208' },
+        { medium: { suggestedMaxFeePerGas: '70' } },
+        PriorityLevels.medium,
+      );
+      expect(result).toBe(false);
+    });
+
+    describe('legacy (gasPrice) txParams', () => {
+      it('returns true when medium estimate > gasPrice + 10%', () => {
+        const result = gasEstimateGreaterThanGasUsedPlusTenPercent(
+          { gasPrice: '0x59682f10' },
+          { medium: '70' },
+          PriorityLevels.medium,
+        );
+        expect(result).toStrictEqual(true);
+      });
+
+      it('returns false when medium estimate < gasPrice + 10%', () => {
+        const result = gasEstimateGreaterThanGasUsedPlusTenPercent(
+          { gasPrice: '0x59682f10' },
+          { medium: '1' },
+          PriorityLevels.medium,
+        );
+        expect(result).toStrictEqual(false);
+      });
+
+      it('handles fee-market estimates with legacy txParams', () => {
+        const result = gasEstimateGreaterThanGasUsedPlusTenPercent(
+          { gasPrice: '0x59682f10' },
+          { medium: { suggestedMaxFeePerGas: '70' } },
+          PriorityLevels.medium,
+        );
+        expect(result).toStrictEqual(true);
+      });
+    });
   });
 
   describe('formatGasFeeOrFeeRange', () => {
@@ -220,5 +258,59 @@ describe('Gas utils', () => {
       expect(result.gas).toBe(result.gasLimit);
       expect(result.gas).toBe('0x5208');
     });
+
+    describe('legacy flow', () => {
+      it('returns min gasPrice when txParams gasPrice is lower than previousGas × rate', () => {
+        const txParams = { gasPrice: '0x5', gas: '0x5208' };
+        const previousGas = { gasPrice: '0x10', gasLimit: '0x5208' };
+        const result = getGasValuesForReplacement(txParams, previousGas, 1.1);
+        const minExpected = Math.ceil(0x10 * 1.1);
+        expect(Number(result.gasPrice)).toBeGreaterThanOrEqual(minExpected);
+        expect(result.gas).toBe('0x5208');
+        expect(result.gasLimit).toBe('0x5208');
+      });
+
+      it('keeps txParams gasPrice when higher than previousGas × rate', () => {
+        const txParams = { gasPrice: '0x100', gas: '0x5208' };
+        const previousGas = { gasPrice: '0x10', gasLimit: '0x5208' };
+        const result = getGasValuesForReplacement(txParams, previousGas, 1.1);
+        expect(result.gasPrice).toBe('0x100');
+      });
+
+      it('returns gasPrice path even with 0x-prefixed large hex values', () => {
+        const seventyGweiHex = '0x104c533c00';
+        const txParams = { gasPrice: seventyGweiHex, gas: '0x5208' };
+        const previousGas = { gasPrice: seventyGweiHex, gasLimit: '0x5208' };
+        const result = getGasValuesForReplacement(txParams, previousGas, 1.1);
+        const minGasPrice = 70 * 1e9 * 1.1;
+        expect(Number(result.gasPrice)).toBeGreaterThanOrEqual(minGasPrice);
+      });
+
+      it('does not enter legacy path when previousGas has maxFeePerGas (EIP-1559)', () => {
+        const txParams = {
+          gasPrice: '0x10',
+          maxFeePerGas: '0x10',
+          maxPriorityFeePerGas: '0x10',
+          gas: '0x5208',
+        };
+        const previousGas = {
+          gasPrice: '0x10',
+          maxFeePerGas: '0x10',
+          maxPriorityFeePerGas: '0x10',
+          gasLimit: '0x5208',
+        };
+        const result = getGasValuesForReplacement(txParams, previousGas, 1.1);
+        expect(result.maxFeePerGas).toBeDefined();
+        expect(result.maxPriorityFeePerGas).toBeDefined();
+      });
+
+      it('returns gas and gasLimit from txParams when available', () => {
+        const txParams = { gasPrice: '0x100', gas: '0xAAAA' };
+        const previousGas = { gasPrice: '0x10', gasLimit: '0xBBBB' };
+        const result = getGasValuesForReplacement(txParams, previousGas, 1.1);
+        expect(result.gas).toBe('0xAAAA');
+        expect(result.gasLimit).toBe('0xAAAA');
+      });
+    });
   });
 });
diff --git a/ui/helpers/utils/reload-extension-from-ui.test.ts b/ui/helpers/utils/reload-extension-from-ui.test.ts
new file mode 100644
index 000000000000..db847040c3b4
--- /dev/null
+++ b/ui/helpers/utils/reload-extension-from-ui.test.ts
@@ -0,0 +1,41 @@
+import browser from 'webextension-polyfill';
+
+import { requestSafeReload } from '../../store/actions';
+import { reloadExtensionFromUi } from './reload-extension-from-ui';
+
+jest.mock('webextension-polyfill', () => ({
+  runtime: { reload: jest.fn() },
+}));
+
+jest.mock('../../store/actions', () => ({
+  requestSafeReload: jest.fn(),
+}));
+
+describe('reloadExtensionFromUi', () => {
+  const requestSafeReloadMock = requestSafeReload as jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    window.close = jest.fn();
+  });
+
+  it('requests safe reload then closes the window', async () => {
+    requestSafeReloadMock.mockResolvedValue(undefined);
+
+    await reloadExtensionFromUi();
+
+    expect(requestSafeReloadMock).toHaveBeenCalledTimes(1);
+    expect(window.close).toHaveBeenCalledTimes(1);
+    expect(browser.runtime.reload).not.toHaveBeenCalled();
+  });
+
+  it('falls back to runtime.reload when the background request fails', async () => {
+    requestSafeReloadMock.mockRejectedValue(new Error('disconnected'));
+
+    await reloadExtensionFromUi();
+
+    expect(requestSafeReloadMock).toHaveBeenCalledTimes(1);
+    expect(browser.runtime.reload).toHaveBeenCalledTimes(1);
+    expect(window.close).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/helpers/utils/reload-extension-from-ui.ts b/ui/helpers/utils/reload-extension-from-ui.ts
new file mode 100644
index 000000000000..27f16d5dcc5a
--- /dev/null
+++ b/ui/helpers/utils/reload-extension-from-ui.ts
@@ -0,0 +1,19 @@
+import browser from 'webextension-polyfill';
+
+import { requestSafeReload } from '../../store/actions';
+
+/**
+ * Reloads the extension from any UI surface (popup, notification, sidepanel, full tab).
+ *
+ * Prefer this over calling `browser.runtime.reload()` directly from UI pages.
+ * `requestSafeReload` schedules reload after a short delay; we then close this
+ * window so Chromium does not reparent it to normal tab content (issue #29151).
+ */
+export async function reloadExtensionFromUi(): Promise<void> {
+  try {
+    await requestSafeReload();
+    window.close();
+  } catch {
+    browser.runtime.reload();
+  }
+}
diff --git a/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.test.ts b/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.test.ts
new file mode 100644
index 000000000000..3abc861e0993
--- /dev/null
+++ b/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.test.ts
@@ -0,0 +1,181 @@
+/* eslint-disable @typescript-eslint/naming-convention, camelcase -- Segment analytics payload keys */
+import {
+  Category,
+  ErrorCode,
+  HardwareWalletError,
+  Severity,
+} from '@metamask/hw-wallet-sdk';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsHardwareWalletDeviceType,
+  MetaMetricsHardwareWalletRecoveryErrorType,
+  MetaMetricsHardwareWalletRecoveryLocation,
+} from '../../../shared/constants/metametrics';
+import {
+  ConnectionStatus,
+  HardwareWalletType,
+} from '../../contexts/hardware-wallets';
+import { resetHardwareWalletRecoveryInlineCtaViewCount } from '../../../shared/lib/hardware-wallet-recovery-metrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from './track-hardware-wallet-recovery-connect-cta-clicked';
+
+describe('trackHardwareWalletRecoveryConnectCtaClicked', () => {
+  const disconnectedState = { status: ConnectionStatus.Disconnected as const };
+
+  beforeEach(() => {
+    resetHardwareWalletRecoveryInlineCtaViewCount();
+  });
+
+  it('fires HardwareWalletRecoveryCtaClicked with full Segment properties when device is disconnected', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: disconnectedState,
+    });
+
+    expect(trackEvent).toHaveBeenCalledTimes(1);
+    expect(trackEvent).toHaveBeenCalledWith({
+      category: MetaMetricsEventCategory.Accounts,
+      event: MetaMetricsEventName.HardwareWalletRecoveryCtaClicked,
+      properties: expect.objectContaining({
+        location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+        device_type: MetaMetricsHardwareWalletDeviceType.Ledger,
+        device_model: 'N/A',
+        error_type:
+          MetaMetricsHardwareWalletRecoveryErrorType.DeviceDisconnected,
+        error_type_view_count: 1,
+        error_code: 'DeviceDisconnected',
+      }),
+    });
+  });
+
+  it('passes the given recovery location into properties', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+      walletType: HardwareWalletType.Trezor,
+      connectionState: disconnectedState,
+    });
+
+    expect(trackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+          device_type: MetaMetricsHardwareWalletDeviceType.Trezor,
+        }),
+      }),
+    );
+  });
+
+  it('uses the connection error when state is ErrorState', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+    const connectionError = new HardwareWalletError('Device disconnected', {
+      code: ErrorCode.DeviceDisconnected,
+      severity: Severity.Err,
+      category: Category.Connection,
+      userMessage: 'Device disconnected',
+    });
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Message,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: {
+        status: ConnectionStatus.ErrorState,
+        error: connectionError,
+      },
+    });
+
+    expect(trackEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          location: MetaMetricsHardwareWalletRecoveryLocation.Message,
+          error_type:
+            MetaMetricsHardwareWalletRecoveryErrorType.DeviceDisconnected,
+          error_code: 'DeviceDisconnected',
+          error_message: 'Device disconnected',
+        }),
+      }),
+    );
+  });
+
+  it('does not call trackEvent when walletType does not map to a Segment device_type', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: null,
+      connectionState: disconnectedState,
+    });
+
+    expect(trackEvent).not.toHaveBeenCalled();
+  });
+
+  it('increments error_type_view_count on repeated CTA for the same error identity', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+    const options = {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: disconnectedState,
+    };
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, options);
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, options);
+
+    expect(trackEvent).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          error_type_view_count: 1,
+        }),
+      }),
+    );
+    expect(trackEvent).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          error_type_view_count: 2,
+        }),
+      }),
+    );
+  });
+
+  it('starts error_type_view_count at 1 again after reset for the same identity', () => {
+    const trackEvent = jest.fn().mockResolvedValue(undefined);
+    const options = {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: disconnectedState,
+    };
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, options);
+    resetHardwareWalletRecoveryInlineCtaViewCount();
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, options);
+
+    expect(trackEvent).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        properties: expect.objectContaining({
+          error_type_view_count: 1,
+        }),
+      }),
+    );
+  });
+
+  it('does not surface errors when trackEvent rejects', async () => {
+    const trackEvent = jest
+      .fn()
+      .mockRejectedValue(new Error('segment unavailable'));
+
+    trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: HardwareWalletType.Ledger,
+      connectionState: disconnectedState,
+    });
+
+    await Promise.resolve();
+    expect(trackEvent).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.ts b/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.ts
new file mode 100644
index 000000000000..6af7a612c450
--- /dev/null
+++ b/ui/helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked.ts
@@ -0,0 +1,90 @@
+import { ErrorCode } from '@metamask/hw-wallet-sdk';
+import type { UITrackEventMethod } from '../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  type MetaMetricsHardwareWalletRecoveryLocation,
+} from '../../../shared/constants/metametrics';
+import {
+  buildHardwareWalletRecoverySegmentProperties,
+  getHardwareWalletMetricDeviceModel,
+  mapHardwareWalletRecoveryErrorType,
+  mapHardwareWalletTypeToMetricDeviceType,
+  nextHardwareWalletRecoveryInlineCtaViewCount,
+} from '../../../shared/lib/hardware-wallet-recovery-metrics';
+import { createHardwareWalletError } from '../../contexts/hardware-wallets/errors';
+import { getHardwareWalletErrorCode } from '../../contexts/hardware-wallets/rpcErrorUtils';
+import {
+  ConnectionStatus,
+  HardwareWalletType,
+  type HardwareWalletConnectionState,
+} from '../../contexts/hardware-wallets/types';
+
+/**
+ * MetaMetrics: {@link MetaMetricsEventName.HardwareWalletRecoveryCtaClicked} when the user
+ * uses a primary “Connect [device]” style CTA while the hardware wallet is not ready
+ * (e.g. bridge submit, confirmation reconnect).
+ *
+ * No-ops when `walletType` is null/undefined or does not map to a Segment `device_type`
+ * (required property). Synthetic errors are only built after those guards.
+ *
+ * `error_type_view_count` increments on each call for the same error identity (location,
+ * wallet type, error code, normalized error type), matching the modal recovery pattern.
+ * It resets when `resetHardwareWalletRecoveryInlineCtaViewCount` runs (e.g. device ready
+ * or full disconnect).
+ * Swallows tracking failures so callers are not blocked.
+ *
+ * @param trackEvent - UI `trackEvent` from {@link MetaMetricsContext}.
+ * @param options - Connect-CTA recovery context.
+ * @param options.location - Segment `location` for the current flow.
+ * @param options.walletType - Active hardware wallet type key, if known.
+ * @param options.connectionState - Current hardware wallet connection state from context.
+ */
+export function trackHardwareWalletRecoveryConnectCtaClicked(
+  trackEvent: UITrackEventMethod,
+  options: {
+    location: MetaMetricsHardwareWalletRecoveryLocation;
+    walletType: HardwareWalletType | null;
+    connectionState: HardwareWalletConnectionState;
+  },
+): void {
+  const { location, walletType, connectionState } = options;
+
+  if (!walletType) {
+    return;
+  }
+
+  const deviceType = mapHardwareWalletTypeToMetricDeviceType(walletType);
+  if (!deviceType) {
+    return;
+  }
+
+  const connectionError =
+    connectionState.status === ConnectionStatus.ErrorState
+      ? connectionState.error
+      : undefined;
+  const errorForMetrics =
+    connectionError ??
+    createHardwareWalletError(ErrorCode.DeviceDisconnected, walletType);
+
+  const errorCode = getHardwareWalletErrorCode(errorForMetrics);
+  const errorType = mapHardwareWalletRecoveryErrorType(errorForMetrics);
+  const errorIdentityKey = `${location}:${walletType}:${String(errorCode)}:${errorType}`;
+  const errorTypeViewCount =
+    nextHardwareWalletRecoveryInlineCtaViewCount(errorIdentityKey);
+
+  trackEvent({
+    category: MetaMetricsEventCategory.Accounts,
+    event: MetaMetricsEventName.HardwareWalletRecoveryCtaClicked,
+    properties: buildHardwareWalletRecoverySegmentProperties({
+      location,
+      deviceType,
+      deviceModel: getHardwareWalletMetricDeviceModel(errorForMetrics),
+      errorType,
+      errorTypeViewCount,
+      error: errorForMetrics,
+    }),
+  }).catch(() => {
+    // Analytics must not block or surface errors to the user.
+  });
+}
diff --git a/ui/helpers/utils/transaction-display.ts b/ui/helpers/utils/transaction-display.ts
new file mode 100644
index 000000000000..a67650cf4c46
--- /dev/null
+++ b/ui/helpers/utils/transaction-display.ts
@@ -0,0 +1,14 @@
+import { useI18nContext } from '../../hooks/useI18nContext';
+
+export type TransactionStatus = 'pending' | 'success' | 'failed';
+
+const statusMessageKeys: Record<TransactionStatus, string> = {
+  pending: 'transactionSubmitted',
+  success: 'transactionConfirmed',
+  failed: 'transactionFailed',
+};
+
+export function useTransactionDisplay(status: TransactionStatus) {
+  const t = useI18nContext();
+  return { title: t(statusMessageKeys[status]) };
+}
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index c0b8bb4e2cf8..524190432d26 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -282,56 +282,56 @@ describe('util', () => {
     });
     it('should return false when given a modern chrome browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.52',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.6312.122 Safari/537.36',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
     });
     it('should return true when given an outdated chrome browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.128 Safari/537.36',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(true);
     });
     it('should return false when given a modern firefox browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
     });
     it('should return true when given an outdated firefox browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(true);
     });
     it('should return false when given a modern opera browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36 OPR/101.0.0.0',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.6312.122 Safari/537.36 OPR/109.0.0.0',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
     });
     it('should return true when given an outdated opera browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.5615.165 Safari/537.36 OPR/98.0.4759.39',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.128 Safari/537.36 OPR/108.0.0.0',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(true);
     });
     it('should return false when given a modern edge browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5672.126 Safari/537.36 Edg/113.0.1774.50',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.2420.81 Safari/537.36 Edg/123.0.2420.81',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
     });
     it('should return true when given an outdated edge browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.3578.98 Safari/537.36 Edge/109.0.416.68',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.2365.92 Safari/537.36 Edg/122.0.2365.92',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(true);
diff --git a/ui/helpers/utils/web-vitals.test.ts b/ui/helpers/utils/web-vitals.test.ts
new file mode 100644
index 000000000000..5758841612b6
--- /dev/null
+++ b/ui/helpers/utils/web-vitals.test.ts
@@ -0,0 +1,518 @@
+// @ts-expect-error suppress CommonJS vs ECMAScript error
+import { onINP, onFCP, onLCP, onCLS } from 'web-vitals/attribution';
+import {
+  initINPObserver,
+  initFCPObserver,
+  initLCPObserver,
+  initCLSObserver,
+  initWebVitals,
+  getWebVitalsMetrics,
+  resetWebVitalsMetrics,
+} from './web-vitals';
+
+jest.mock('web-vitals/attribution', () => ({
+  onINP: jest.fn(),
+  onFCP: jest.fn(),
+  onLCP: jest.fn(),
+  onCLS: jest.fn(),
+}));
+
+const mockOnINP = onINP as jest.Mock;
+const mockOnFCP = onFCP as jest.Mock;
+const mockOnLCP = onLCP as jest.Mock;
+const mockOnCLS = onCLS as jest.Mock;
+
+describe('web-vitals', () => {
+  const originalSentry = globalThis.sentry;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    delete (globalThis as any).sentry;
+    // Reset metrics before each test
+    resetWebVitalsMetrics();
+  });
+
+  afterEach(() => {
+    globalThis.sentry = originalSentry;
+  });
+
+  describe('initINPObserver', () => {
+    it('registers INP callback with reportAllChanges', () => {
+      initINPObserver();
+      expect(mockOnINP).toHaveBeenCalledTimes(1);
+      expect(typeof mockOnINP.mock.calls[0][0]).toBe('function');
+      expect(mockOnINP.mock.calls[0][1]).toEqual({
+        reportAllChanges: true,
+      });
+    });
+
+    it('enriches Sentry with rating tag and attribution for good INP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+
+      // Simulate good INP (< 200ms)
+      callback({
+        value: 150,
+        attribution: {
+          interactionTarget: 'button.submit',
+          interactionType: 'pointer',
+          loadState: 'complete',
+          inputDelay: 10,
+          processingDuration: 100,
+          presentationDelay: 40,
+        },
+      });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('inp.rating', 'good');
+      expect(mockSentry.setContext).toHaveBeenCalledWith(
+        'inp_attribution',
+        expect.objectContaining({
+          interactionTarget: 'button.submit',
+          interactionType: 'pointer',
+        }),
+      );
+      // Good metrics should not add breadcrumb
+      expect(mockSentry.addBreadcrumb).not.toHaveBeenCalled();
+    });
+
+    it('adds warning breadcrumb for poor INP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+
+      // Simulate poor INP (> 500ms)
+      callback({
+        value: 600,
+        attribution: {
+          interactionTarget: 'div.slow-element',
+          interactionType: 'pointer',
+        },
+      });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('inp.rating', 'poor');
+      expect(mockSentry.addBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'performance.inp',
+          level: 'warning',
+        }),
+      );
+    });
+
+    it('handles missing Sentry gracefully', () => {
+      // Sentry not available
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+
+      // Should not throw
+      expect(() => callback({ value: 100, attribution: {} })).not.toThrow();
+    });
+  });
+
+  describe('initFCPObserver', () => {
+    it('registers FCP callback with reportAllChanges', () => {
+      initFCPObserver();
+      expect(mockOnFCP).toHaveBeenCalledTimes(1);
+      expect(typeof mockOnFCP.mock.calls[0][0]).toBe('function');
+      expect(mockOnFCP.mock.calls[0][1]).toEqual({
+        reportAllChanges: true,
+      });
+    });
+
+    it('enriches Sentry with rating tag and attribution for good FCP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initFCPObserver();
+      const callback = mockOnFCP.mock.calls[0][0];
+
+      // Simulate good FCP (< 1800ms)
+      callback({
+        value: 800,
+        attribution: {
+          timeToFirstByte: 5,
+          firstByteToFCP: 795,
+          loadState: 'complete',
+        },
+      });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('fcp.rating', 'good');
+      expect(mockSentry.setContext).toHaveBeenCalledWith(
+        'fcp_attribution',
+        expect.objectContaining({
+          timeToFirstByte: 5,
+          firstByteToFCP: 795,
+        }),
+      );
+      // Good metrics should not add breadcrumb
+      expect(mockSentry.addBreadcrumb).not.toHaveBeenCalled();
+    });
+
+    it('adds warning breadcrumb for poor FCP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initFCPObserver();
+      const callback = mockOnFCP.mock.calls[0][0];
+
+      // Simulate poor FCP (> 3000ms)
+      callback({ value: 4000, attribution: {} });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('fcp.rating', 'poor');
+      expect(mockSentry.addBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'performance.fcp',
+          level: 'warning',
+        }),
+      );
+    });
+  });
+
+  describe('initLCPObserver', () => {
+    it('registers LCP callback with reportAllChanges', () => {
+      initLCPObserver();
+      expect(mockOnLCP).toHaveBeenCalledTimes(1);
+      expect(typeof mockOnLCP.mock.calls[0][0]).toBe('function');
+      expect(mockOnLCP.mock.calls[0][1]).toEqual({
+        reportAllChanges: true,
+      });
+    });
+
+    it('enriches Sentry with rating tag and attribution for good LCP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initLCPObserver();
+      const callback = mockOnLCP.mock.calls[0][0];
+
+      // Simulate good LCP (< 2500ms)
+      callback({
+        value: 2000,
+        attribution: {
+          element: 'div.account-list',
+          url: 'https://metamask.io',
+        },
+      });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('lcp.rating', 'good');
+      expect(mockSentry.setContext).toHaveBeenCalledWith(
+        'lcp_attribution',
+        expect.objectContaining({
+          element: 'div.account-list',
+        }),
+      );
+      // Good metrics should not add breadcrumb
+      expect(mockSentry.addBreadcrumb).not.toHaveBeenCalled();
+    });
+
+    it('adds warning breadcrumb for poor LCP', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initLCPObserver();
+      const callback = mockOnLCP.mock.calls[0][0];
+
+      // Simulate poor LCP (> 4000ms)
+      callback({ value: 5000, attribution: {} });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('lcp.rating', 'poor');
+      expect(mockSentry.addBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'performance.lcp',
+          level: 'warning',
+        }),
+      );
+    });
+  });
+
+  describe('initCLSObserver', () => {
+    it('registers CLS callback with reportAllChanges', () => {
+      initCLSObserver();
+      expect(mockOnCLS).toHaveBeenCalledTimes(1);
+      expect(typeof mockOnCLS.mock.calls[0][0]).toBe('function');
+      expect(mockOnCLS.mock.calls[0][1]).toEqual({
+        reportAllChanges: true,
+      });
+    });
+
+    it('enriches Sentry with rating tag and attribution for good CLS', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initCLSObserver();
+      const callback = mockOnCLS.mock.calls[0][0];
+
+      // Simulate good CLS (< 0.1)
+      callback({
+        value: 0.05,
+        attribution: {
+          largestShiftTarget: 'div.token-list',
+          largestShiftTime: 1000,
+          largestShiftValue: 0.05,
+        },
+      });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('cls.rating', 'good');
+      expect(mockSentry.setContext).toHaveBeenCalledWith(
+        'cls_attribution',
+        expect.objectContaining({
+          largestShiftTarget: 'div.token-list',
+        }),
+      );
+      // Good metrics should not add breadcrumb
+      expect(mockSentry.addBreadcrumb).not.toHaveBeenCalled();
+    });
+
+    it('adds warning breadcrumb for poor CLS', () => {
+      const mockSentry = {
+        setTag: jest.fn(),
+        setContext: jest.fn(),
+        addBreadcrumb: jest.fn(),
+      };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).sentry = mockSentry;
+
+      initCLSObserver();
+      const callback = mockOnCLS.mock.calls[0][0];
+
+      // Simulate poor CLS (> 0.25)
+      callback({ value: 0.3, attribution: {} });
+
+      expect(mockSentry.setTag).toHaveBeenCalledWith('cls.rating', 'poor');
+      expect(mockSentry.addBreadcrumb).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'performance.cls',
+          level: 'warning',
+        }),
+      );
+    });
+  });
+
+  describe('initWebVitals', () => {
+    it('initializes all observers', () => {
+      initWebVitals();
+
+      expect(mockOnINP).toHaveBeenCalledTimes(1);
+      expect(mockOnFCP).toHaveBeenCalledTimes(1);
+      expect(mockOnLCP).toHaveBeenCalledTimes(1);
+      expect(mockOnCLS).toHaveBeenCalledTimes(1);
+    });
+
+    it('registers getter/resetter on stateHooks when available', () => {
+      const originalEnv = process.env.IN_TEST;
+      const originalStateHooks = globalThis.stateHooks;
+      process.env.IN_TEST = 'true';
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (globalThis as any).stateHooks = {};
+
+      initWebVitals();
+
+      expect(globalThis.stateHooks.getWebVitalsMetrics).toBe(
+        getWebVitalsMetrics,
+      );
+      expect(globalThis.stateHooks.resetWebVitalsMetrics).toBe(
+        resetWebVitalsMetrics,
+      );
+
+      process.env.IN_TEST = originalEnv;
+      globalThis.stateHooks = originalStateHooks;
+    });
+  });
+
+  describe('getWebVitalsMetrics', () => {
+    it('returns initial null values', () => {
+      const metrics = getWebVitalsMetrics();
+
+      expect(metrics).toEqual({
+        inp: null,
+        fcp: null,
+        lcp: null,
+        cls: null,
+        inpRating: null,
+        fcpRating: null,
+        lcpRating: null,
+        clsRating: null,
+      });
+    });
+
+    it('returns stored INP value after callback fires', () => {
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+
+      callback({ value: 150, attribution: {} });
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.inp).toBe(150);
+      expect(metrics.inpRating).toBe('good');
+    });
+
+    it('returns stored LCP value after callback fires', () => {
+      initLCPObserver();
+      const callback = mockOnLCP.mock.calls[0][0];
+
+      callback({ value: 2000, attribution: {} });
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.lcp).toBe(2000);
+      expect(metrics.lcpRating).toBe('good');
+    });
+
+    it('returns stored FCP value after callback fires', () => {
+      initFCPObserver();
+      const callback = mockOnFCP.mock.calls[0][0];
+
+      callback({ value: 800, attribution: {} });
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.fcp).toBe(800);
+      expect(metrics.fcpRating).toBe('good');
+    });
+
+    it('returns stored CLS value after callback fires', () => {
+      initCLSObserver();
+      const callback = mockOnCLS.mock.calls[0][0];
+
+      callback({ value: 0.05, attribution: {} });
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.cls).toBe(0.05);
+      expect(metrics.clsRating).toBe('good');
+    });
+
+    it('returns copy of metrics to prevent mutation', () => {
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+      callback({ value: 150, attribution: {} });
+
+      const metrics1 = getWebVitalsMetrics();
+      metrics1.inp = 999;
+
+      const metrics2 = getWebVitalsMetrics();
+      expect(metrics2.inp).toBe(150);
+    });
+  });
+
+  describe('resetWebVitalsMetrics', () => {
+    it('resets all metrics to null', () => {
+      // First populate metrics
+      initINPObserver();
+      initLCPObserver();
+      initCLSObserver();
+
+      const inpCallback = mockOnINP.mock.calls[0][0];
+      const lcpCallback = mockOnLCP.mock.calls[0][0];
+      const clsCallback = mockOnCLS.mock.calls[0][0];
+
+      inpCallback({ value: 150, attribution: {} });
+      lcpCallback({ value: 2000, attribution: {} });
+      clsCallback({ value: 0.05, attribution: {} });
+
+      // Verify metrics are populated
+      let metrics = getWebVitalsMetrics();
+      expect(metrics.inp).toBe(150);
+      expect(metrics.lcp).toBe(2000);
+      expect(metrics.cls).toBe(0.05);
+
+      // Reset and verify
+      resetWebVitalsMetrics();
+
+      metrics = getWebVitalsMetrics();
+      expect(metrics).toEqual({
+        inp: null,
+        fcp: null,
+        lcp: null,
+        cls: null,
+        inpRating: null,
+        fcpRating: null,
+        lcpRating: null,
+        clsRating: null,
+      });
+    });
+  });
+
+  describe('metrics storage with ratings', () => {
+    it('stores needs-improvement INP rating', () => {
+      initINPObserver();
+      const callback = mockOnINP.mock.calls[0][0];
+
+      callback({ value: 300, attribution: {} }); // 200-500ms is needs-improvement
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.inp).toBe(300);
+      expect(metrics.inpRating).toBe('needs-improvement');
+    });
+
+    it('stores needs-improvement FCP rating', () => {
+      initFCPObserver();
+      const callback = mockOnFCP.mock.calls[0][0];
+
+      callback({ value: 2500, attribution: {} }); // 1800-3000ms is needs-improvement
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.fcp).toBe(2500);
+      expect(metrics.fcpRating).toBe('needs-improvement');
+    });
+
+    it('stores poor LCP rating', () => {
+      initLCPObserver();
+      const callback = mockOnLCP.mock.calls[0][0];
+
+      callback({ value: 5000, attribution: {} }); // > 4000ms is poor
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.lcp).toBe(5000);
+      expect(metrics.lcpRating).toBe('poor');
+    });
+
+    it('stores needs-improvement CLS rating', () => {
+      initCLSObserver();
+      const callback = mockOnCLS.mock.calls[0][0];
+
+      callback({ value: 0.15, attribution: {} }); // 0.1-0.25 is needs-improvement
+
+      const metrics = getWebVitalsMetrics();
+      expect(metrics.cls).toBe(0.15);
+      expect(metrics.clsRating).toBe('needs-improvement');
+    });
+  });
+});
diff --git a/ui/helpers/utils/web-vitals.ts b/ui/helpers/utils/web-vitals.ts
new file mode 100644
index 000000000000..7566db269d13
--- /dev/null
+++ b/ui/helpers/utils/web-vitals.ts
@@ -0,0 +1,404 @@
+/**
+ * Core Web Vitals instrumentation using the web-vitals library.
+ *
+ * Provides utilities to measure INP, FCP, LCP, and CLS using the attribution
+ * build which shows which element/script caused each metric.
+ *
+ * IMPORTANT: On `chrome-extension://` pages, Chrome does not emit
+ * `PerformancePaintTiming` (`first-paint`, `first-contentful-paint`) or
+ * `largest-contentful-paint` entries. `PerformanceNavigationTiming.responseStart`
+ * is also 0 for local extension files. As a result,
+ * `browserTracingIntegration` in `setupSentry.js` cannot capture LCP, FCP,
+ * CLS, or TTFB on production extension pages (confirmed: 19.5M pageload
+ * transactions with zero web vitals measurements in Sentry). The
+ * `onLCP`/`onCLS` callbacks below may not fire in production either, as
+ * they depend on the same `PerformanceObserver` entry types. `onINP` uses
+ * `PerformanceEventTiming` which IS supported on extension pages, so INP
+ * may still report in production.
+ *
+ * All observers use `{ reportAllChanges: true }` so callbacks fire on every
+ * metric update rather than only on page visibility change. This is required
+ * for E2E benchmark collection (pages stay visible throughout the test run)
+ * and also ensures production Sentry enrichment happens as interactions occur
+ * rather than being deferred until tab switch.
+ *
+ * @see https://github.com/GoogleChrome/web-vitals
+ * @see https://web.dev/articles/inp
+ * @see https://web.dev/articles/lcp
+ * @see https://web.dev/articles/cls
+ */
+
+import type {
+  INPMetricWithAttribution,
+  LCPMetricWithAttribution,
+  CLSMetricWithAttribution,
+  FCPMetricWithAttribution,
+  // @ts-expect-error suppress CommonJS vs ECMAScript error
+} from 'web-vitals/attribution';
+// @ts-expect-error suppress CommonJS vs ECMAScript error
+import { onINP, onLCP, onCLS, onFCP } from 'web-vitals/attribution';
+import type { WebVitalsMetrics } from '../../../shared/constants/benchmarks';
+
+/**
+ * Stored web vitals metrics for E2E benchmark retrieval.
+ * Exposed via stateHooks.getWebVitalsMetrics() in test mode.
+ */
+const webVitalsMetrics: WebVitalsMetrics = {
+  inp: null,
+  fcp: null,
+  lcp: null,
+  cls: null,
+  inpRating: null,
+  fcpRating: null,
+  lcpRating: null,
+  clsRating: null,
+};
+
+/** INP threshold for "good" rating in milliseconds */
+const INP_GOOD_THRESHOLD_MS = 200;
+
+/** INP threshold for "needs improvement" rating in milliseconds */
+const INP_NEEDS_IMPROVEMENT_THRESHOLD_MS = 500;
+
+/** LCP threshold for "good" rating in milliseconds */
+const LCP_GOOD_THRESHOLD_MS = 2500;
+
+/** LCP threshold for "needs improvement" rating in milliseconds */
+const LCP_NEEDS_IMPROVEMENT_THRESHOLD_MS = 4000;
+
+/** FCP threshold for "good" rating in milliseconds */
+const FCP_GOOD_THRESHOLD_MS = 1800;
+
+/** FCP threshold for "needs improvement" rating in milliseconds */
+const FCP_NEEDS_IMPROVEMENT_THRESHOLD_MS = 3000;
+
+/** CLS threshold for "good" rating (unitless) */
+const CLS_GOOD_THRESHOLD = 0.1;
+
+/** CLS threshold for "needs improvement" rating (unitless) */
+const CLS_NEEDS_IMPROVEMENT_THRESHOLD = 0.25;
+
+/**
+ * Get rating based on thresholds.
+ *
+ * @param value
+ * @param goodThreshold
+ * @param needsImprovementThreshold
+ */
+function getRating(
+  value: number,
+  goodThreshold: number,
+  needsImprovementThreshold: number,
+): 'good' | 'needs-improvement' | 'poor' {
+  if (value <= goodThreshold) {
+    return 'good';
+  }
+  if (value <= needsImprovementThreshold) {
+    return 'needs-improvement';
+  }
+  return 'poor';
+}
+
+/**
+ * Enrich Sentry scope with web vitals context.
+ *
+ * Numeric measurements are NOT sent here. On `chrome-extension://` pages,
+ * `browserTracingIntegration` cannot capture web vitals because Chrome does
+ * not emit paint performance entries for the `chrome-extension://` protocol.
+ * Benchmark measurements are handled separately by `send-to-sentry.ts`.
+ *
+ * This function adds contextual data when callbacks do fire:
+ * - Rating tags for filtering (e.g. `inp.rating:poor`)
+ * - Attribution context (which element/interaction caused the metric)
+ * - Breadcrumbs on poor/needs-improvement metrics for error correlation
+ *
+ * @param name - Metric name (INP, LCP, CLS)
+ * @param value - Metric value for breadcrumb message formatting
+ * @param unit - Display unit for breadcrumb message ('millisecond' | 'none')
+ * @param rating - Rating classification
+ * @param attribution - Attribution data from web-vitals library
+ */
+function enrichSentryWithWebVitals(
+  name: string,
+  value: number,
+  unit: 'millisecond' | 'none',
+  rating: string,
+  attribution?: Record<string, unknown>,
+): void {
+  const { sentry } = globalThis;
+  if (!sentry) {
+    return;
+  }
+
+  // Set rating tag for filtering (e.g. inp.rating:poor in Sentry Discover)
+  sentry.setTag?.(`${name.toLowerCase()}.rating`, rating);
+
+  // Set attribution context if available
+  if (attribution && Object.keys(attribution).length > 0) {
+    sentry.setContext?.(`${name.toLowerCase()}_attribution`, attribution);
+  }
+
+  // Add breadcrumb for poor metrics — enriches the next error event
+  if (rating === 'poor' || rating === 'needs-improvement') {
+    sentry.addBreadcrumb?.({
+      category: `performance.${name.toLowerCase()}`,
+      message: `${name}: ${value}${unit === 'millisecond' ? 'ms' : ''} (${rating})`,
+      level: rating === 'poor' ? 'warning' : 'info',
+      data: attribution,
+    });
+  }
+}
+
+/**
+ * Initialize INP (Interaction to Next Paint) observer.
+ *
+ * INP measures how long it takes for the page to respond to user interactions.
+ * It's a Core Web Vital that replaced FID in 2024.
+ *
+ * Unlike LCP/CLS, INP uses `PerformanceEventTiming` entries which ARE
+ * supported on `chrome-extension://` pages, so this observer may fire in
+ * production when users interact with the extension popup.
+ *
+ * @see https://web.dev/articles/inp
+ */
+export function initINPObserver(): void {
+  try {
+    onINP(
+      (metric: INPMetricWithAttribution) => {
+        const { value, attribution } = metric;
+        const rating = getRating(
+          value,
+          INP_GOOD_THRESHOLD_MS,
+          INP_NEEDS_IMPROVEMENT_THRESHOLD_MS,
+        );
+
+        webVitalsMetrics.inp = value;
+        webVitalsMetrics.inpRating = rating;
+
+        const attributionData: Record<string, unknown> = {};
+        if (attribution) {
+          attributionData.interactionTarget =
+            attribution.interactionTarget ?? null;
+          attributionData.interactionType = attribution.interactionType ?? null;
+          attributionData.loadState = attribution.loadState ?? null;
+          attributionData.inputDelay = attribution.inputDelay ?? null;
+          attributionData.processingDuration =
+            attribution.processingDuration ?? null;
+          attributionData.presentationDelay =
+            attribution.presentationDelay ?? null;
+        }
+
+        enrichSentryWithWebVitals(
+          'INP',
+          value,
+          'millisecond',
+          rating,
+          attributionData,
+        );
+      },
+      { reportAllChanges: true },
+    );
+  } catch (error) {
+    console.warn('[Performance] Failed to initialize INP observer:', error);
+  }
+}
+
+/**
+ * Initialize FCP (First Contentful Paint) observer.
+ *
+ * FCP measures when the first content (text, image, canvas) is painted.
+ * On the sidepanel (`sidepanel.html`), Chrome emits `PerformancePaintTiming`
+ * entries so FCP fires (~55% of pageloads, 800ms–1.05s typical). On popup
+ * pages (`home.html`, `notification.html`), paint entries are not emitted.
+ *
+ * @see https://web.dev/articles/fcp
+ */
+export function initFCPObserver(): void {
+  try {
+    onFCP(
+      (metric: FCPMetricWithAttribution) => {
+        const { value, attribution } = metric;
+        const rating = getRating(
+          value,
+          FCP_GOOD_THRESHOLD_MS,
+          FCP_NEEDS_IMPROVEMENT_THRESHOLD_MS,
+        );
+
+        webVitalsMetrics.fcp = value;
+        webVitalsMetrics.fcpRating = rating;
+
+        const attributionData: Record<string, unknown> = {};
+        if (attribution) {
+          attributionData.timeToFirstByte = attribution.timeToFirstByte ?? null;
+          attributionData.firstByteToFCP = attribution.firstByteToFCP ?? null;
+          attributionData.loadState = attribution.loadState ?? null;
+        }
+
+        enrichSentryWithWebVitals(
+          'FCP',
+          value,
+          'millisecond',
+          rating,
+          attributionData,
+        );
+      },
+      { reportAllChanges: true },
+    );
+  } catch (error) {
+    console.warn('[Performance] Failed to initialize FCP observer:', error);
+  }
+}
+
+/**
+ * Initialize LCP (Largest Contentful Paint) observer.
+ *
+ * LCP measures when the largest content element finishes rendering.
+ * For extensions, this is typically the account list or balance display.
+ *
+ * NOTE: Chrome does not emit `largest-contentful-paint` entries on
+ * `chrome-extension://` pages. This observer will not fire in production
+ * but does fire during CI E2E benchmark runs.
+ *
+ * @see https://web.dev/articles/lcp
+ */
+export function initLCPObserver(): void {
+  try {
+    onLCP(
+      (metric: LCPMetricWithAttribution) => {
+        const { value, attribution } = metric;
+        const rating = getRating(
+          value,
+          LCP_GOOD_THRESHOLD_MS,
+          LCP_NEEDS_IMPROVEMENT_THRESHOLD_MS,
+        );
+
+        webVitalsMetrics.lcp = value;
+        webVitalsMetrics.lcpRating = rating;
+
+        const attributionData: Record<string, unknown> = {};
+        if (attribution) {
+          attributionData.element = attribution.element ?? null;
+          attributionData.url = attribution.url ?? null;
+        }
+
+        enrichSentryWithWebVitals(
+          'LCP',
+          value,
+          'millisecond',
+          rating,
+          attributionData,
+        );
+      },
+      { reportAllChanges: true },
+    );
+  } catch (error) {
+    console.warn('[Performance] Failed to initialize LCP observer:', error);
+  }
+}
+
+/**
+ * Initialize CLS (Cumulative Layout Shift) observer.
+ *
+ * CLS measures unexpected movement of visible elements.
+ * Values >0.1 indicate visual instability.
+ *
+ * NOTE: CLS depends on `layout-shift` entries. On `chrome-extension://`
+ * pages, CLS observation is unreliable — even if `layout-shift` entries
+ * are emitted, `browserTracingIntegration` deletes CLS when FCP is missing.
+ * This observer primarily fires during CI E2E benchmark runs.
+ *
+ * @see https://web.dev/articles/cls
+ */
+export function initCLSObserver(): void {
+  try {
+    onCLS(
+      (metric: CLSMetricWithAttribution) => {
+        const { value, attribution } = metric;
+        const rating = getRating(
+          value,
+          CLS_GOOD_THRESHOLD,
+          CLS_NEEDS_IMPROVEMENT_THRESHOLD,
+        );
+
+        webVitalsMetrics.cls = value;
+        webVitalsMetrics.clsRating = rating;
+
+        const attributionData: Record<string, unknown> = {};
+        if (attribution) {
+          attributionData.largestShiftTarget =
+            attribution.largestShiftTarget ?? null;
+          attributionData.largestShiftTime =
+            attribution.largestShiftTime ?? null;
+          attributionData.largestShiftValue =
+            attribution.largestShiftValue ?? null;
+        }
+
+        enrichSentryWithWebVitals(
+          'CLS',
+          value,
+          'none',
+          rating,
+          attributionData,
+        );
+      },
+      { reportAllChanges: true },
+    );
+  } catch (error) {
+    console.warn('[Performance] Failed to initialize CLS observer:', error);
+  }
+}
+
+/**
+ * Initialize all Web Vitals observers.
+ *
+ * Sets up INP, FCP, LCP, and CLS measurement with attribution.
+ * On `chrome-extension://` pages, INP fires on all page types.
+ * FCP and LCP fire on the sidepanel (~55% of pageloads). CLS is
+ * unreliable on extension pages. All four fire during CI E2E
+ * benchmark runs where data is collected via
+ * `stateHooks.getWebVitalsMetrics()`.
+ *
+ * Also registers getter/resetter on `stateHooks` if available. This
+ * must happen here (at call time) rather than at module evaluation
+ * time, because `globalThis.stateHooks` may not exist when the
+ * module is first evaluated.
+ */
+export function initWebVitals(): void {
+  initINPObserver();
+  initFCPObserver();
+  initLCPObserver();
+  initCLSObserver();
+
+  if (
+    (process.env.IN_TEST || process.env.METAMASK_DEBUG) &&
+    globalThis.stateHooks
+  ) {
+    globalThis.stateHooks.getWebVitalsMetrics = getWebVitalsMetrics;
+    globalThis.stateHooks.resetWebVitalsMetrics = resetWebVitalsMetrics;
+  }
+}
+
+/**
+ * Get the current web vitals metrics.
+ * Returns a copy of the stored metrics to prevent mutation.
+ *
+ * @returns Current web vitals metrics
+ */
+export function getWebVitalsMetrics(): WebVitalsMetrics {
+  return { ...webVitalsMetrics };
+}
+
+/**
+ * Reset web vitals metrics to initial state.
+ * Useful for clearing metrics between benchmark runs.
+ */
+export function resetWebVitalsMetrics(): void {
+  webVitalsMetrics.inp = null;
+  webVitalsMetrics.fcp = null;
+  webVitalsMetrics.lcp = null;
+  webVitalsMetrics.cls = null;
+  webVitalsMetrics.inpRating = null;
+  webVitalsMetrics.fcpRating = null;
+  webVitalsMetrics.lcpRating = null;
+  webVitalsMetrics.clsRating = null;
+}
diff --git a/ui/hooks/bridge/__snapshots__/usePrefillFromSearchQuery.test.ts.snap b/ui/hooks/bridge/__snapshots__/usePrefillFromSearchQuery.test.ts.snap
index b13b2ebb25d6..797684366b60 100644
--- a/ui/hooks/bridge/__snapshots__/usePrefillFromSearchQuery.test.ts.snap
+++ b/ui/hooks/bridge/__snapshots__/usePrefillFromSearchQuery.test.ts.snap
@@ -29,6 +29,7 @@ exports[`usePrefillFromSearchQuery should only set dest token 1`] = `
     "chainId": "eip155:59144",
     "decimals": 6,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d.png",
+    "isVerified": undefined,
     "name": "USDC",
     "rwaData": undefined,
     "symbol": "USDC",
@@ -46,6 +47,7 @@ exports[`usePrefillFromSearchQuery should only set src token and amount 1`] = `
     "chainId": "eip155:59144",
     "decimals": 6,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d.png",
+    "isVerified": undefined,
     "name": "USDC",
     "rwaData": undefined,
     "symbol": "USDC",
@@ -66,6 +68,7 @@ exports[`usePrefillFromSearchQuery should set evm bridge params 1`] = `
     "chainId": "eip155:59144",
     "decimals": 6,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d.png",
+    "isVerified": undefined,
     "name": "USDC",
     "rwaData": undefined,
     "symbol": "USDC",
@@ -80,6 +83,7 @@ exports[`usePrefillFromSearchQuery should set evm bridge params 1`] = `
     "chainId": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
     "decimals": 9,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/solana/5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44/501.png",
+    "isVerified": undefined,
     "name": "Solana",
     "rwaData": undefined,
     "symbol": "SOL",
@@ -97,6 +101,7 @@ exports[`usePrefillFromSearchQuery should set solana swap params 1`] = `
     "chainId": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
     "decimals": 9,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/solana/5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v.png",
+    "isVerified": undefined,
     "name": "Solana",
     "rwaData": undefined,
     "symbol": "USDC",
@@ -110,6 +115,7 @@ exports[`usePrefillFromSearchQuery should set solana swap params 1`] = `
     "chainId": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
     "decimals": 9,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/solana/5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44/501.png",
+    "isVerified": undefined,
     "name": "Solana",
     "rwaData": undefined,
     "symbol": "SOL",
@@ -127,6 +133,7 @@ exports[`usePrefillFromSearchQuery should set src token after navigating from ER
     "chainId": "eip155:59144",
     "decimals": 6,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d.png",
+    "isVerified": undefined,
     "name": "USDC",
     "rwaData": undefined,
     "symbol": "USDC",
@@ -146,6 +153,7 @@ exports[`usePrefillFromSearchQuery should set src token after navigating from na
     "chainId": "eip155:59144",
     "decimals": 18,
     "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/slip44/60.png",
+    "isVerified": undefined,
     "name": "Ethereum",
     "rwaData": undefined,
     "symbol": "ETH",
diff --git a/ui/hooks/bridge/useBridgeNavigation.ts b/ui/hooks/bridge/useBridgeNavigation.ts
index d7e4431cd62b..5eba2b0b1b83 100644
--- a/ui/hooks/bridge/useBridgeNavigation.ts
+++ b/ui/hooks/bridge/useBridgeNavigation.ts
@@ -34,8 +34,8 @@ import { getBridgeState } from '../../ducks/bridge/selectors';
 import type { MinimalAsset } from '../../pages/bridge/utils/tokens';
 import type { BridgeState, BridgeToken } from '../../ducks/bridge/types';
 import {
+  resetBridgeController,
   trackUnifiedSwapBridgeEvent,
-  resetBridgeControllerAndCache,
 } from '../../ducks/bridge/actions';
 
 export type BridgeNavigationOptions = Omit<NavigateOptions, 'state'> & {
@@ -57,7 +57,7 @@ export type BridgeNavigationOptions = Omit<NavigateOptions, 'state'> & {
         })
       | null;
     /**
-     * If this is set, the user will not be redirected back to the home page regardless of
+     * If this is set, the user will be redirected back to the home page regardless of
      * the presence of a bridgeState or token. Used to prevent redirecting back to the bridge
      * page after transaction submission.
      */
@@ -243,7 +243,7 @@ export const useBridgeNavigation = () => {
   }, [state]);
 
   const navigateToDefaultRoute = useCallback(async () => {
-    dispatch(resetBridgeControllerAndCache());
+    dispatch(resetBridgeController());
     const isFromTransactionShield = new URLSearchParams(search || '').get(
       BridgeQueryParams.IsFromTransactionShield,
     );
diff --git a/ui/hooks/bridge/useBridging.test.ts b/ui/hooks/bridge/useBridging.test.ts
index 43a8bda19713..f87af5ca14e0 100644
--- a/ui/hooks/bridge/useBridging.test.ts
+++ b/ui/hooks/bridge/useBridging.test.ts
@@ -36,6 +36,8 @@ jest.mock('react-redux', () => ({
       mockDispatch(...args),
 }));
 
+const resetInputFieldsSpy = jest.spyOn(bridgeActions, 'resetInputFields');
+
 const MOCK_METAMETRICS_ID = '0xtestMetaMetricsId';
 const BRIDGE_PREPARE_PATH = `${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`;
 
@@ -139,7 +141,10 @@ describe('useBridging', () => {
           .spyOn(bridgeActions, 'trackUnifiedSwapBridgeEvent')
           .mockImplementation((...args: unknown[]) => jest.fn()(...args));
         const resetBridgeControllerAndCacheSpy = jest
-          .spyOn(bridgeActions, 'resetBridgeControllerAndCache')
+          .spyOn(bridgeActions, 'resetInputFields')
+          .mockImplementation((...args: unknown[]) => jest.fn()(...args));
+        const resetBridgeControllerSpy = jest
+          .spyOn(bridgeActions, 'resetBridgeController')
           .mockImplementation((...args: unknown[]) => jest.fn()(...args));
         const openTabSpy = jest.spyOn(global.platform, 'openTab');
         const { result } = renderUseBridging(
@@ -184,13 +189,8 @@ describe('useBridging', () => {
 
         result.current.openBridgeExperience(location, token, isSwap);
 
-        expect(mockDispatch.mock.calls.length).toStrictEqual(4);
-        expect(mockDispatch.mock.calls[0]).toStrictEqual([
-          {
-            payload: undefined,
-            type: 'bridge/resetInputFields',
-          },
-        ]);
+        expect(mockDispatch.mock.calls.length).toStrictEqual(3);
+        expect(resetInputFieldsSpy).toHaveBeenCalledTimes(0);
         expect(trackUnifiedSwapBridgeEventSpy.mock.calls).toStrictEqual([
           [
             UnifiedSwapBridgeEventName.ButtonClicked,
@@ -363,7 +363,7 @@ describe('useBridging', () => {
           .spyOn(bridgeActions, 'trackUnifiedSwapBridgeEvent')
           .mockImplementation((...args: unknown[]) => jest.fn()(...args));
         const resetBridgeControllerAndCacheSpy = jest
-          .spyOn(bridgeActions, 'resetBridgeControllerAndCache')
+          .spyOn(bridgeActions, 'resetInputFields')
           .mockImplementation((...args: unknown[]) => jest.fn()(...args));
         const openTabSpy = jest.spyOn(global.platform, 'openTab');
         jest
@@ -415,13 +415,8 @@ describe('useBridging', () => {
 
         result.current.openBridgeExperience(location, token, true);
 
-        expect(mockDispatch.mock.calls.length).toStrictEqual(4);
-        expect(mockDispatch.mock.calls[0]).toStrictEqual([
-          {
-            payload: undefined,
-            type: 'bridge/resetInputFields',
-          },
-        ]);
+        expect(resetInputFieldsSpy).toHaveBeenCalledTimes(0);
+        expect(mockDispatch.mock.calls.length).toStrictEqual(3);
         expect(trackUnifiedSwapBridgeEventSpy.mock.calls).toStrictEqual([
           [
             UnifiedSwapBridgeEventName.ButtonClicked,
diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
index 79cf9e2b6a49..d3544a2f29ad 100644
--- a/ui/hooks/bridge/useBridging.ts
+++ b/ui/hooks/bridge/useBridging.ts
@@ -19,7 +19,6 @@ import {
   getLastSelectedChainId,
 } from '../../ducks/bridge/selectors';
 import {
-  resetBridgeControllerAndCache,
   resetInputFields,
   trackUnifiedSwapBridgeEvent,
 } from '../../ducks/bridge/actions';
@@ -73,8 +72,7 @@ const useBridging = () => {
         chainId: GenericQuoteRequest['srcChainId'];
       },
     ) => {
-      dispatch(resetInputFields());
-      dispatch(resetBridgeControllerAndCache());
+      !bridgeState && dispatch(resetInputFields());
       trace({
         name: TraceName.SwapViewLoaded,
         startTime: Date.now(),
diff --git a/ui/hooks/bridge/usePrefillFromBridgeState.test.ts b/ui/hooks/bridge/usePrefillFromBridgeState.test.ts
index 600a0d6e9f8f..338fbfff4f56 100644
--- a/ui/hooks/bridge/usePrefillFromBridgeState.test.ts
+++ b/ui/hooks/bridge/usePrefillFromBridgeState.test.ts
@@ -5,6 +5,7 @@ import { createBridgeMockStore } from '../../../test/data/bridge/mock-bridge-sto
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { mockNetworkState } from '../../../test/stub/networks';
 
+import * as environmentTypeUtils from '../../../shared/lib/environment-type';
 import mockBridgeQuotesErc20Erc20 from '../../../test/data/bridge/mock-quotes-erc20-erc20.json';
 import { setBackgroundConnection } from '../../store/background-connection';
 import { usePrefillFromBridgeState } from './usePrefillFromBridgeState';
@@ -87,6 +88,7 @@ describe('usePrefillFromBridgeState', () => {
           "chainId": "eip155:59144",
           "decimals": 6,
           "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d.png",
+          "isVerified": undefined,
           "name": "USDC",
           "rwaData": undefined,
           "symbol": "USDC",
@@ -100,6 +102,9 @@ describe('usePrefillFromBridgeState', () => {
   });
 
   it('should restore inputs from quote', async () => {
+    jest
+      .spyOn(environmentTypeUtils, 'getEnvironmentType')
+      .mockReturnValue('popup');
     const mockStoreState = createBridgeMockStore({
       bridgeStateOverrides: {
         quotes: mockBridgeQuotesErc20Erc20 as unknown as QuoteResponse[],
@@ -146,6 +151,7 @@ describe('usePrefillFromBridgeState', () => {
           "chainId": "eip155:10",
           "decimals": 6,
           "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/10/erc20/0x0b2c639c533813f4aa9d7837caf62653d097ff85.png",
+          "isVerified": undefined,
           "name": "USD Coin",
           "rwaData": undefined,
           "symbol": "USDC",
@@ -159,6 +165,7 @@ describe('usePrefillFromBridgeState', () => {
           "chainId": "eip155:137",
           "decimals": 6,
           "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/137/erc20/0x3c499c542cef5e3811e1192ce70d8cc03d5c3359.png",
+          "isVerified": undefined,
           "name": "Native USD Coin (POS)",
           "rwaData": undefined,
           "symbol": "USDC",
@@ -168,7 +175,7 @@ describe('usePrefillFromBridgeState', () => {
     `);
   });
 
-  it('should reset controller when there is no quote or navigation state', async () => {
+  it('should not reset controller when there is no quote or navigation state', async () => {
     const resetState = jest.fn();
     setBackgroundConnection({
       resetState,
@@ -211,6 +218,6 @@ describe('usePrefillFromBridgeState', () => {
     });
 
     renderUseBridgeQueryParams(mockStoreState);
-    expect(resetState).toHaveBeenCalledTimes(1);
+    expect(resetState).not.toHaveBeenCalled();
   });
 });
diff --git a/ui/hooks/bridge/usePrefillFromBridgeState.ts b/ui/hooks/bridge/usePrefillFromBridgeState.ts
index dfaed8ed74cb..f840abdb8675 100644
--- a/ui/hooks/bridge/usePrefillFromBridgeState.ts
+++ b/ui/hooks/bridge/usePrefillFromBridgeState.ts
@@ -1,9 +1,12 @@
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { formatChainIdToCaip } from '@metamask/bridge-controller';
+import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
+import { getEnvironmentType } from '../../../shared/lib/environment-type';
 import {
   rehydrateBridgeStore,
-  resetBridgeControllerAndCache,
+  resetBridgeController,
+  resetInputFields,
   restoreQuoteRequestFromState,
   setFromToken,
   setToToken,
@@ -27,10 +30,13 @@ export const usePrefillFromBridgeState = () => {
   const { resetLocationState, token, bridgeState } = useBridgeNavigation();
 
   const shouldRehydrateFromLocationState = bridgeState || token;
-  const shouldRestoreInputsFromQuote = !bridgeState && activeQuote;
+  const envType = getEnvironmentType();
+  const isPopup = envType === ENVIRONMENT_TYPE_POPUP;
+  const shouldRestoreInputsFromQuote = !bridgeState && activeQuote && isPopup;
 
   const resetControllerAndCache = () => {
-    dispatch(resetBridgeControllerAndCache());
+    dispatch(resetBridgeController());
+    dispatch(resetInputFields());
   };
 
   useEffect(() => {
@@ -68,9 +74,6 @@ export const usePrefillFromBridgeState = () => {
       resetLocationState();
     } else if (shouldRestoreInputsFromQuote) {
       dispatch(restoreQuoteRequestFromState(activeQuote));
-    } else {
-      // Reset controller and cache on load if there's no restored active quote or token object
-      resetControllerAndCache();
     }
 
     // Reset controller and inputs before unloading the page
diff --git a/ui/hooks/perps/index.ts b/ui/hooks/perps/index.ts
index 7e43c23c001d..2b0399d1126c 100644
--- a/ui/hooks/perps/index.ts
+++ b/ui/hooks/perps/index.ts
@@ -23,3 +23,12 @@ export type {
   UsePerpsMarginCalculationsReturn,
   MarginRiskAssessment,
 } from './usePerpsMarginCalculations';
+
+export {
+  estimateLiquidationPrice,
+  liquidationDistancePercent,
+  maintenanceMarginRateFromMaxLeverage,
+  safeDenominator,
+  MARGIN_ADJUSTMENT_CONFIG,
+} from './marginUtils';
+export type { EstimateLiquidationPriceParams } from './marginUtils';
diff --git a/ui/hooks/perps/marginUtils.test.ts b/ui/hooks/perps/marginUtils.test.ts
new file mode 100644
index 000000000000..106079ba1bc9
--- /dev/null
+++ b/ui/hooks/perps/marginUtils.test.ts
@@ -0,0 +1,117 @@
+import {
+  estimateLiquidationPrice,
+  liquidationDistancePercent,
+  maintenanceMarginRateFromMaxLeverage,
+  safeDenominator,
+  MARGIN_ADJUSTMENT_CONFIG,
+} from './marginUtils';
+
+describe('marginUtils (mobile parity)', () => {
+  describe('safeDenominator', () => {
+    it('replaces near-zero values with epsilon', () => {
+      expect(safeDenominator(0)).toBe(1e-12);
+      expect(safeDenominator(1e-13)).toBe(1e-12);
+    });
+  });
+
+  describe('maintenanceMarginRateFromMaxLeverage', () => {
+    it('returns 1 / maxLeverage', () => {
+      expect(maintenanceMarginRateFromMaxLeverage(20)).toBe(0.05);
+    });
+
+    it('uses fallback when leverage is invalid', () => {
+      expect(maintenanceMarginRateFromMaxLeverage(0)).toBe(
+        1 / MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage,
+      );
+    });
+  });
+
+  describe('liquidationDistancePercent', () => {
+    it('returns 20% when mark is 100000 and liq is 80000', () => {
+      expect(liquidationDistancePercent(100000, 80000)).toBe(20);
+    });
+
+    it('returns 0 when mark is 0', () => {
+      expect(liquidationDistancePercent(0, 80000)).toBe(0);
+    });
+
+    it('returns 0 when liq is null or 0', () => {
+      expect(liquidationDistancePercent(100000, null)).toBe(0);
+      expect(liquidationDistancePercent(100000, 0)).toBe(0);
+    });
+  });
+
+  describe('estimateLiquidationPrice', () => {
+    const base = {
+      anchorLiquidationPrice: 2400,
+      currentMargin: 2000,
+      positionSize: 2,
+      maxLeverage: 20,
+    };
+
+    it('returns anchor when newMargin is 0', () => {
+      expect(
+        estimateLiquidationPrice({
+          ...base,
+          newMargin: 0,
+          isLong: true,
+        }),
+      ).toBe(2400);
+    });
+
+    it('returns anchor when positionSize is 0', () => {
+      expect(
+        estimateLiquidationPrice({
+          ...base,
+          newMargin: 2000,
+          positionSize: 0,
+          isLong: true,
+        }),
+      ).toBe(2400);
+    });
+
+    it('returns anchor when margin delta is 0', () => {
+      expect(
+        estimateLiquidationPrice({
+          ...base,
+          newMargin: 2000,
+          isLong: true,
+        }),
+      ).toBe(2400);
+    });
+
+    it('moves long estimated liq down when margin increases (safer direction)', () => {
+      const atAnchor = estimateLiquidationPrice({
+        ...base,
+        newMargin: 2000,
+        isLong: true,
+      });
+      const added = estimateLiquidationPrice({
+        ...base,
+        newMargin: 2500,
+        isLong: true,
+      });
+      expect(added).toBeLessThan(atAnchor);
+    });
+
+    it('moves short estimated liq up when margin increases', () => {
+      const atAnchor = estimateLiquidationPrice({
+        anchorLiquidationPrice: 2600,
+        currentMargin: 2000,
+        newMargin: 2000,
+        positionSize: 2,
+        isLong: false,
+        maxLeverage: 20,
+      });
+      const added = estimateLiquidationPrice({
+        anchorLiquidationPrice: 2600,
+        currentMargin: 2000,
+        newMargin: 2500,
+        positionSize: 2,
+        isLong: false,
+        maxLeverage: 20,
+      });
+      expect(added).toBeGreaterThan(atAnchor);
+    });
+  });
+});
diff --git a/ui/hooks/perps/marginUtils.ts b/ui/hooks/perps/marginUtils.ts
index a4889314d3e3..0f0e4d029cfb 100644
--- a/ui/hooks/perps/marginUtils.ts
+++ b/ui/hooks/perps/marginUtils.ts
@@ -1,14 +1,19 @@
 /**
  * Margin adjustment calculation utilities for the edit-margin UI.
- * Mirrors the logic from @metamask/perps-controller (not exported from package).
+ * Kept aligned with MetaMask mobile `marginUtils` / `usePerpsAdjustMarginData`:
+ * Hyperliquid transfer-margin rules for removable cap, anchored liquidation estimate
+ * using maintenance margin derived from asset max leverage, and distance from mark.
  *
  * HyperLiquid: transfer_margin_required = max(initial_margin_required, 0.1 × total_position_value)
  * See: https://hyperliquid.gitbook.io/hyperliquid-docs/trading/margin-and-pnl
+ *
+ * Limitation: Post-trade liquidation price may differ slightly from this estimate; the
+ * anchor is the venue-reported `liquidationPrice` for the open position.
  */
 
 /**
  * Margin adjustment configuration constants
- * Mirrored from @metamask/perps-controller
+ * Mirrored from @metamask/perps-controller / mobile
  */
 export const MARGIN_ADJUSTMENT_CONFIG = {
   LiquidationRiskThreshold: 1.2, // 20% buffer before liquidation - triggers danger state
@@ -41,14 +46,124 @@ export type CalculateMaxRemovableMarginParams = {
   notionalValue?: number;
 };
 
-export type CalculateNewLiquidationPriceParams = {
+/** Parameters for {@link estimateLiquidationPrice} (mobile parity). */
+export type EstimateLiquidationPriceParams = {
+  /** Venue-reported liquidation price for the position (anchor). */
+  anchorLiquidationPrice: number;
+  currentMargin: number;
   newMargin: number;
+  /** Absolute position size (coins). */
   positionSize: number;
-  entryPrice: number;
   isLong: boolean;
-  currentLiquidationPrice: number;
+  /** Asset max leverage from market metadata; drives maintenance margin rate. */
+  maxLeverage: number;
 };
 
+/**
+ * Avoid division by zero in liquidation adjustment denominator.
+ *
+ * @param value - Divisor value
+ * @param epsilon - Minimum absolute magnitude
+ * @returns `value` or signed `epsilon` when too close to zero
+ */
+export function safeDenominator(value: number, epsilon = 1e-12): number {
+  if (!Number.isFinite(value)) {
+    return epsilon;
+  }
+  return Math.abs(value) < epsilon ? epsilon : value;
+}
+
+/**
+ * Maintenance margin rate from asset max leverage: `1 / maxLeverage` (initial margin at max).
+ *
+ * @param maxLeverage - Market max leverage for the asset
+ * @returns Rate in (0, 1], or fallback when invalid
+ */
+export function maintenanceMarginRateFromMaxLeverage(
+  maxLeverage: number,
+): number {
+  const fallback = 1 / (MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage as number);
+  if (!Number.isFinite(maxLeverage) || maxLeverage <= 0) {
+    return fallback;
+  }
+  return 1 / maxLeverage;
+}
+
+/**
+ * Liquidation distance as % of mark: `|mark − liq| / mark × 100`.
+ * Returns 0 when mark is 0 or liq is null/0 (UI fallback per parity spec).
+ *
+ * @param markPrice - Live mark / current price for the symbol
+ * @param liquidationPrice - Liquidation price (anchor or estimate)
+ * @returns Distance in percent
+ */
+export function liquidationDistancePercent(
+  markPrice: number,
+  liquidationPrice: number | null,
+): number {
+  if (
+    liquidationPrice === null ||
+    !Number.isFinite(liquidationPrice) ||
+    !Number.isFinite(markPrice) ||
+    markPrice === 0 ||
+    liquidationPrice === 0
+  ) {
+    return 0;
+  }
+  return (Math.abs(markPrice - liquidationPrice) / markPrice) * 100;
+}
+
+/**
+ * Estimated liquidation price after margin change, anchored to the provider-reported
+ * liquidation price and adjusted by margin delta (mobile `estimateLiquidationPrice`).
+ *
+ * Short-circuit: if `newMargin === 0` or `positionSize === 0`, returns the anchor.
+ * Invalid numeric inputs return `anchorLiquidationPrice` (same as mobile guard clauses).
+ *
+ * @param params - Anchor, margins, size, side, max leverage
+ * @returns Estimated price ≥ 0
+ */
+export function estimateLiquidationPrice(
+  params: EstimateLiquidationPriceParams,
+): number {
+  const {
+    anchorLiquidationPrice,
+    currentMargin,
+    newMargin,
+    positionSize,
+    isLong,
+    maxLeverage,
+  } = params;
+
+  if (
+    !Number.isFinite(anchorLiquidationPrice) ||
+    !Number.isFinite(currentMargin) ||
+    !Number.isFinite(newMargin) ||
+    !Number.isFinite(positionSize) ||
+    !Number.isFinite(maxLeverage)
+  ) {
+    return anchorLiquidationPrice;
+  }
+
+  if (newMargin === 0 || positionSize === 0) {
+    return anchorLiquidationPrice;
+  }
+
+  const leverage =
+    maxLeverage > 0
+      ? maxLeverage
+      : (MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage as number);
+  const maintenanceMarginRate = maintenanceMarginRateFromMaxLeverage(leverage);
+  const oneMinusMmr = 1 - maintenanceMarginRate;
+  const denom = safeDenominator(positionSize * oneMinusMmr);
+
+  const marginDelta = newMargin - currentMargin;
+  const directionMultiplier = isLong ? -1 : 1;
+  const adjustment = (marginDelta / denom) * directionMultiplier;
+  const estimated = anchorLiquidationPrice + adjustment;
+  return Math.max(0, estimated);
+}
+
 /**
  * Assess liquidation risk after margin removal.
  *
@@ -141,38 +256,3 @@ export function calculateMaxRemovableMargin(
   );
   return Math.max(0, currentMargin - transferMarginRequired);
 }
-
-/**
- * Calculate new liquidation price after margin adjustment.
- *
- * @param params - The parameters for calculating new liquidation price
- * @returns The new liquidation price after the margin adjustment
- */
-export function calculateNewLiquidationPrice(
-  params: CalculateNewLiquidationPriceParams,
-): number {
-  const {
-    newMargin,
-    positionSize,
-    entryPrice,
-    isLong,
-    currentLiquidationPrice,
-  } = params;
-
-  if (
-    Number.isNaN(newMargin) ||
-    Number.isNaN(positionSize) ||
-    Number.isNaN(entryPrice) ||
-    newMargin <= 0 ||
-    positionSize <= 0 ||
-    entryPrice <= 0
-  ) {
-    return currentLiquidationPrice;
-  }
-
-  const marginPerUnit = newMargin / positionSize;
-  if (isLong) {
-    return Math.max(0, entryPrice - marginPerUnit);
-  }
-  return entryPrice + marginPerUnit;
-}
diff --git a/ui/hooks/perps/usePerpsMarginCalculations.test.ts b/ui/hooks/perps/usePerpsMarginCalculations.test.ts
index 499e4097929c..4f77bfad9436 100644
--- a/ui/hooks/perps/usePerpsMarginCalculations.test.ts
+++ b/ui/hooks/perps/usePerpsMarginCalculations.test.ts
@@ -69,7 +69,22 @@ describe('usePerpsMarginCalculations', () => {
       expect(result.current.isValid).toBe(false);
     });
 
-    it('computes currentLiquidationDistance from position', () => {
+    it('estimated liquidation equals anchor when adjustment amount is zero', () => {
+      const { result } = renderHook(() =>
+        usePerpsMarginCalculations({
+          position,
+          currentPrice,
+          account,
+          mode: 'add',
+          amount: '0',
+        }),
+      );
+
+      const anchor = parseFloat(position.liquidationPrice ?? '0');
+      expect(result.current.estimatedLiquidationPrice).toBe(anchor);
+    });
+
+    it('computes anchor liquidation distance from mark and anchor liq', () => {
       const { result } = renderHook(() =>
         usePerpsMarginCalculations({
           position,
@@ -82,7 +97,7 @@ describe('usePerpsMarginCalculations', () => {
 
       const liqPrice = parseFloat(position.liquidationPrice ?? '0');
       const expected = (Math.abs(currentPrice - liqPrice) / currentPrice) * 100;
-      expect(result.current.currentLiquidationDistance).toBeCloseTo(expected);
+      expect(result.current.anchorLiquidationDistance).toBeCloseTo(expected);
     });
   });
 
@@ -159,7 +174,7 @@ describe('usePerpsMarginCalculations', () => {
       liquidationPrice: null as string | null,
     };
 
-    it('returns currentLiquidationDistance 0', () => {
+    it('returns anchorLiquidationDistance 0', () => {
       const { result } = renderHook(() =>
         usePerpsMarginCalculations({
           position: positionNoLiq,
@@ -170,10 +185,10 @@ describe('usePerpsMarginCalculations', () => {
         }),
       );
 
-      expect(result.current.currentLiquidationDistance).toBe(0);
+      expect(result.current.anchorLiquidationDistance).toBe(0);
     });
 
-    it('returns newLiquidationPrice null when current liq is null', () => {
+    it('returns estimatedLiquidationPrice null when anchor liq is null', () => {
       const { result } = renderHook(() =>
         usePerpsMarginCalculations({
           position: positionNoLiq,
@@ -184,7 +199,7 @@ describe('usePerpsMarginCalculations', () => {
         }),
       );
 
-      expect(result.current.newLiquidationPrice).toBeNull();
+      expect(result.current.estimatedLiquidationPrice).toBeNull();
     });
   });
 });
diff --git a/ui/hooks/perps/usePerpsMarginCalculations.ts b/ui/hooks/perps/usePerpsMarginCalculations.ts
index db2e4110f5ed..e533a22807b9 100644
--- a/ui/hooks/perps/usePerpsMarginCalculations.ts
+++ b/ui/hooks/perps/usePerpsMarginCalculations.ts
@@ -2,7 +2,8 @@ import { useMemo } from 'react';
 import type { Position, AccountState } from '@metamask/perps-controller';
 import {
   calculateMaxRemovableMargin,
-  calculateNewLiquidationPrice,
+  estimateLiquidationPrice,
+  liquidationDistancePercent,
   assessMarginRemovalRisk,
   MARGIN_ADJUSTMENT_CONFIG,
 } from './marginUtils';
@@ -12,6 +13,7 @@ export type { MarginRiskAssessment } from './marginUtils';
 
 export type UsePerpsMarginCalculationsParams = {
   position: Position;
+  /** Live mark / current price for the symbol (extension: chart or market tick). */
   currentPrice: number;
   account: AccountState | null;
   mode: 'add' | 'remove';
@@ -20,20 +22,25 @@ export type UsePerpsMarginCalculationsParams = {
 
 export type UsePerpsMarginCalculationsReturn = {
   maxAmount: number;
-  newLiquidationPrice: number | null;
-  currentLiquidationDistance: number;
-  newLiquidationDistance: number | null;
+  /** Parsed `position.liquidationPrice` from provider (anchor). */
+  anchorLiquidationPrice: number | null;
+  /** `estimateLiquidationPrice` after applying adjustment amount. */
+  estimatedLiquidationPrice: number | null;
+  /** `liquidationDistancePercent(currentPrice, anchor)`. */
+  anchorLiquidationDistance: number;
+  /** `liquidationDistancePercent(currentPrice, estimated)` when estimated is finite. */
+  estimatedLiquidationDistance: number | null;
   riskAssessment: MarginRiskAssessment | null;
   isValid: boolean;
 };
 
 /**
- * Compute max addable/removable margin, new liquidation price, distances, and risk.
- * Used by the edit margin expandable to drive the info panel and validation.
+ * Compute max addable/removable margin, anchored + estimated liquidation, distances, and risk.
+ * Parity with mobile `usePerpsAdjustMarginData` / `marginUtils.estimateLiquidationPrice`.
  *
  * @param options0 - The hook parameters
  * @param options0.position - The current position to adjust margin for
- * @param options0.currentPrice - The current market price
+ * @param options0.currentPrice - Live price for distance (mark)
  * @param options0.account - The user's account state (null if not loaded)
  * @param options0.mode - Whether adding or removing margin
  * @param options0.amount - The margin adjustment amount as a string
@@ -47,19 +54,27 @@ export function usePerpsMarginCalculations({
   amount,
 }: UsePerpsMarginCalculationsParams): UsePerpsMarginCalculationsReturn {
   return useMemo(() => {
-    const currentMargin = parseFloat(position.marginUsed) || 0;
-    const positionSize = Math.abs(parseFloat(position.size)) || 0;
-    const entryPrice = parseFloat(position.entryPrice) || 0;
+    const currentMargin = Number.parseFloat(position.marginUsed) || 0;
+    const positionSize = Math.abs(Number.parseFloat(position.size)) || 0;
+    const entryPrice = Number.parseFloat(position.entryPrice) || 0;
     const positionLeverage =
       position.leverage?.value ?? MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage;
-    const currentLiqPrice = position.liquidationPrice
-      ? parseFloat(position.liquidationPrice)
-      : null;
-    const isLong = parseFloat(position.size) >= 0;
+    const maxLeverageForFormula =
+      position.maxLeverage ?? MARGIN_ADJUSTMENT_CONFIG.FallbackMaxLeverage;
+
+    let anchorLiquidationPrice: number | null = null;
+    if (position.liquidationPrice) {
+      const parsed = Number.parseFloat(position.liquidationPrice);
+      if (Number.isFinite(parsed)) {
+        anchorLiquidationPrice = parsed;
+      }
+    }
+
+    const isLong = Number.parseFloat(position.size) >= 0;
     const availableBalance = account
-      ? parseFloat(account.availableBalance) || 0
+      ? Number.parseFloat(account.availableBalance) || 0
       : 0;
-    const notionalValue = parseFloat(position.positionValue) || 0;
+    const notionalValue = Number.parseFloat(position.positionValue) || 0;
 
     const maxAmount =
       mode === 'add'
@@ -76,44 +91,48 @@ export function usePerpsMarginCalculations({
             }),
           );
 
-    const amountNum = parseFloat(amount) || 0;
+    const amountNum = Number.parseFloat(amount.replaceAll(',', '')) || 0;
     const newMargin =
-      mode === 'add' ? currentMargin + amountNum : currentMargin - amountNum;
+      mode === 'add'
+        ? currentMargin + amountNum
+        : Math.max(0, currentMargin - amountNum);
 
-    let newLiquidationPrice: number | null = null;
-    if (currentLiqPrice !== null && newMargin > 0 && positionSize > 0) {
-      newLiquidationPrice = calculateNewLiquidationPrice({
+    let estimatedLiquidationPrice: number | null = null;
+    if (anchorLiquidationPrice !== null) {
+      estimatedLiquidationPrice = estimateLiquidationPrice({
+        anchorLiquidationPrice,
+        currentMargin,
         newMargin,
         positionSize,
-        entryPrice,
         isLong,
-        currentLiquidationPrice: currentLiqPrice,
+        maxLeverage: maxLeverageForFormula,
       });
     }
 
-    const currentLiquidationDistance =
-      currentPrice > 0 && currentLiqPrice !== null
-        ? (Math.abs(currentPrice - currentLiqPrice) / currentPrice) * 100
-        : 0;
+    const anchorLiquidationDistance = liquidationDistancePercent(
+      currentPrice,
+      anchorLiquidationPrice,
+    );
 
-    let newLiquidationDistance: number | null = null;
+    let estimatedLiquidationDistance: number | null = null;
     if (
-      currentPrice > 0 &&
-      newLiquidationPrice !== null &&
-      Number.isFinite(newLiquidationPrice)
+      estimatedLiquidationPrice !== null &&
+      Number.isFinite(estimatedLiquidationPrice)
     ) {
-      newLiquidationDistance =
-        (Math.abs(currentPrice - newLiquidationPrice) / currentPrice) * 100;
+      estimatedLiquidationDistance = liquidationDistancePercent(
+        currentPrice,
+        estimatedLiquidationPrice,
+      );
     }
 
     let riskAssessment: MarginRiskAssessment | null = null;
     if (
       mode === 'remove' &&
-      newLiquidationPrice !== null &&
-      Number.isFinite(newLiquidationPrice)
+      estimatedLiquidationPrice !== null &&
+      Number.isFinite(estimatedLiquidationPrice)
     ) {
       riskAssessment = assessMarginRemovalRisk({
-        newLiquidationPrice,
+        newLiquidationPrice: estimatedLiquidationPrice,
         currentPrice,
         isLong,
       });
@@ -127,9 +146,10 @@ export function usePerpsMarginCalculations({
 
     return {
       maxAmount,
-      newLiquidationPrice,
-      currentLiquidationDistance,
-      newLiquidationDistance,
+      anchorLiquidationPrice,
+      estimatedLiquidationPrice,
+      anchorLiquidationDistance,
+      estimatedLiquidationDistance,
       riskAssessment,
       isValid,
     };
@@ -140,6 +160,7 @@ export function usePerpsMarginCalculations({
     position.positionValue,
     position.leverage?.value,
     position.liquidationPrice,
+    position.maxLeverage,
     currentPrice,
     account,
     mode,
diff --git a/ui/hooks/perps/usePerpsOrderForm.test.ts b/ui/hooks/perps/usePerpsOrderForm.test.ts
index 793e68bb48ac..93290aa6a021 100644
--- a/ui/hooks/perps/usePerpsOrderForm.test.ts
+++ b/ui/hooks/perps/usePerpsOrderForm.test.ts
@@ -1,6 +1,7 @@
 import { act } from '@testing-library/react-hooks';
-import { renderHookWithProvider } from '../../../test/lib/render-helpers-navigate';
+
 import mockState from '../../../test/data/mock-state.json';
+import { renderHookWithProvider } from '../../../test/lib/render-helpers-navigate';
 import { usePerpsOrderForm } from './usePerpsOrderForm';
 
 describe('usePerpsOrderForm', () => {
@@ -28,7 +29,7 @@ describe('usePerpsOrderForm', () => {
         asset: 'BTC',
         direction: 'long',
         amount: '',
-        leverage: 1,
+        leverage: 3,
         type: 'market',
         autoCloseEnabled: false,
         takeProfitPrice: '',
@@ -45,6 +46,59 @@ describe('usePerpsOrderForm', () => {
       expect(result.current.closePercent).toBe(100);
     });
 
+    it('uses initialLeverage when provided for new orders', () => {
+      const { result } = renderHookWithProvider(
+        () =>
+          usePerpsOrderForm({
+            ...defaultOptions,
+            initialLeverage: 7,
+          }),
+        mockStateWithLocale,
+      );
+
+      expect(result.current.formState.leverage).toBe(7);
+    });
+
+    it('applies initialLeverage when it changes after initial render (async hydration)', () => {
+      const props = {
+        ...defaultOptions,
+        initialLeverage: undefined as number | undefined,
+      };
+      const { result, rerender } = renderHookWithProvider(
+        () => usePerpsOrderForm(props),
+        mockStateWithLocale,
+      );
+
+      expect(result.current.formState.leverage).toBe(3);
+
+      props.initialLeverage = 8;
+      act(() => {
+        rerender();
+      });
+
+      expect(result.current.formState.leverage).toBe(8);
+    });
+
+    it('ignores initialLeverage in modify mode (uses position leverage)', () => {
+      const existingPosition = {
+        size: '1.0',
+        leverage: 5,
+        entryPrice: '44000',
+      };
+      const { result } = renderHookWithProvider(
+        () =>
+          usePerpsOrderForm({
+            ...defaultOptions,
+            mode: 'modify',
+            existingPosition,
+            initialLeverage: 10,
+          }),
+        mockStateWithLocale,
+      );
+
+      expect(result.current.formState.leverage).toBe(5);
+    });
+
     it('initializes with short direction when specified', () => {
       const { result } = renderHookWithProvider(
         () =>
@@ -331,6 +385,28 @@ describe('usePerpsOrderForm', () => {
         initialPositionSize,
       );
     });
+
+    it('uses dot-decimal limit price correctly in calculations', () => {
+      const { result } = renderHookWithProvider(
+        () =>
+          usePerpsOrderForm({
+            ...defaultOptions,
+            orderType: 'limit',
+          }),
+        mockState,
+      );
+
+      act(() => {
+        result.current.handleAmountChange('1000');
+      });
+
+      act(() => {
+        result.current.handleLimitPriceChange('45050.00');
+      });
+
+      expect(result.current.calculations.positionSize).toContain('BTC');
+      expect(result.current.calculations.orderValue).toBe('$3,000.00');
+    });
   });
 
   describe('order type prop', () => {
diff --git a/ui/hooks/perps/usePerpsOrderForm.ts b/ui/hooks/perps/usePerpsOrderForm.ts
index f3daf0b61ddb..c9e14423e9ba 100644
--- a/ui/hooks/perps/usePerpsOrderForm.ts
+++ b/ui/hooks/perps/usePerpsOrderForm.ts
@@ -1,16 +1,17 @@
-import { useState, useCallback, useMemo, useEffect, useRef } from 'react';
 import type { OrderType } from '@metamask/perps-controller';
-import { useFormatters } from '../useFormatters';
-import type {
-  OrderFormState,
-  OrderMode,
-  ExistingPositionData,
-} from '../../components/app/perps/order-entry/order-entry.types';
+import { useState, useCallback, useMemo, useEffect, useRef } from 'react';
+
 import {
   mockOrderFormDefaults,
   calculatePositionSize,
   estimateLiquidationPrice,
 } from '../../components/app/perps/order-entry/order-entry.mocks';
+import type {
+  OrderFormState,
+  OrderMode,
+  ExistingPositionData,
+} from '../../components/app/perps/order-entry/order-entry.types';
+import { useFormatters } from '../useFormatters';
 
 export type UsePerpsOrderFormOptions = {
   /** Asset symbol */
@@ -31,6 +32,8 @@ export type UsePerpsOrderFormOptions = {
   onSubmit?: (formState: OrderFormState) => void;
   /** Order type: 'market' or 'limit' (defaults to 'market') */
   orderType?: OrderType;
+  /** Initial leverage for new orders (e.g. last used leverage for this market) */
+  initialLeverage?: number;
 };
 
 export type UsePerpsOrderFormReturn = {
@@ -43,6 +46,7 @@ export type UsePerpsOrderFormReturn = {
     positionSize: string | null;
     marginRequired: string | null;
     liquidationPrice: string | null;
+    liquidationPriceRaw: number | null;
     orderValue: string | null;
     estimatedFees: string | null;
   };
@@ -84,6 +88,7 @@ export type UsePerpsOrderFormReturn = {
  * @param options.onFormStateChange - Callback when form state changes
  * @param options.onSubmit - Callback when order is submitted
  * @param options.orderType - Order type: 'market' or 'limit'
+ * @param options.initialLeverage
  * @returns Form state, handlers, and calculated values
  */
 export function usePerpsOrderForm({
@@ -96,6 +101,7 @@ export function usePerpsOrderForm({
   onFormStateChange,
   onSubmit,
   orderType = 'market',
+  initialLeverage,
 }: UsePerpsOrderFormOptions): UsePerpsOrderFormReturn {
   const { formatCurrencyWithMinThreshold, formatTokenQuantity } =
     useFormatters();
@@ -139,6 +145,7 @@ export function usePerpsOrderForm({
       asset,
       direction: initialDirection,
       type: orderType,
+      ...(initialLeverage !== undefined && { leverage: initialLeverage }),
     };
   });
 
@@ -166,6 +173,7 @@ export function usePerpsOrderForm({
     asset: string;
     initialDirection: 'long' | 'short';
     existingPositionDigest: string | undefined;
+    initialLeverage: number | undefined;
   } | null>(null);
   useEffect(() => {
     const existingPositionDigest =
@@ -185,7 +193,8 @@ export function usePerpsOrderForm({
       prev.mode === mode &&
       prev.asset === asset &&
       prev.initialDirection === initialDirection &&
-      prev.existingPositionDigest === existingPositionDigest
+      prev.existingPositionDigest === existingPositionDigest &&
+      prev.initialLeverage === initialLeverage
     ) {
       return;
     }
@@ -195,6 +204,7 @@ export function usePerpsOrderForm({
       asset,
       initialDirection,
       existingPositionDigest,
+      initialLeverage,
     };
 
     setClosePercent(100);
@@ -215,9 +225,10 @@ export function usePerpsOrderForm({
         asset,
         direction: initialDirection,
         type: typeForReset,
+        ...(initialLeverage !== undefined && { leverage: initialLeverage }),
       });
     }
-  }, [mode, asset, initialDirection]);
+  }, [mode, asset, initialDirection, initialLeverage]);
 
   // Notify parent of form state changes
   useEffect(() => {
@@ -239,21 +250,21 @@ export function usePerpsOrderForm({
         positionSize: formatTokenQuantity(closeAmount, asset),
         marginRequired: null, // Not relevant for closing
         liquidationPrice: null, // Not relevant for closing
+        liquidationPriceRaw: null,
         orderValue: formatCurrencyWithMinThreshold(closeValueUsd, 'USD'),
         estimatedFees: formatCurrencyWithMinThreshold(estimatedFees, 'USD'),
       };
     }
 
-    // For new/modify modes, calculate based on form amount
-    // Remove commas from formatted amount for parsing
-    const cleanAmount = formState.amount.replace(/,/gu, '');
-    const amount = parseFloat(cleanAmount.replace(/,/gu, '')) || 0;
+    // For new/modify modes, calculate based on normalized amount input
+    const amount = Number.parseFloat(formState.amount) || 0;
 
     if (amount === 0) {
       return {
         positionSize: null,
         marginRequired: null,
         liquidationPrice: null,
+        liquidationPriceRaw: null,
         orderValue: null,
         estimatedFees: null,
       };
@@ -263,10 +274,8 @@ export function usePerpsOrderForm({
     // Fall back to current market price if limit price is empty/invalid.
     let effectivePrice = currentPrice;
     if (formState.type === 'limit' && formState.limitPrice) {
-      const parsedLimitPrice = Number.parseFloat(
-        formState.limitPrice.replaceAll(',', ''),
-      );
-      if (!Number.isNaN(parsedLimitPrice) && parsedLimitPrice > 0) {
+      const parsedLimitPrice = Number.parseFloat(formState.limitPrice);
+      if (Number.isFinite(parsedLimitPrice) && parsedLimitPrice > 0) {
         effectivePrice = parsedLimitPrice;
       }
     }
@@ -287,6 +296,7 @@ export function usePerpsOrderForm({
       positionSize: formatTokenQuantity(positionSize, asset),
       marginRequired: formatCurrencyWithMinThreshold(marginRequired, 'USD'),
       liquidationPrice: formatCurrencyWithMinThreshold(liquidationPrice, 'USD'),
+      liquidationPriceRaw: liquidationPrice,
       orderValue: formatCurrencyWithMinThreshold(positionValue, 'USD'),
       estimatedFees: formatCurrencyWithMinThreshold(estimatedFees, 'USD'),
     };
diff --git a/ui/hooks/rewards/useLinkAccountGroup.test.tsx b/ui/hooks/rewards/useLinkAccountGroup.test.tsx
index 58b4e09558f1..eb838cce3c9f 100644
--- a/ui/hooks/rewards/useLinkAccountGroup.test.tsx
+++ b/ui/hooks/rewards/useLinkAccountGroup.test.tsx
@@ -104,6 +104,7 @@ const buildStateWithAccounts = (accounts: InternalAccount[]) => {
             pinned: false,
             hidden: false,
             entropy: { groupIndex: 0 },
+            lastSelected: 0,
           },
           accounts: accounts.map((a) => a.id),
         },
@@ -114,7 +115,6 @@ const buildStateWithAccounts = (accounts: InternalAccount[]) => {
   return createMockMultichainAccountsState(
     {
       wallets,
-      selectedAccountGroup: GROUP_ID,
     },
     {
       accounts: accounts.reduce<Record<string, InternalAccount>>((acc, a) => {
@@ -123,6 +123,8 @@ const buildStateWithAccounts = (accounts: InternalAccount[]) => {
       }, {}),
       selectedAccount: accounts[0]?.id ?? '',
     },
+    undefined,
+    GROUP_ID,
   );
 };
 
diff --git a/ui/hooks/rewards/useOptIn.test.tsx b/ui/hooks/rewards/useOptIn.test.tsx
index 2548eab1a635..bfcdd4fd9792 100644
--- a/ui/hooks/rewards/useOptIn.test.tsx
+++ b/ui/hooks/rewards/useOptIn.test.tsx
@@ -95,6 +95,7 @@ jest.mock('../../selectors/multichain-accounts/account-tree', () => {
           pinned: false,
           hidden: false,
           entropy: { groupIndex: 1 },
+          lastSelected: 0,
         },
         accounts: ['acc-1'],
       },
@@ -106,6 +107,7 @@ jest.mock('../../selectors/multichain-accounts/account-tree', () => {
           pinned: false,
           hidden: false,
           entropy: { groupIndex: 0 },
+          lastSelected: 0,
         },
         accounts: ['acc-0'],
       },
diff --git a/ui/hooks/useAccountGroupForPermissions.test.ts b/ui/hooks/useAccountGroupForPermissions.test.ts
index 6a3d69c3da44..bd57071bd066 100644
--- a/ui/hooks/useAccountGroupForPermissions.test.ts
+++ b/ui/hooks/useAccountGroupForPermissions.test.ts
@@ -71,8 +71,8 @@ const createMockState = (overrides = {}) => ({
   ...mockState,
   metamask: {
     ...mockState.metamask,
+    selectedAccountGroup: MOCK_GROUP_ID_1,
     accountTree: {
-      selectedAccountGroup: MOCK_GROUP_ID_1,
       wallets: {
         [MOCK_WALLET_ID]: {
           id: MOCK_WALLET_ID,
@@ -94,6 +94,7 @@ const createMockState = (overrides = {}) => ({
                 entropy: {
                   groupIndex: 0,
                 },
+                lastSelected: 0,
               },
               accounts: [mockEvmAccount1.id, mockSolAccount1.id],
             },
@@ -107,6 +108,7 @@ const createMockState = (overrides = {}) => ({
                 entropy: {
                   groupIndex: 1,
                 },
+                lastSelected: 0,
               },
               accounts: [mockEvmAccount2.id, mockSolAccount2.id],
             },
@@ -311,8 +313,8 @@ describe('useAccountGroupsForPermissions', () => {
 
     it('handles missing account groups gracefully', () => {
       const stateOverrides = {
+        selectedAccountGroup: MOCK_GROUP_ID_1,
         accountTree: {
-          selectedAccountGroup: MOCK_GROUP_ID_1,
           wallets: {},
         },
       };
@@ -937,8 +939,8 @@ describe('useAccountGroupsForPermissions', () => {
 
     it('includes first supported group when selected account group is not provided', () => {
       const stateOverrides = {
+        selectedAccountGroup: null, // No selected account group
         accountTree: {
-          selectedAccountGroup: null, // No selected account group
           wallets: {
             [MOCK_WALLET_ID]: {
               id: MOCK_WALLET_ID,
@@ -960,6 +962,7 @@ describe('useAccountGroupsForPermissions', () => {
                     entropy: {
                       groupIndex: 0,
                     },
+                    lastSelected: 0,
                   },
                   accounts: [mockEvmAccount1.id, mockSolAccount1.id],
                 },
@@ -973,6 +976,7 @@ describe('useAccountGroupsForPermissions', () => {
                     entropy: {
                       groupIndex: 1,
                     },
+                    lastSelected: 0,
                   },
                   accounts: [mockEvmAccount2.id, mockSolAccount2.id],
                 },
@@ -1026,8 +1030,8 @@ describe('useAccountGroupsForPermissions', () => {
       const requestedNamespaces: CaipNamespace[] = [];
 
       const stateOverrides = {
+        selectedAccountGroup: MOCK_GROUP_ID_1,
         accountTree: {
-          selectedAccountGroup: MOCK_GROUP_ID_1,
           wallets: {
             [MOCK_WALLET_ID]: {
               id: MOCK_WALLET_ID,
@@ -1049,6 +1053,7 @@ describe('useAccountGroupsForPermissions', () => {
                     entropy: {
                       groupIndex: 0,
                     },
+                    lastSelected: 0,
                   },
                   accounts: [mockEvmAccount1.id],
                 },
@@ -1062,6 +1067,7 @@ describe('useAccountGroupsForPermissions', () => {
                     entropy: {
                       groupIndex: 1,
                     },
+                    lastSelected: 0,
                   },
                   accounts: [mockSolAccount1.id],
                 },
diff --git a/ui/hooks/useBoolean.test.ts b/ui/hooks/useBoolean.test.ts
new file mode 100644
index 000000000000..de6fb040d538
--- /dev/null
+++ b/ui/hooks/useBoolean.test.ts
@@ -0,0 +1,62 @@
+import { act, renderHook } from '@testing-library/react-hooks';
+import { useBoolean } from './useBoolean';
+
+describe('useBoolean', () => {
+  it('defaults to false', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    expect(result.current.value).toBe(false);
+  });
+
+  it('supports a custom initial value', () => {
+    const { result } = renderHook(() => useBoolean(true));
+
+    expect(result.current.value).toBe(true);
+  });
+
+  it('sets the value to true', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    act(() => {
+      result.current.setTrue();
+    });
+
+    expect(result.current.value).toBe(true);
+  });
+
+  it('sets the value to false', () => {
+    const { result } = renderHook(() => useBoolean(true));
+
+    act(() => {
+      result.current.setFalse();
+    });
+
+    expect(result.current.value).toBe(false);
+  });
+
+  it('toggles the value', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    act(() => {
+      result.current.toggle();
+    });
+
+    expect(result.current.value).toBe(true);
+
+    act(() => {
+      result.current.toggle();
+    });
+
+    expect(result.current.value).toBe(false);
+  });
+
+  it('exposes the raw setter for custom flows', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    act(() => {
+      result.current.setValue((currentValue) => !currentValue);
+    });
+
+    expect(result.current.value).toBe(true);
+  });
+});
diff --git a/ui/hooks/useBoolean.ts b/ui/hooks/useBoolean.ts
new file mode 100644
index 000000000000..4340e489cec1
--- /dev/null
+++ b/ui/hooks/useBoolean.ts
@@ -0,0 +1,32 @@
+import {
+  type Dispatch,
+  type SetStateAction,
+  useCallback,
+  useState,
+} from 'react';
+
+type Props = {
+  value: boolean;
+  setValue: Dispatch<SetStateAction<boolean>>;
+  setTrue: () => void;
+  setFalse: () => void;
+  toggle: () => void;
+};
+
+export function useBoolean(defaultValue = false): Props {
+  const [value, setValue] = useState(defaultValue);
+
+  const setTrue = useCallback(() => {
+    setValue(true);
+  }, []);
+
+  const setFalse = useCallback(() => {
+    setValue(false);
+  }, []);
+
+  const toggle = useCallback(() => {
+    setValue((currentValue) => !currentValue);
+  }, []);
+
+  return { value, setValue, setTrue, setFalse, toggle };
+}
diff --git a/ui/hooks/useBridgeHistoryLifecycle.ts b/ui/hooks/useBridgeHistoryLifecycle.ts
new file mode 100644
index 000000000000..3b1c1df69d2b
--- /dev/null
+++ b/ui/hooks/useBridgeHistoryLifecycle.ts
@@ -0,0 +1,54 @@
+import { useEffect, useRef } from 'react';
+import { StatusTypes as Status } from '@metamask/bridge-controller';
+import { type BridgeHistoryItem } from '@metamask/bridge-status-controller';
+
+const isComplete = ({ status }: BridgeHistoryItem) =>
+  status.status === Status.COMPLETE;
+const isFailed = ({ status }: BridgeHistoryItem) =>
+  status.status === Status.FAILED;
+const isPending = ({ status }: BridgeHistoryItem) =>
+  status.status === Status.PENDING;
+
+type Handlers = {
+  onPending?: (key: string, item: BridgeHistoryItem) => void;
+  onSuccess?: (key: string, item: BridgeHistoryItem) => void;
+  onFailure?: (key: string, item: BridgeHistoryItem) => void;
+};
+
+export function useBridgeHistoryLifecycle(
+  bridgeHistory: Record<string, BridgeHistoryItem> | undefined,
+  handlers: Handlers,
+) {
+  const ref = useRef<Record<string, BridgeHistoryItem> | null>(null);
+
+  useEffect(() => {
+    const current = bridgeHistory ?? {};
+    const baseline = ref.current;
+
+    if (baseline === null) {
+      ref.current = current;
+      return;
+    }
+
+    for (const [key, item] of Object.entries(current)) {
+      const previous = baseline[key];
+
+      if (!previous) {
+        if (isPending(item)) {
+          handlers.onPending?.(key, item);
+        }
+        continue;
+      }
+
+      if (!isComplete(previous) && isComplete(item)) {
+        handlers.onSuccess?.(key, item);
+      }
+
+      if (!isFailed(previous) && isFailed(item)) {
+        handlers.onFailure?.(key, item);
+      }
+    }
+
+    ref.current = current;
+  }, [bridgeHistory, handlers]);
+}
diff --git a/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.test.ts b/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.test.ts
new file mode 100644
index 000000000000..9d8d531f8739
--- /dev/null
+++ b/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.test.ts
@@ -0,0 +1,130 @@
+import { captureException } from '../../../shared/lib/sentry';
+import {
+  fetchCarouselSlidesFromContentful,
+  getContentfulEnvironmentDetails,
+  UnknownLocaleError,
+} from './fetchCarouselSlidesFromContentful';
+
+jest.mock('../../../shared/lib/sentry', () => ({
+  captureException: jest.fn(),
+}));
+
+jest.mock('../../../shared/lib/environment', () => ({
+  isProduction: jest.fn().mockReturnValue(false),
+}));
+
+const mockCaptureException = jest.mocked(captureException);
+
+const SPACE_ID = 'test-space';
+const ACCESS_TOKEN = 'test-token';
+
+const makeBannerResponse = (overrides = {}) => ({
+  items: [
+    {
+      sys: { id: 'banner-1' },
+      fields: {
+        headline: 'Test Banner',
+        teaser: 'Test description',
+        image: { sys: { id: 'asset-1' } },
+        linkUrl: 'https://example.com',
+        undismissable: false,
+        showInExtension: true,
+        variableName: 'test',
+      },
+    },
+  ],
+  includes: {
+    Asset: [
+      {
+        sys: { id: 'asset-1' },
+        fields: { file: { url: '//images.ctfassets.net/img.png' } },
+      },
+    ],
+  },
+  ...overrides,
+});
+
+const unknownLocaleResponse = {
+  sys: { type: 'Error', id: 'BadRequest' },
+  message: 'Unknown locale: fr-B',
+};
+
+describe('fetchCarouselSlidesFromContentful', () => {
+  let fetchSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    process.env.CONTENTFUL_ACCESS_SPACE_ID = SPACE_ID;
+    process.env.CONTENTFUL_ACCESS_TOKEN = ACCESS_TOKEN;
+
+    fetchSpy = jest.spyOn(globalThis, 'fetch').mockResolvedValue({
+      ok: true,
+      json: async () => makeBannerResponse(),
+    } as Response);
+  });
+
+  afterEach(() => {
+    fetchSpy.mockRestore();
+    delete process.env.CONTENTFUL_ACCESS_SPACE_ID;
+    delete process.env.CONTENTFUL_ACCESS_TOKEN;
+  });
+
+  it('passes locale param to Contentful API', async () => {
+    await fetchCarouselSlidesFromContentful('fr');
+
+    const calledUrl = new URL(fetchSpy.mock.calls[0][0]);
+    expect(calledUrl.searchParams.get('locale')).toBe('fr');
+  });
+
+  it('omits locale param when not provided', async () => {
+    await fetchCarouselSlidesFromContentful();
+
+    const calledUrl = new URL(fetchSpy.mock.calls[0][0]);
+    expect(calledUrl.searchParams.has('locale')).toBe(false);
+  });
+
+  it('retries without locale on UnknownLocaleError and reports to Sentry', async () => {
+    fetchSpy
+      .mockResolvedValueOnce({
+        ok: false,
+        json: async () => unknownLocaleResponse,
+      } as Response)
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => makeBannerResponse(),
+      } as Response);
+
+    const result = await fetchCarouselSlidesFromContentful('fr-B');
+
+    expect(fetchSpy).toHaveBeenCalledTimes(2);
+
+    const firstUrl = new URL(fetchSpy.mock.calls[0][0]);
+    expect(firstUrl.searchParams.get('locale')).toBe('fr-B');
+
+    const retryUrl = new URL(fetchSpy.mock.calls[1][0]);
+    expect(retryUrl.searchParams.has('locale')).toBe(false);
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).toHaveBeenCalledWith(
+      expect.any(UnknownLocaleError),
+    );
+
+    expect(result.regularSlides).toHaveLength(1);
+    expect(result.regularSlides[0].title).toBe('Test Banner');
+  });
+
+  it('throws non-locale Contentful errors without retrying', async () => {
+    fetchSpy.mockResolvedValue({
+      ok: false,
+      statusText: 'Internal Server Error',
+      json: async () => ({ message: 'Something went wrong' }),
+    } as Response);
+
+    await expect(fetchCarouselSlidesFromContentful('en')).rejects.toThrow(
+      'Contentful error: Something went wrong',
+    );
+
+    expect(fetchSpy).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.ts b/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.ts
index b20960a29209..11cbbb4102fc 100644
--- a/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.ts
+++ b/ui/hooks/useCarouselManagement/fetchCarouselSlidesFromContentful.ts
@@ -1,6 +1,7 @@
 import semver from 'semver';
 import { CarouselSlide } from '../../../shared/constants/app-state';
 import { isProduction } from '../../../shared/lib/environment';
+import { captureException } from '../../../shared/lib/sentry';
 import packageJson from '../../../package.json';
 
 const APP_VERSION = packageJson.version;
@@ -78,7 +79,40 @@ type ContentfulBannerResponse = {
   };
 };
 
-export async function fetchCarouselSlidesFromContentful(): Promise<{
+export class UnknownLocaleError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'UnknownLocaleError';
+  }
+}
+
+async function fetchEntries(
+  baseUrl: URL,
+  locale?: string,
+): Promise<ContentfulBannerResponse> {
+  const url = new URL(baseUrl.toString());
+  if (locale) {
+    url.searchParams.set('locale', locale);
+  }
+  const res = await fetch(url);
+  const json = await res.json();
+
+  if (!res.ok) {
+    if (
+      typeof json?.message === 'string' &&
+      json.message.includes('Unknown locale')
+    ) {
+      throw new UnknownLocaleError(json.message);
+    }
+    throw new Error(`Contentful error: ${json?.message ?? res.statusText}`);
+  }
+
+  return json as ContentfulBannerResponse;
+}
+
+export async function fetchCarouselSlidesFromContentful(
+  locale?: string,
+): Promise<{
   prioritySlides: CarouselSlide[];
   regularSlides: CarouselSlide[];
 }> {
@@ -95,7 +129,19 @@ export async function fetchCarouselSlidesFromContentful(): Promise<{
   url.searchParams.set('access_token', accessToken);
   url.searchParams.set('content_type', CONTENT_TYPE);
   url.searchParams.set('fields.showInExtension', 'true');
-  const res: ContentfulBannerResponse = await fetch(url).then((r) => r.json());
+
+  let res: ContentfulBannerResponse;
+  try {
+    res = await fetchEntries(url, locale);
+  } catch (error) {
+    if (error instanceof UnknownLocaleError && locale) {
+      captureException(error);
+      // In case of unknown locale, fallback to default locale
+      res = await fetchEntries(url);
+    } else {
+      throw error;
+    }
+  }
 
   const assets = res.includes?.Asset || [];
   const resolveImage = (imageRef: ContentfulSysField) => {
diff --git a/ui/hooks/useCarouselManagement/useCarouselManagement.test.ts b/ui/hooks/useCarouselManagement/useCarouselManagement.test.ts
index 718f1d9e79f8..a372b2633c36 100644
--- a/ui/hooks/useCarouselManagement/useCarouselManagement.test.ts
+++ b/ui/hooks/useCarouselManagement/useCarouselManagement.test.ts
@@ -10,12 +10,16 @@ import {
   getShowDownloadMobileAppSlide,
   getRemoteFeatureFlags,
 } from '../../selectors';
+import { getCurrentLocale } from '../../ducks/locale/locale';
 import { updateSlides } from '../../store/actions';
 import type { CarouselSlide } from '../../../shared/constants/app-state';
 import { useCarouselManagement } from './useCarouselManagement';
 import { fetchCarouselSlidesFromContentful } from './fetchCarouselSlidesFromContentful';
 
 jest.mock('./fetchCarouselSlidesFromContentful');
+jest.mock('../../ducks/locale/locale', () => ({
+  getCurrentLocale: jest.fn(),
+}));
 jest.mock('react-redux', () => ({
   useDispatch: jest.fn(),
   useSelector: jest.fn((selector) => selector()),
@@ -55,6 +59,7 @@ const mockGetSelectedInternalAccount = jest
   .mockReturnValue({ address: '0xabc' });
 const mockGetShowDownloadMobileAppSlide = jest.fn().mockReturnValue(true);
 const mockGetRemoteFeatureFlags = jest.fn();
+const mockGetCurrentLocale = jest.fn().mockReturnValue('en-US');
 
 describe('useCarouselManagement (simple Contentful tests)', () => {
   beforeEach(() => {
@@ -86,6 +91,9 @@ describe('useCarouselManagement (simple Contentful tests)', () => {
         if (selector === (getRemoteFeatureFlags as MockSelector)) {
           return mockGetRemoteFeatureFlags() as TSelected;
         }
+        if (selector === (getCurrentLocale as MockSelector)) {
+          return mockGetCurrentLocale() as TSelected;
+        }
         return undefined as unknown as TSelected;
       },
     );
@@ -97,6 +105,7 @@ describe('useCarouselManagement (simple Contentful tests)', () => {
     mockGetRemoteFeatureFlags.mockReturnValue({
       contentfulCarouselEnabled: true,
     });
+    mockGetCurrentLocale.mockReturnValue('en');
 
     jest.clearAllMocks();
   });
diff --git a/ui/hooks/useCarouselManagement/useCarouselManagement.ts b/ui/hooks/useCarouselManagement/useCarouselManagement.ts
index f59c75ff31f1..fdaf59af5216 100644
--- a/ui/hooks/useCarouselManagement/useCarouselManagement.ts
+++ b/ui/hooks/useCarouselManagement/useCarouselManagement.ts
@@ -17,6 +17,7 @@ import {
   getSlides,
   getUseExternalServices,
 } from '../../selectors';
+import { getCurrentLocale } from '../../ducks/locale/locale';
 import { fetchCarouselSlidesFromContentful } from './fetchCarouselSlidesFromContentful';
 
 type UseSlideManagementProps = { testDate?: string; enabled?: boolean };
@@ -100,9 +101,12 @@ export const useCarouselManagement = ({
   const useExternalServices = useSelector(getUseExternalServices);
   const showDownloadMobileAppSlide = useSelector(getShowDownloadMobileAppSlide);
   const prevSlidesRef = useRef<CarouselSlide[]>();
+  const slidesRef = useRef(slides);
+  slidesRef.current = slides;
   const hasZeroBalance = new BigNumber(totalBalance ?? ZERO_BALANCE).eq(
     ZERO_BALANCE,
   );
+  const currentLocale = useSelector(getCurrentLocale);
   const contentfulEnabled =
     remoteFeatureFlags?.contentfulCarouselEnabled ?? false;
 
@@ -168,93 +172,97 @@ export const useCarouselManagement = ({
       }
       return;
     }
+    let cancelled = false;
+
     const maybeFetchContentful = async () => {
       // Early Return if Contentful is disabled
       if (!contentfulEnabled) {
         const empty: CarouselSlide[] = [];
-        if (!isEqual(prevSlidesRef.current, empty)) {
+        if (!cancelled && !isEqual(prevSlidesRef.current, empty)) {
           dispatch(updateSlides(empty));
           prevSlidesRef.current = empty;
         }
         return;
       }
 
-      if (contentfulEnabled) {
-        try {
-          const { prioritySlides, regularSlides } =
-            await fetchCarouselSlidesFromContentful();
-
-          const pRaw = [...prioritySlides];
-          const rRaw = [...regularSlides];
-
-          const isNowActive = (s: CarouselSlide) =>
-            isActive(s, testDate ? new Date(testDate) : new Date());
-
-          const normalizeList = (list: CarouselSlide[]) =>
-            list
-              .map((s) => normalize(s, slides))
-              .filter((s): s is CarouselSlide => Boolean(s))
-              .filter(isNowActive);
-
-          // Fund: force undismissable on zero balance
-          const fundCheck = (s: CarouselSlide): CarouselSlide => {
-            if (s.variableName === 'fund') {
-              return {
-                ...s,
-                undismissable: hasZeroBalance || s.undismissable,
-              };
-            }
-            return s;
-          };
-
-          const isEligible = (s: CarouselSlide) => {
-            // Show Download Mobile App (only if not already on mobile + flags)
-            if (s.variableName === 'downloadMobileApp') {
-              return downloadEligible;
-            }
-            return true;
-          };
-
-          const activePrioritySlides = normalizeList(pRaw)
-            .map(fundCheck)
-            .filter(isEligible);
-          const activeRegularSlides = normalizeList(rRaw)
-            .map(fundCheck)
-            .filter(isEligible);
-
-          // Order based on cardPlacement
-          const orderedNonPriority = orderByCardPlacement(activeRegularSlides);
-          const mergedSlides = [...activePrioritySlides, ...orderedNonPriority];
-
-          if (!isEqual(prevSlidesRef.current, mergedSlides)) {
-            dispatch(updateSlides(mergedSlides));
-            prevSlidesRef.current = mergedSlides;
+      try {
+        const { prioritySlides, regularSlides } =
+          await fetchCarouselSlidesFromContentful(currentLocale);
+
+        if (cancelled) {
+          return;
+        }
+
+        const pRaw = [...prioritySlides];
+        const rRaw = [...regularSlides];
+
+        const isNowActive = (s: CarouselSlide) =>
+          isActive(s, testDate ? new Date(testDate) : new Date());
+
+        const normalizeList = (list: CarouselSlide[]) =>
+          list
+            .map((s) => normalize(s, slidesRef.current ?? []))
+            .filter((s): s is CarouselSlide => Boolean(s))
+            .filter(isNowActive);
+
+        // Fund: force undismissable on zero balance
+        const fundCheck = (s: CarouselSlide): CarouselSlide => {
+          if (s.variableName === 'fund') {
+            return {
+              ...s,
+              undismissable: hasZeroBalance || s.undismissable,
+            };
           }
-        } catch (err) {
-          log.warn('Failed to fetch Contentful slides:', err);
-          if (!isEqual(prevSlidesRef.current, [])) {
-            dispatch(updateSlides([]));
-            prevSlidesRef.current = [];
+          return s;
+        };
+
+        const isEligible = (s: CarouselSlide) => {
+          // Show Download Mobile App (only if not already on mobile + flags)
+          if (s.variableName === 'downloadMobileApp') {
+            return downloadEligible;
           }
+          return true;
+        };
+
+        const activePrioritySlides = normalizeList(pRaw)
+          .map(fundCheck)
+          .filter(isEligible);
+        const activeRegularSlides = normalizeList(rRaw)
+          .map(fundCheck)
+          .filter(isEligible);
+
+        // Order based on cardPlacement
+        const orderedNonPriority = orderByCardPlacement(activeRegularSlides);
+        const mergedSlides = [...activePrioritySlides, ...orderedNonPriority];
+
+        if (!isEqual(prevSlidesRef.current, mergedSlides)) {
+          dispatch(updateSlides(mergedSlides));
+          prevSlidesRef.current = mergedSlides;
+        }
+      } catch (err) {
+        log.warn('Failed to fetch Contentful slides:', err);
+        if (!cancelled && !isEqual(prevSlidesRef.current, [])) {
+          dispatch(updateSlides([]));
+          prevSlidesRef.current = [];
         }
       }
     };
 
-    (async () => {
-      try {
-        await maybeFetchContentful();
-      } catch (err) {
-        log.warn('Failed to load carousel slides:', err);
-      }
-    })();
+    maybeFetchContentful().catch((err) => {
+      log.warn('Failed to load carousel slides:', err);
+    });
+
+    return () => {
+      cancelled = true;
+    };
   }, [
     enabled,
     dispatch,
     hasZeroBalance,
     contentfulEnabled,
+    currentLocale,
     testDate,
     inTest,
-    slides,
     downloadEligibilityReady,
   ]);
 
diff --git a/ui/hooks/useHardwareWalletRecoveryLocation.test.tsx b/ui/hooks/useHardwareWalletRecoveryLocation.test.tsx
new file mode 100644
index 000000000000..296cf7d7a0d6
--- /dev/null
+++ b/ui/hooks/useHardwareWalletRecoveryLocation.test.tsx
@@ -0,0 +1,185 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { Provider } from 'react-redux';
+import {
+  MemoryRouter,
+  type MemoryRouterProps,
+  Route,
+  Routes,
+} from 'react-router-dom';
+import {
+  type TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import configureStore from '../store/store';
+import {
+  getMockContractInteractionConfirmState,
+  getMockPersonalSignConfirmStateForRequest,
+} from '../../test/data/confirmations/helper';
+import { unapprovedPersonalSignMsg } from '../../test/data/confirmations/personal_sign';
+import { SignatureRequestType } from '../pages/confirmations/types/confirm';
+import { MetaMetricsHardwareWalletRecoveryLocation } from '../../shared/constants/metametrics';
+import {
+  CONFIRMATION_V_NEXT_ROUTE,
+  CONFIRM_TRANSACTION_ROUTE,
+  CROSS_CHAIN_SWAP_ROUTE,
+  SIGNATURE_REQUEST_PATH,
+} from '../helpers/constants/routes';
+import { useHardwareWalletRecoveryLocation } from './useHardwareWalletRecoveryLocation';
+
+function getFirstTransactionMeta(
+  base: ReturnType<typeof getMockContractInteractionConfirmState>,
+): TransactionMeta {
+  // Mock root state types `transactions` loosely; contract-interaction data is TransactionMeta.
+  return base.metamask.transactions[0] as unknown as TransactionMeta;
+}
+
+function createHookWrapper(
+  store: ReturnType<typeof configureStore>,
+  initialPath: string,
+  routePath = '*',
+) {
+  const memoryRouterFuture = {
+    ['v7_startTransition' as keyof NonNullable<MemoryRouterProps['future']>]:
+      true,
+    ['v7_relativeSplatPath' as keyof NonNullable<MemoryRouterProps['future']>]:
+      true,
+  } as NonNullable<MemoryRouterProps['future']>;
+
+  function hookTestWrapper({ children }: { children: React.ReactNode }) {
+    return (
+      <Provider store={store}>
+        <MemoryRouter
+          initialEntries={[initialPath]}
+          future={memoryRouterFuture}
+        >
+          <Routes>
+            <Route path={routePath} element={<>{children}</>} />
+          </Routes>
+        </MemoryRouter>
+      </Provider>
+    );
+  }
+  return hookTestWrapper;
+}
+
+describe('useHardwareWalletRecoveryLocation', () => {
+  it('returns Swaps for cross-chain route', () => {
+    const store = configureStore(getMockContractInteractionConfirmState());
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(
+        store,
+        `${CROSS_CHAIN_SWAP_ROUTE}/prepare`,
+        `${CROSS_CHAIN_SWAP_ROUTE}/*`,
+      ),
+    });
+    expect(result.current).toBe(
+      MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+    );
+  });
+
+  it('returns Swaps when pathname includes /swaps/', () => {
+    const store = configureStore(getMockContractInteractionConfirmState());
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(store, '/foo/swaps/bar', '*'),
+    });
+    expect(result.current).toBe(
+      MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+    );
+  });
+
+  it('returns Message for signature request path', () => {
+    const path = `/dapp${SIGNATURE_REQUEST_PATH}/1`;
+    const store = configureStore(getMockContractInteractionConfirmState());
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(store, path, '*'),
+    });
+    expect(result.current).toBe(
+      MetaMetricsHardwareWalletRecoveryLocation.Message,
+    );
+  });
+
+  it('returns Message on confirm route when pending message matches confirmation id', () => {
+    const msg = {
+      ...unapprovedPersonalSignMsg,
+      id: 'sig-1',
+    } as SignatureRequestType;
+    const state = getMockPersonalSignConfirmStateForRequest(msg);
+    const store = configureStore(state);
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(
+        store,
+        `${CONFIRM_TRANSACTION_ROUTE}/sig-1`,
+        `${CONFIRM_TRANSACTION_ROUTE}/:id/*`,
+      ),
+    });
+    expect(result.current).toBe(
+      MetaMetricsHardwareWalletRecoveryLocation.Message,
+    );
+  });
+
+  const swapFlowTypes = [
+    TransactionType.swap,
+    TransactionType.swapApproval,
+    TransactionType.bridge,
+  ] as const;
+  swapFlowTypes.forEach((txType) => {
+    it(`returns Swaps on confirm route when transaction type is ${txType}`, () => {
+      const base = getMockContractInteractionConfirmState();
+      const tx = getFirstTransactionMeta(base);
+      const store = configureStore({
+        ...base,
+        metamask: {
+          ...base.metamask,
+          transactions: [{ ...tx, type: txType }],
+        },
+      });
+      const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+        wrapper: createHookWrapper(
+          store,
+          `${CONFIRM_TRANSACTION_ROUTE}/${tx.id}`,
+          `${CONFIRM_TRANSACTION_ROUTE}/:id/*`,
+        ),
+      });
+      expect(result.current).toBe(
+        MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      );
+    });
+  });
+
+  it('returns Send on confirm route for non-swap transaction', () => {
+    const base = getMockContractInteractionConfirmState();
+    const tx = getFirstTransactionMeta(base);
+    const store = configureStore(base);
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(
+        store,
+        `${CONFIRM_TRANSACTION_ROUTE}/${tx.id}`,
+        `${CONFIRM_TRANSACTION_ROUTE}/:id/*`,
+      ),
+    });
+    expect(result.current).toBe(MetaMetricsHardwareWalletRecoveryLocation.Send);
+  });
+
+  it('returns Send for confirmation v-next route without swap or message', () => {
+    const base = getMockContractInteractionConfirmState();
+    const tx = getFirstTransactionMeta(base);
+    const store = configureStore(base);
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(
+        store,
+        `${CONFIRMATION_V_NEXT_ROUTE}/${tx.id}`,
+        `${CONFIRMATION_V_NEXT_ROUTE}/:id/*`,
+      ),
+    });
+    expect(result.current).toBe(MetaMetricsHardwareWalletRecoveryLocation.Send);
+  });
+
+  it('returns Send as default for unrelated routes', () => {
+    const store = configureStore(getMockContractInteractionConfirmState());
+    const { result } = renderHook(() => useHardwareWalletRecoveryLocation(), {
+      wrapper: createHookWrapper(store, '/settings', '*'),
+    });
+    expect(result.current).toBe(MetaMetricsHardwareWalletRecoveryLocation.Send);
+  });
+});
diff --git a/ui/hooks/useHardwareWalletRecoveryLocation.ts b/ui/hooks/useHardwareWalletRecoveryLocation.ts
new file mode 100644
index 000000000000..6429fd1e843c
--- /dev/null
+++ b/ui/hooks/useHardwareWalletRecoveryLocation.ts
@@ -0,0 +1,67 @@
+import { TransactionType } from '@metamask/transaction-controller';
+import { useSelector } from 'react-redux';
+import { useLocation, useParams } from 'react-router-dom';
+import { MetaMetricsHardwareWalletRecoveryLocation } from '../../shared/constants/metametrics';
+import {
+  CONFIRM_TRANSACTION_ROUTE,
+  CONFIRMATION_V_NEXT_ROUTE,
+  CROSS_CHAIN_SWAP_ROUTE,
+  SIGNATURE_REQUEST_PATH,
+} from '../helpers/constants/routes';
+import { getUnapprovedTransaction } from '../selectors';
+import { selectUnapprovedMessage } from '../selectors/signatures';
+
+const SWAP_FLOW_TRANSACTION_TYPES: ReadonlySet<TransactionType> = new Set([
+  TransactionType.swap,
+  TransactionType.swapApproval,
+  TransactionType.swapAndSend,
+  TransactionType.bridge,
+  TransactionType.bridgeApproval,
+]);
+
+/**
+ * Derives the Segment `location` property for hardware wallet recovery UI.
+ *
+ * @returns Location for the current route and pending request.
+ */
+export function useHardwareWalletRecoveryLocation(): MetaMetricsHardwareWalletRecoveryLocation {
+  const { pathname } = useLocation();
+  const { id: confirmationId } = useParams();
+
+  const transaction = useSelector((state) =>
+    confirmationId
+      ? getUnapprovedTransaction(state, confirmationId)
+      : undefined,
+  );
+  const message = useSelector((state) =>
+    confirmationId ? selectUnapprovedMessage(state, confirmationId) : undefined,
+  );
+
+  if (
+    pathname.startsWith(CROSS_CHAIN_SWAP_ROUTE) ||
+    pathname.includes('/swaps/')
+  ) {
+    return MetaMetricsHardwareWalletRecoveryLocation.Swaps;
+  }
+
+  if (pathname.includes(SIGNATURE_REQUEST_PATH)) {
+    return MetaMetricsHardwareWalletRecoveryLocation.Message;
+  }
+
+  if (
+    pathname.startsWith(CONFIRM_TRANSACTION_ROUTE) ||
+    pathname.startsWith(CONFIRMATION_V_NEXT_ROUTE)
+  ) {
+    if (message) {
+      return MetaMetricsHardwareWalletRecoveryLocation.Message;
+    }
+    if (
+      transaction?.type &&
+      SWAP_FLOW_TRANSACTION_TYPES.has(transaction.type as TransactionType)
+    ) {
+      return MetaMetricsHardwareWalletRecoveryLocation.Swaps;
+    }
+  }
+
+  return MetaMetricsHardwareWalletRecoveryLocation.Send;
+}
diff --git a/ui/hooks/useIsRedesignedTransactionType.test.ts b/ui/hooks/useIsRedesignedTransactionType.test.ts
new file mode 100644
index 000000000000..61d9b145739b
--- /dev/null
+++ b/ui/hooks/useIsRedesignedTransactionType.test.ts
@@ -0,0 +1,81 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import { useLocation } from 'react-router-dom';
+import { selectIsRedesignedConfirmationType } from '../selectors';
+import { useIsRedesignedConfirmationType } from './useIsRedesignedTransactionType';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('react-router-dom', () => ({
+  useLocation: jest.fn(),
+}));
+
+jest.mock('../selectors', () => ({
+  selectIsRedesignedConfirmationType: jest.fn(),
+}));
+
+const mockState = {};
+
+describe('useIsRedesignedConfirmationType', () => {
+  const useSelectorMock = jest.mocked(useSelector);
+  const useLocationMock = jest.mocked(useLocation);
+  const selectIsRedesignedConfirmationTypeMock = jest.mocked(
+    selectIsRedesignedConfirmationType,
+  );
+
+  const buildLocation = (pathname: string): ReturnType<typeof useLocation> => ({
+    pathname,
+    search: '',
+    hash: '',
+    state: null,
+    key: 'test-key',
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useSelectorMock.mockImplementation((selector) =>
+      selector(mockState as never),
+    );
+  });
+
+  it('returns true when selector reports redesigned type', () => {
+    useLocationMock.mockReturnValue(
+      buildLocation('/confirm-transaction/tx-123'),
+    );
+    selectIsRedesignedConfirmationTypeMock.mockReturnValue(true);
+
+    const { result } = renderHook(() => useIsRedesignedConfirmationType());
+
+    expect(result.current).toBe(true);
+    expect(selectIsRedesignedConfirmationTypeMock).toHaveBeenCalledWith(
+      mockState,
+      'tx-123',
+    );
+  });
+
+  it('returns false when selector reports non-redesigned type', () => {
+    useLocationMock.mockReturnValue(
+      buildLocation('/confirm-transaction/tx-123'),
+    );
+    selectIsRedesignedConfirmationTypeMock.mockReturnValue(false);
+
+    const { result } = renderHook(() => useIsRedesignedConfirmationType());
+
+    expect(result.current).toBe(false);
+  });
+
+  it('passes undefined when URL has no confirmation id', () => {
+    useLocationMock.mockReturnValue(buildLocation('/settings'));
+    selectIsRedesignedConfirmationTypeMock.mockReturnValue(false);
+
+    const { result } = renderHook(() => useIsRedesignedConfirmationType());
+
+    expect(result.current).toBe(false);
+    expect(selectIsRedesignedConfirmationTypeMock).toHaveBeenCalledWith(
+      mockState,
+      undefined,
+    );
+  });
+});
diff --git a/ui/hooks/useIsRedesignedTransactionType.ts b/ui/hooks/useIsRedesignedTransactionType.ts
new file mode 100644
index 000000000000..2fdb274ab0c1
--- /dev/null
+++ b/ui/hooks/useIsRedesignedTransactionType.ts
@@ -0,0 +1,12 @@
+import { useLocation } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { selectIsRedesignedConfirmationType } from '../selectors';
+
+export const useIsRedesignedConfirmationType = () => {
+  const location = useLocation();
+  const confirmationId = location.pathname.split('/confirm-transaction/')[1];
+
+  return useSelector((state) =>
+    selectIsRedesignedConfirmationType(state, confirmationId),
+  );
+};
diff --git a/ui/hooks/useNonEvmTransactionLifecycle.ts b/ui/hooks/useNonEvmTransactionLifecycle.ts
new file mode 100644
index 000000000000..f5963ec49e06
--- /dev/null
+++ b/ui/hooks/useNonEvmTransactionLifecycle.ts
@@ -0,0 +1,60 @@
+import { useEffect, useRef } from 'react';
+import { TransactionStatus as Status } from '@metamask/keyring-api';
+import type { Handlers } from '../components/ui/toast/types';
+
+const isSuccess = (status: string) => status === Status.Confirmed;
+const isFailed = (status: string) => status === Status.Failed;
+
+const recencyThreshold = 60_000;
+const isRecent = (timestampSec?: number | null) => {
+  if (typeof timestampSec !== 'number') {
+    return false;
+  }
+
+  return Date.now() - timestampSec * 1000 <= recencyThreshold;
+};
+
+export function useNonEvmTransactionLifecycle<
+  TTxn extends { id: string; status: string; timestamp?: number | null },
+>(transactions: readonly TTxn[], handlers: Handlers<TTxn>) {
+  const ref = useRef<Map<string, TTxn> | null>(null);
+
+  useEffect(() => {
+    const baseline = ref.current;
+
+    if (baseline === null) {
+      ref.current = new Map(transactions.map((tx) => [tx.id, tx]));
+      return;
+    }
+
+    for (const tx of transactions) {
+      const previous = baseline.get(tx.id);
+      const isNowSuccess = isSuccess(tx.status);
+      const isNowFailed = isFailed(tx.status);
+
+      if (!previous) {
+        if (!isRecent(tx.timestamp)) {
+          continue;
+        }
+
+        if (isNowFailed) {
+          handlers.onFailure?.(tx);
+        } else if (isNowSuccess) {
+          handlers.onSuccess?.(tx);
+        }
+
+        continue;
+      }
+
+      if (!isSuccess(previous.status) && isNowSuccess) {
+        handlers.onSuccess?.(tx);
+      }
+
+      if (!isFailed(previous.status) && isNowFailed) {
+        handlers.onFailure?.(tx);
+      }
+    }
+
+    ref.current = new Map(transactions.map((tx) => [tx.id, tx]));
+  }, [transactions, handlers]);
+}
diff --git a/ui/hooks/useRiveFileLavamoat.ts b/ui/hooks/useRiveFileLavamoat.ts
new file mode 100644
index 000000000000..f1868c5468df
--- /dev/null
+++ b/ui/hooks/useRiveFileLavamoat.ts
@@ -0,0 +1,8 @@
+import { useRiveFile } from '@rive-app/react-canvas';
+import { useRiveWasmFile } from '../contexts/rive-wasm';
+
+export const useRiveFileLavamoat = ({ src }: { src: string }) => {
+  const { buffer } = useRiveWasmFile(src);
+
+  return useRiveFile({ buffer });
+};
diff --git a/ui/hooks/useTransactionLifecycle.test.ts b/ui/hooks/useTransactionLifecycle.test.ts
new file mode 100644
index 000000000000..c9624dc2506a
--- /dev/null
+++ b/ui/hooks/useTransactionLifecycle.test.ts
@@ -0,0 +1,131 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { TransactionStatus } from '@metamask/transaction-controller';
+import { useTransactionLifecycle } from './useTransactionLifecycle';
+
+type Tx = { id: string; status: string };
+
+const pending = (id: string): Tx => ({
+  id,
+  status: TransactionStatus.submitted,
+});
+const approved = (id: string): Tx => ({
+  id,
+  status: TransactionStatus.approved,
+});
+const confirmed = (id: string): Tx => ({
+  id,
+  status: TransactionStatus.confirmed,
+});
+const failed = (id: string): Tx => ({ id, status: TransactionStatus.failed });
+
+describe('useTransactionLifecycle', () => {
+  it('takes a snapshot on the first render and fires no handlers', () => {
+    const onPending = jest.fn();
+    renderHook(() => useTransactionLifecycle([pending('1')], { onPending }));
+    expect(onPending).not.toHaveBeenCalled();
+  });
+
+  it('fires onPending when a new tx appears already in pending state', () => {
+    const onPending = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onPending }),
+      { initialProps: { txs: [] as Tx[] } },
+    );
+
+    act(() => {
+      rerender({ txs: [pending('1')] });
+    });
+
+    expect(onPending).toHaveBeenCalledTimes(1);
+    expect(onPending).toHaveBeenCalledWith(pending('1'));
+  });
+
+  it('fires onPending when a known tx transitions into pending (unapproved → submitted)', () => {
+    const onPending = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onPending }),
+      { initialProps: { txs: [approved('1')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [pending('1')] });
+    });
+
+    expect(onPending).toHaveBeenCalledTimes(1);
+    expect(onPending).toHaveBeenCalledWith(pending('1'));
+  });
+
+  it('fires onSuccess when a pending tx is confirmed', () => {
+    const onSuccess = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onSuccess }),
+      { initialProps: { txs: [pending('1')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [confirmed('1')] });
+    });
+
+    expect(onSuccess).toHaveBeenCalledTimes(1);
+    expect(onSuccess).toHaveBeenCalledWith(confirmed('1'));
+  });
+
+  it('fires onFailure when a pending tx fails', () => {
+    const onFailure = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onFailure }),
+      { initialProps: { txs: [pending('1')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [failed('1')] });
+    });
+
+    expect(onFailure).toHaveBeenCalledTimes(1);
+    expect(onFailure).toHaveBeenCalledWith(failed('1'));
+  });
+
+  it('does not fire onPending again when a tx stays pending', () => {
+    const onPending = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onPending }),
+      { initialProps: { txs: [pending('1')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [pending('1')] });
+    });
+
+    expect(onPending).not.toHaveBeenCalled();
+  });
+
+  it('does not fire handlers for a tx that was already confirmed in the first snapshot', () => {
+    const onSuccess = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onSuccess }),
+      { initialProps: { txs: [confirmed('1')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [confirmed('1')] });
+    });
+
+    expect(onSuccess).not.toHaveBeenCalled();
+  });
+
+  it('handles multiple transactions independently', () => {
+    const onPending = jest.fn();
+    const onSuccess = jest.fn();
+    const { rerender } = renderHook(
+      ({ txs }) => useTransactionLifecycle(txs, { onPending, onSuccess }),
+      { initialProps: { txs: [pending('1'), approved('2')] } },
+    );
+
+    act(() => {
+      rerender({ txs: [confirmed('1'), pending('2')] });
+    });
+
+    expect(onSuccess).toHaveBeenCalledWith(confirmed('1'));
+    expect(onPending).toHaveBeenCalledWith(pending('2'));
+  });
+});
diff --git a/ui/hooks/useTransactionLifecycle.ts b/ui/hooks/useTransactionLifecycle.ts
new file mode 100644
index 000000000000..af0178464b7a
--- /dev/null
+++ b/ui/hooks/useTransactionLifecycle.ts
@@ -0,0 +1,70 @@
+import { useEffect, useRef } from 'react';
+import { TransactionStatus } from '@metamask/transaction-controller';
+import {
+  TRANSACTION_FAILED_STATUSES,
+  TRANSACTION_PENDING_STATUSES,
+  TRANSACTION_SUCCESS_STATUSES,
+} from '../helpers/constants/transactions';
+import type { Handlers } from '../components/ui/toast/types';
+import { SmartTransactionStatus } from '../../shared/constants/transaction';
+
+export const isSuccess = (status: TransactionStatus | SmartTransactionStatus) =>
+  TRANSACTION_SUCCESS_STATUSES.has(status);
+export const isFailed = (status: TransactionStatus | SmartTransactionStatus) =>
+  TRANSACTION_FAILED_STATUSES.has(status);
+export const isPending = (status: TransactionStatus | SmartTransactionStatus) =>
+  TRANSACTION_PENDING_STATUSES.has(status);
+
+export function useTransactionLifecycle<
+  TTxn extends {
+    id: string;
+    status: TransactionStatus | SmartTransactionStatus;
+  },
+>(transactions: readonly TTxn[], handlers: Handlers<TTxn>) {
+  const ref = useRef<Map<string, TTxn> | null>(null);
+
+  useEffect(() => {
+    const baseline = ref.current;
+
+    if (baseline === null) {
+      ref.current = new Map(transactions.map((tx) => [tx.id, tx]));
+      return;
+    }
+
+    for (const tx of transactions) {
+      const previous = baseline.get(tx.id);
+      const isNowPending = isPending(tx.status);
+      const isNowSuccess = isSuccess(tx.status);
+      const isNowFailed = isFailed(tx.status);
+
+      if (!previous) {
+        if (isNowPending) {
+          handlers.onPending?.(tx);
+        } else if (isNowSuccess) {
+          handlers.onSuccess?.(tx);
+        } else if (isNowFailed) {
+          handlers.onFailure?.(tx);
+        }
+        continue;
+      }
+
+      const wasPending = isPending(previous.status);
+
+      if (!wasPending && isNowPending) {
+        handlers.onPending?.(tx);
+        continue;
+      }
+
+      if (wasPending && isNowSuccess) {
+        handlers.onSuccess?.(tx);
+        continue;
+      }
+
+      if ((wasPending || previous.status === 'signed') && isNowFailed) {
+        handlers.onFailure?.(tx);
+      }
+    }
+
+    ref.current = new Map(transactions.map((tx) => [tx.id, tx]));
+  }, [transactions, handlers]);
+}
diff --git a/ui/index.js b/ui/index.js
index 9e6c49431bbd..89f1805339af 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -48,6 +48,7 @@ import txHelper from './helpers/utils/tx-helper';
 import { setBackgroundConnection } from './store/background-connection';
 import { getStartupTraceTags } from './helpers/utils/tags';
 import { SEEDLESS_PASSWORD_OUTDATED_CHECK_INTERVAL_MS } from './constants';
+import { initWebVitals } from './helpers/utils/web-vitals';
 import { getPerpsStreamManager } from './providers/perps';
 
 export { CriticalStartupErrorHandler } from './helpers/utils/critical-startup-error-handler';
@@ -207,6 +208,9 @@ export async function setupInitialStore(metamaskState, activeTab) {
 async function startApp(metamaskState, opts) {
   const { traceContext } = opts;
 
+  // Initialize Core Web Vitals (INP, LCP, CLS) measurement
+  initWebVitals();
+
   const tags = getStartupTraceTags({ metamask: metamaskState });
 
   const store = await trace(
@@ -380,6 +384,9 @@ function setupStateHooks(store) {
     ) {
       await actions.captureTestBackgroundError(msg);
     };
+    window.stateHooks.perpsInjectPositions = function (positions) {
+      getPerpsStreamManager().positions.pushData(positions);
+    };
   }
 
   /**
diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index 0539a9a661c8..83a9839cde26 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -370,7 +370,7 @@ exports[`AssetPage should render a native asset 1`] = `
                 class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
               >
                 <a
-                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
+                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
                   href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=cf8dace4-9439-4bd4-b3a8-88c821c8fcb3&tab=spending-caps"
                   rel="noopener noreferrer"
                   target="_blank"
@@ -800,7 +800,7 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
                 class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
               >
                 <a
-                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
+                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
                   href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=cf8dace4-9439-4bd4-b3a8-88c821c8fcb3&tab=spending-caps"
                   rel="noopener noreferrer"
                   target="_blank"
@@ -1225,7 +1225,7 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
                 class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
               >
                 <a
-                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
+                  class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed asset-page__spending-caps"
                   href="https://portfolio.test/?metamaskEntry=asset_page&metametricsId=&metricsEnabled=false&marketingEnabled=false&accountAddress=cf8dace4-9439-4bd4-b3a8-88c821c8fcb3&tab=spending-caps"
                   rel="noopener noreferrer"
                   target="_blank"
diff --git a/ui/pages/asset/components/asset-page.test.tsx b/ui/pages/asset/components/asset-page.test.tsx
index 3a81e94e15a6..c2ee42cd5788 100644
--- a/ui/pages/asset/components/asset-page.test.tsx
+++ b/ui/pages/asset/components/asset-page.test.tsx
@@ -166,6 +166,7 @@ describe('AssetPage', () => {
       enabledNetworkMap: {
         eip155: {},
       },
+      selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       accountTree: {
         wallets: {
           'entropy:01JKAF3DSGM3AB87EM9N0K41AJ': {
@@ -183,6 +184,7 @@ describe('AssetPage', () => {
                   },
                   hidden: false,
                   pinned: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -194,7 +196,6 @@ describe('AssetPage', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       },
       internalAccounts: {
         accounts: {
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 24255f204e4e..8ba204165428 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -41,7 +41,7 @@ import { endTrace, TraceName } from '../../../../shared/lib/trace';
 import { hexToDecimal } from '../../../../shared/lib/conversion.utils';
 import { toChecksumHexAddress } from '../../../../shared/lib/hexstring-utils';
 import TokenCell from '../../../components/app/assets/token-cell';
-import { MUSD_EVENTS_CONSTANTS } from '../../../components/app/musd/musd-events';
+import { ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS } from '../../../components/app/musd/musd-events';
 import { MarketClosedModal } from '../../../components/app/assets/market-closed-modal';
 import {
   TokenFiatDisplayInfo,
@@ -363,10 +363,7 @@ const AssetPage = ({
             key={`${symbol}-${address}`}
             token={tokenWithFiatAmount as TokenWithFiatAmount}
             safeChains={safeChains}
-            showMerklBadge
-            merklClaimCtaLocation={
-              MUSD_EVENTS_CONSTANTS.EVENT_LOCATIONS.ASSET_OVERVIEW
-            }
+            musd={ASSET_OVERVIEW_TOKEN_CELL_MUSD_OPTIONS}
           />
         )}
         {/* mUSD Conversion CTA - shows for eligible stablecoins */}
diff --git a/ui/pages/asset/components/chart/asset-chart.test.tsx b/ui/pages/asset/components/chart/asset-chart.test.tsx
deleted file mode 100644
index a0b10332b81f..000000000000
--- a/ui/pages/asset/components/chart/asset-chart.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { convertAddressToAssetCaipType } from './asset-chart';
-
-describe('convertAddressToAssetCaipType', () => {
-  it('returns address unchanged when already a CAIP asset type', () => {
-    const address = 'eip155:1/erc20:0x6982508145454Ce325dDbE47a25d4ec3d2311933';
-    const chainId = '0x1';
-
-    const result = convertAddressToAssetCaipType(address, chainId);
-
-    expect(result).toBe(address);
-  });
-
-  it('creates EIP155 CAIP asset type for valid hex address and chainId', () => {
-    const address = '0x6982508145454Ce325dDbE47a25d4ec3d2311933';
-    const chainId = '0x1';
-
-    const result = convertAddressToAssetCaipType(address, chainId);
-
-    expect(result).toBe(
-      'eip155:1/erc20:0x6982508145454Ce325dDbE47a25d4ec3d2311933',
-    );
-  });
-
-  it('returns undefined for invalid inputs', () => {
-    const inputs = [
-      { address: 'not-a-hex-string', chainId: '0x1' },
-      {
-        address: '0x6982508145454Ce325dDbE47a25d4ec3d2311933',
-        chainId: 'not-a-hex-string',
-      },
-      { address: 'not-a-hex-string', chainId: 'not-a-hex-string' },
-    ];
-    inputs.forEach(({ address, chainId }) => {
-      const result = convertAddressToAssetCaipType(address, chainId);
-      expect(result).toBeUndefined();
-    });
-  });
-});
diff --git a/ui/pages/asset/components/chart/asset-chart.tsx b/ui/pages/asset/components/chart/asset-chart.tsx
index ad81e0d784b0..19fcc12e1c0a 100644
--- a/ui/pages/asset/components/chart/asset-chart.tsx
+++ b/ui/pages/asset/components/chart/asset-chart.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import {
   Chart,
   LineElement,
@@ -14,14 +14,7 @@ import {
 import { Line } from 'react-chartjs-2';
 import classnames from 'clsx';
 import { brandColor } from '@metamask/design-tokens';
-import {
-  Hex,
-  isCaipAssetType,
-  isHexString,
-  KnownCaipNamespace,
-  toCaipAssetType,
-  hexToNumber,
-} from '@metamask/utils';
+import { Hex } from '@metamask/utils';
 import { trim } from 'lodash';
 import { Duration } from 'luxon';
 import { useTheme } from '../../../../hooks/useTheme';
@@ -43,7 +36,6 @@ import { TokenFiatDisplayInfo } from '../../../../components/app/assets/types';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useHistoricalPrices } from '../../hooks/useHistoricalPrices';
 import { loadingOpacity } from '../../util';
-import { useChartTimeRanges } from '../../hooks/useChartTimeRanges';
 import ChartTooltip from './chart-tooltip';
 import { CrosshairPlugin } from './crosshair-plugin';
 import { AssetChartEmptyState } from './asset-chart-empty-state';
@@ -139,27 +131,7 @@ const getTranslatedTimeRangeLabel = (
   );
 };
 
-export function convertAddressToAssetCaipType(
-  address: string,
-  chainId: string,
-) {
-  if (isCaipAssetType(address)) {
-    return address;
-  }
-
-  // Create EIP155 EVM asset type
-  if (isHexString(address) && isHexString(chainId)) {
-    return toCaipAssetType(
-      KnownCaipNamespace.Eip155,
-      hexToNumber(chainId).toString(),
-      'erc20',
-      address,
-    );
-  }
-
-  // Unsupported CAIP asset type
-  return undefined;
-}
+const TIME_RANGES = ['P1D', 'P1W', 'P1M', 'P3M', 'P1Y', 'P1000Y'];
 
 // A chart showing historic prices for a native or token asset
 const AssetChart = ({
@@ -178,13 +150,8 @@ const AssetChart = ({
   const t = useI18nContext();
   const theme = useTheme();
 
-  const caipAssetType = useMemo(() => {
-    return convertAddressToAssetCaipType(address, chainId);
-  }, [address, chainId]);
-  const timeRanges = useChartTimeRanges(caipAssetType, currency);
-
   const [selectedTimeRange, setSelectedTimeRange] = useState<string>(
-    timeRanges[0] ?? 'P1D',
+    TIME_RANGES[0],
   );
 
   const {
@@ -329,7 +296,7 @@ const AssetChart = ({
           marginLeft={3}
           marginRight={3}
         >
-          {timeRanges.map((timeRange) => (
+          {TIME_RANGES.map((timeRange) => (
             <ButtonBase
               key={timeRange}
               className={classnames('time-range-button', {
diff --git a/ui/pages/asset/hooks/useChartTimeRanges.test.ts b/ui/pages/asset/hooks/useChartTimeRanges.test.ts
deleted file mode 100644
index bca4253fc191..000000000000
--- a/ui/pages/asset/hooks/useChartTimeRanges.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { CaipAssetType } from '@metamask/utils';
-import { renderHookWithProvider } from '../../../../test/lib/render-helpers-navigate';
-import { useChartTimeRanges } from './useChartTimeRanges';
-
-describe('useChartTimeRanges', () => {
-  describe('when the asset type is EVM', () => {
-    const mockState = {
-      metamask: {
-        historicalPrices: {},
-      },
-    };
-    const arrangeAct = (assetType?: CaipAssetType, currency?: string) => {
-      const { result } = renderHookWithProvider(
-        () => useChartTimeRanges(assetType, currency),
-        mockState,
-      );
-      const timeRanges = result.current;
-      return timeRanges;
-    };
-
-    it('returns hardcoded timeranges', () => {
-      const timeRanges = arrangeAct(
-        'eip155:1/erc20:0x6982508145454Ce325dDbE47a25d4ec3d2311933',
-        'USD',
-      );
-      expect(timeRanges).toEqual(['P1D', 'P1W', 'P1M', 'P3M', 'P1Y', 'P1000Y']);
-    });
-
-    it('returns hardcoded timestamps on missing asset type', () => {
-      jest.spyOn(console, 'warn').mockImplementation(jest.fn());
-      const timeRanges = arrangeAct(undefined, 'USD');
-      expect(timeRanges).toEqual(['P1D', 'P1W', 'P1M', 'P3M', 'P1Y', 'P1000Y']);
-    });
-
-    it('returns hardcoded timestamps on missing currency', () => {
-      jest.spyOn(console, 'warn').mockImplementation(jest.fn());
-      const timeRanges = arrangeAct(
-        'eip155:1/erc20:0x6982508145454Ce325dDbE47a25d4ec3d2311933',
-        undefined,
-      );
-      expect(timeRanges).toEqual(['P1D', 'P1W', 'P1M', 'P3M', 'P1Y', 'P1000Y']);
-    });
-  });
-
-  describe('when the chain is non-EVM', () => {
-    it('returns time ranges available in historical prices', () => {
-      const address = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
-      const currency = 'usd';
-
-      const mockStateWithHistoricalPrices = {
-        metamask: {
-          historicalPrices: {
-            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-              usd: {
-                intervals: {
-                  P4D: [],
-                  P99Y: [],
-                },
-              },
-            },
-          },
-        },
-      };
-
-      const { result } = renderHookWithProvider(
-        () => useChartTimeRanges(address, currency),
-        mockStateWithHistoricalPrices,
-      );
-      const timeRanges = result.current;
-
-      expect(timeRanges).toEqual(['P4D', 'P99Y']);
-    });
-
-    it('returns empty array for non-EVM chains when data is missing for the address/currency', () => {
-      const address = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
-      const currency = 'usd';
-
-      const mockStateWithNoHistoricalPrices = {
-        metamask: {
-          historicalPrices: {
-            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-              usd: {
-                intervals: {}, // No intervals
-              },
-            },
-          },
-        },
-      };
-
-      const { result } = renderHookWithProvider(
-        () => useChartTimeRanges(address, currency),
-        mockStateWithNoHistoricalPrices,
-      );
-      const timeRanges = result.current;
-
-      expect(timeRanges).toEqual([]);
-    });
-
-    it('filters out invalid time ranges', () => {
-      const address = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
-      const currency = 'usd';
-
-      const mockStateWithInvalidTimeRanges = {
-        metamask: {
-          historicalPrices: {
-            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-              usd: {
-                intervals: {
-                  P1D: [],
-                  HEY: [], // Invalid time range
-                  P1M: [],
-                },
-              },
-            },
-          },
-        },
-      };
-
-      const { result } = renderHookWithProvider(
-        () => useChartTimeRanges(address, currency),
-        mockStateWithInvalidTimeRanges,
-      );
-      const timeRanges = result.current;
-
-      expect(timeRanges).toEqual(['P1D', 'P1M']);
-    });
-
-    it('sorts time ranges by their duration', () => {
-      const address = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501';
-      const currency = 'usd';
-
-      const mockStateWithUnsortedTimeRanges = {
-        metamask: {
-          historicalPrices: {
-            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-              usd: {
-                intervals: {
-                  P1M: [],
-                  P1Y: [],
-                  P1D: [],
-                },
-              },
-            },
-          },
-        },
-      };
-
-      const { result } = renderHookWithProvider(
-        () => useChartTimeRanges(address, currency),
-        mockStateWithUnsortedTimeRanges,
-      );
-      const timeRanges = result.current;
-
-      expect(timeRanges).toEqual(['P1D', 'P1M', 'P1Y']);
-    });
-  });
-});
diff --git a/ui/pages/asset/hooks/useChartTimeRanges.ts b/ui/pages/asset/hooks/useChartTimeRanges.ts
deleted file mode 100644
index abf3e391279a..000000000000
--- a/ui/pages/asset/hooks/useChartTimeRanges.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
-  CaipAssetType,
-  KnownCaipNamespace,
-  assert,
-  parseCaipAssetType,
-} from '@metamask/utils';
-import { chain } from 'lodash';
-import { Duration } from 'luxon';
-import { useSelector } from 'react-redux';
-import { getHistoricalPrices } from '../../../selectors/assets';
-
-/**
- * Returns the list of time ranges (as ISO 8601 durations) to display in the historical prices chart for a given asset.
- *
- * On EVM, time ranges are hardcoded.
- * On non-EVM, time ranges are dynamically read from the historicalPrices object.
- *
- * @param caipAssetType - The caipAssetType of the asset. Only used on non-EVM chains.
- * @param currency - The currency of the asset. Only used on non-EVM chains.
- * @returns The time ranges available for the given asset, for instance: `['P1D', 'P7D', 'P1M', 'P3M', 'P1Y', 'P1000Y']`
- */
-export const useChartTimeRanges = (
-  caipAssetType?: CaipAssetType,
-  currency?: string,
-): string[] => {
-  const DEFAULT_TIME_RANGES = ['P1D', 'P1W', 'P1M', 'P3M', 'P1Y', 'P1000Y'];
-  const historicalPricesNonEvm = useSelector(getHistoricalPrices);
-
-  try {
-    assert(caipAssetType, 'caipAssetType is required on non-EVM chains');
-    assert(currency, 'currency is required on non-EVM chains');
-
-    if (
-      parseCaipAssetType(caipAssetType).chain.namespace ===
-      KnownCaipNamespace.Eip155
-    ) {
-      // On EVM, time ranges are hardcoded
-      return DEFAULT_TIME_RANGES;
-    }
-  } catch (e) {
-    console.warn(
-      'useChartTimeRanges - failed, returning default time ranges',
-      e,
-    );
-    return DEFAULT_TIME_RANGES;
-  }
-
-  // On non-EVM, time ranges are the intervals defined in the the historicalPrices state
-  const intervals =
-    historicalPricesNonEvm[caipAssetType]?.[currency]?.intervals;
-
-  if (!intervals) {
-    return DEFAULT_TIME_RANGES;
-  }
-
-  return chain(intervals)
-    .keys()
-    .map((iso8601String) => Duration.fromISO(iso8601String)) // Convert to Duration object
-    .filter((duration) => duration.isValid) // Filter out invalid durations
-    .sortBy((duration) => duration.toMillis()) // Sort from shortest to longest
-    .map((duration) => duration.toISO()) // Convert back to ISO string
-    .filter((iso8601String): iso8601String is string => iso8601String !== null) // Filter out nulls
-    .uniq() // Remove duplicates
-    .value();
-};
diff --git a/ui/pages/asset/hooks/useHistoricalPrices.test.ts b/ui/pages/asset/hooks/useHistoricalPrices.test.ts
index f7c9f03fc382..681109eb8d13 100644
--- a/ui/pages/asset/hooks/useHistoricalPrices.test.ts
+++ b/ui/pages/asset/hooks/useHistoricalPrices.test.ts
@@ -96,8 +96,8 @@ const mockBaseState = {
       },
       selectedAccount: '',
     },
+    selectedAccountGroup: 'entropy:wallet1/0',
     accountTree: {
-      selectedAccountGroup: 'entropy:wallet1/0',
       wallets: {
         'entropy:wallet1': {
           id: 'entropy:wallet1',
@@ -116,6 +116,7 @@ const mockBaseState = {
                 entropy: { groupIndex: 0 },
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
             },
           },
diff --git a/ui/pages/bridge/__snapshots__/index.test.tsx.snap b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
index 744afa896fdc..059c42f67ed8 100644
--- a/ui/pages/bridge/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
@@ -80,52 +80,54 @@ exports[`Bridge renders the component with initial props 1`] = `
                 />
               </div>
               <button
-                class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
                 data-testid="bridge-source-button"
                 style="padding: 8px 11px 8px 8px; min-width: fit-content;"
               >
                 <div
-                  class="relative inline-flex self-start"
-                  style="margin-right: 2px;"
+                  class="flex items-center gap-2"
                 >
                   <div
-                    class="inline-flex"
+                    class="relative inline-flex self-start"
                   >
                     <div
-                      class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                      class="inline-flex"
                     >
-                      <img
-                        alt="ETH"
-                        class="size-full object-contain"
-                        src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png"
-                      />
+                      <div
+                        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                      >
+                        <img
+                          alt="ETH"
+                          class="size-full object-contain"
+                          src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png"
+                        />
+                      </div>
                     </div>
-                  </div>
-                  <div
-                    class="absolute"
-                    style="bottom: 0px; right: 0px;"
-                  >
                     <div
-                      class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                      style="border-width: 1px; border-radius: 6px;"
+                      class="absolute"
+                      style="bottom: 0px; right: 0px;"
                     >
-                      <img
-                        alt="Ethereum"
-                        class="size-full object-contain"
-                        src="./images/eth_logo.svg"
-                      />
+                      <div
+                        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                        style="border-width: 1px; border-radius: 6px;"
+                      >
+                        <img
+                          alt="Ethereum"
+                          class="size-full object-contain"
+                          src="./images/eth_logo.svg"
+                        />
+                      </div>
                     </div>
                   </div>
-                </div>
-                <span
-                  class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-                >
                   <label
-                    class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+                    class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
                   >
                     ETH
                   </label>
-                </span>
+                </div>
+                <span
+                  class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+                />
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
                   style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
@@ -190,52 +192,54 @@ exports[`Bridge renders the component with initial props 1`] = `
                   />
                 </div>
                 <button
-                  class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
                   data-testid="bridge-destination-button"
                   style="padding: 8px 11px 8px 8px; min-width: fit-content;"
                 >
                   <div
-                    class="relative inline-flex self-start"
-                    style="margin-right: 2px;"
+                    class="flex items-center gap-2"
                   >
                     <div
-                      class="inline-flex"
+                      class="relative inline-flex self-start"
                     >
                       <div
-                        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                        class="inline-flex"
                       >
-                        <img
-                          alt="mUSD"
-                          class="size-full object-contain"
-                          src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
-                        />
+                        <div
+                          class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                        >
+                          <img
+                            alt="mUSD"
+                            class="size-full object-contain"
+                            src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
+                          />
+                        </div>
                       </div>
-                    </div>
-                    <div
-                      class="absolute"
-                      style="bottom: 0px; right: 0px;"
-                    >
                       <div
-                        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                        style="border-width: 1px; border-radius: 6px;"
+                        class="absolute"
+                        style="bottom: 0px; right: 0px;"
                       >
-                        <img
-                          alt="Ethereum"
-                          class="size-full object-contain"
-                          src="./images/eth_logo.svg"
-                        />
+                        <div
+                          class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                          style="border-width: 1px; border-radius: 6px;"
+                        >
+                          <img
+                            alt="Ethereum"
+                            class="size-full object-contain"
+                            src="./images/eth_logo.svg"
+                          />
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <span
-                    class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-                  >
                     <label
-                      class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+                      class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
                     >
                       mUSD
                     </label>
-                  </span>
+                  </div>
+                  <span
+                    class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+                  />
                   <span
                     class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
                     style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
diff --git a/ui/pages/bridge/hooks/useDestinationAccount.test.tsx b/ui/pages/bridge/hooks/useDestinationAccount.test.tsx
index ac894ea1e810..fb7d07705a26 100644
--- a/ui/pages/bridge/hooks/useDestinationAccount.test.tsx
+++ b/ui/pages/bridge/hooks/useDestinationAccount.test.tsx
@@ -67,9 +67,7 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_EVM_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
-        },
+        selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       },
     });
 
@@ -99,9 +97,7 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_SOLANA_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
-        },
+        selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       },
     });
     expect(result.current.selectedDestinationAccount).toStrictEqual({
@@ -127,9 +123,7 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_EVM_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
-        },
+        selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       },
     });
     expect(getFromChain(store?.getState())?.chainId).toBe('eip155:1');
@@ -203,10 +197,8 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_LEDGER_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup:
-            'keyring:Ledger Hardware/0xb3864b298f4fddbbbd2fa5cf1a2a2748932b3b82',
-        },
+        selectedAccountGroup:
+          'keyring:Ledger Hardware/0xb3864b298f4fddbbbd2fa5cf1a2a2748932b3b82',
       },
     });
     expect(result.current.selectedDestinationAccount).toStrictEqual({
@@ -237,10 +229,8 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_LEDGER_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup:
-            'keyring:Ledger Hardware/0xb3864b298f4fddbbbd2fa5cf1a2a2748932b3b82',
-        },
+        selectedAccountGroup:
+          'keyring:Ledger Hardware/0xb3864b298f4fddbbbd2fa5cf1a2a2748932b3b82',
       },
     });
     expect(result.current.selectedDestinationAccount).toBeNull();
@@ -276,9 +266,7 @@ describe('useDestinationAccount', () => {
         internalAccounts: {
           selectedAccount: MOCK_SOLANA_ACCOUNT.id,
         },
-        accountTree: {
-          selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
-        },
+        selectedAccountGroup: 'entropy:01K2FF18CTTXJYD34R78X4N1N1/0',
       },
     });
     expect(result.current.selectedDestinationAccount).toStrictEqual({
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
index c9f1e050b79e..7dcf723eaea9 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
@@ -20,6 +20,7 @@ import {
 import * as sharedSelectors from '../../../../shared/lib/selectors';
 import * as sentry from '../../../../shared/lib/sentry';
 import * as bridgeStatusActions from '../../../ducks/bridge-status/actions';
+import * as bridgeActions from '../../../ducks/bridge/actions';
 import { setBackgroundConnection } from '../../../store/background-connection';
 import { HardwareWalletProvider } from '../../../contexts/hardware-wallets';
 import useSubmitBridgeTransaction from './useSubmitBridgeTransaction';
@@ -169,13 +170,8 @@ const submitTxSpy = jest.spyOn(bridgeStatusActions, 'submitBridgeTx');
 const submitIntentSpy = jest.spyOn(bridgeStatusActions, 'submitBridgeIntent');
 const isHardwareWalletSpy = sharedSelectors.isHardwareWallet as jest.Mock;
 const captureExceptionSpy = jest.spyOn(sentry, 'captureException');
-
-setBackgroundConnection({
-  submitTx: submitTxSpy,
-  submitIntent: submitIntentSpy,
-  getStatePatches: jest.fn(),
-  setEnabledAllPopularNetworks: jest.fn(),
-} as never);
+const mockResetState = jest.fn();
+const resetBridgeStoreSpy = jest.spyOn(bridgeActions, 'resetInputFields');
 
 describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
   describe('submitBridgeTransaction', () => {
@@ -189,6 +185,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         submitIntent: submitIntentSpy,
         getStatePatches: jest.fn(),
         setEnabledAllPopularNetworks: jest.fn(),
+        resetState: () => mockResetState(),
       } as never);
     });
 
@@ -210,19 +207,19 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       expect(mockUseNavigate.mock.calls).toMatchInlineSnapshot(`
         [
           [
-            "/?tab=activity",
+            "/",
             {
               "replace": true,
               "state": {
-                "bridgeState": null,
                 "stayOnHomePage": true,
-                "token": null,
               },
             },
           ],
         ]
       `);
       expect(result.current.isSubmitting).toBe(false);
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
     it('executes EVM bridge transaction with no approval', async () => {
@@ -241,9 +238,11 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
 
       expect(submitTxSpy.mock.calls).toMatchSnapshot();
       expect(result.current.isSubmitting).toBe(false);
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
-    it('routes to activity tab after EVM bridge transaction', async () => {
+    it('routes to default route after EVM bridge transaction', async () => {
       const store = makeMockStore();
       const { result } = renderHook(() => useSubmitBridgeTransaction(), {
         wrapper: makeWrapper(store),
@@ -261,13 +260,11 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       expect(mockUseNavigate.mock.calls).toMatchInlineSnapshot(`
         [
           [
-            "/?tab=activity",
+            "/",
             {
               "replace": true,
               "state": {
-                "bridgeState": null,
                 "stayOnHomePage": true,
-                "token": null,
               },
             },
           ],
@@ -276,6 +273,8 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
 
       expect(result.current.isSubmitting).toBe(false);
       expect(submitTxSpy).toHaveBeenCalled();
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
     it('routes to awaiting signatures for hardware wallets', async () => {
@@ -312,13 +311,11 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
             },
           ],
           [
-            "/?tab=activity",
+            "/",
             {
               "replace": true,
               "state": {
-                "bridgeState": null,
                 "stayOnHomePage": true,
-                "token": null,
               },
             },
           ],
@@ -326,6 +323,8 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       `);
       expect(result.current.isSubmitting).toBe(false);
       expect(submitTxSpy).toHaveBeenCalledTimes(1);
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
     it('returns early if hardware device is not ready', async () => {
@@ -356,6 +355,8 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       expect(result.current.isSubmitting).toBe(false);
       expect(submitTxSpy).not.toHaveBeenCalled();
       expect(mockUseNavigate).not.toHaveBeenCalled();
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
     it('submits intent quotes via submitBridgeIntent', async () => {
@@ -388,70 +389,64 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         accountAddress: expect.any(String),
       });
       expect(submitTxSpy).not.toHaveBeenCalled();
-      expect(mockUseNavigate).toHaveBeenCalledWith(
-        `${DEFAULT_ROUTE}?tab=activity`,
-        {
-          replace: true,
-          state: {
-            bridgeState: null,
-            stayOnHomePage: true,
-            token: null,
-          },
+      expect(mockUseNavigate).toHaveBeenCalledWith(DEFAULT_ROUTE, {
+        replace: true,
+        state: {
+          stayOnHomePage: true,
         },
-      );
+      });
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
 
-    it('routes to activity with replace when non-HW intent submission fails', async () => {
+    it('routes to default route with replace when non-HW intent submission fails', async () => {
       const store = makeMockStore();
       const consoleErrorSpy = jest
         .spyOn(console, 'error')
-        .mockImplementation(() => undefined);
-      try {
-        await setBackgroundConnection({
-          submitTx: submitTxSpy,
-          submitIntent: jest.fn().mockRejectedValue(new Error('submit failed')),
-          getStatePatches: jest.fn(),
-          setEnabledAllPopularNetworks: jest.fn(),
-        } as never);
-        const { result } = renderHook(() => useSubmitBridgeTransaction(), {
-          wrapper: makeWrapper(store),
-        });
-
-        const quoteWithIntent = {
-          ...DummyQuotesWithApproval.ETH_11_USDC_TO_ARB[0],
-          quote: {
-            ...DummyQuotesWithApproval.ETH_11_USDC_TO_ARB[0].quote,
-            intent: {
-              order: {},
-            },
-          },
-        };
-
-        await act(async () => {
-          await result.current.submitBridgeTransaction(
-            // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            quoteWithIntent as any,
-          );
-        });
-
-        expect(mockUseNavigate).toHaveBeenCalledWith(
-          `${DEFAULT_ROUTE}?tab=activity`,
-          {
-            replace: true,
-            state: {
-              bridgeState: null,
-              stayOnHomePage: true,
-              token: null,
-            },
+        .mockImplementationOnce(() => jest.fn());
+      submitIntentSpy.mockImplementationOnce((async () => {
+        throw new Error('submit failed');
+      }) as never);
+      const { result } = renderHook(() => useSubmitBridgeTransaction(), {
+        wrapper: makeWrapper(store),
+      });
+
+      const quoteWithIntent = {
+        ...DummyQuotesWithApproval.ETH_11_USDC_TO_ARB[0],
+        quote: {
+          ...DummyQuotesWithApproval.ETH_11_USDC_TO_ARB[0].quote,
+          intent: {
+            order: {},
           },
+        },
+      };
+
+      await act(async () => {
+        await result.current.submitBridgeTransaction(
+          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31973
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          quoteWithIntent as any,
         );
-      } finally {
-        consoleErrorSpy.mockRestore();
-      }
+      });
+
+      expect(mockUseNavigate).toHaveBeenCalledWith(DEFAULT_ROUTE, {
+        replace: true,
+        state: {
+          stayOnHomePage: true,
+        },
+      });
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
+      expect(consoleErrorSpy.mock.calls).toMatchInlineSnapshot(`
+      [
+        [
+          [Error: submit failed],
+        ],
+      ]
+    `);
     });
 
-    it('routes hardware-wallet intent quotes to activity after submit', async () => {
+    it('routes hardware-wallet intent quotes to default route after submit', async () => {
       const store = makeMockStore();
       isHardwareWalletSpy.mockImplementation(() => true);
       submitIntentSpy.mockReturnValueOnce((async () => undefined) as never);
@@ -482,18 +477,14 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         `${CROSS_CHAIN_SWAP_ROUTE}${AWAITING_SIGNATURES_ROUTE}`,
         { state: {} },
       );
-      expect(mockUseNavigate).toHaveBeenNthCalledWith(
-        2,
-        `${DEFAULT_ROUTE}?tab=activity`,
-        {
-          replace: true,
-          state: {
-            bridgeState: null,
-            stayOnHomePage: true,
-            token: null,
-          },
+      expect(mockUseNavigate).toHaveBeenNthCalledWith(2, DEFAULT_ROUTE, {
+        replace: true,
+        state: {
+          stayOnHomePage: true,
         },
-      );
+      });
+      expect(resetBridgeStoreSpy).not.toHaveBeenCalled();
+      expect(mockResetState).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index 20ce728c3b80..eb1b73d15108 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -6,6 +6,7 @@ import {
   isCrossChain,
 } from '@metamask/bridge-controller';
 import type { QuoteMetadata, QuoteResponse } from '@metamask/bridge-controller';
+import { useNavigate } from 'react-router-dom';
 import { isHardwareWallet } from '../../../../shared/lib/selectors';
 import { captureException } from '../../../../shared/lib/sentry';
 import {
@@ -27,6 +28,8 @@ import {
 } from '../../../contexts/hardware-wallets/HardwareWalletContext';
 import { isUserRejectedHardwareWalletError } from '../../../contexts/hardware-wallets/rpcErrorUtils';
 import { useBridgeNavigation } from '../../../hooks/bridge/useBridgeNavigation';
+import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+import { type MetaMaskReduxDispatch } from '../../../store/store';
 import { useEnableMissingNetwork } from './useEnableMissingNetwork';
 
 const ALLOWANCE_RESET_ERROR = 'Eth USDT allowance reset failed';
@@ -60,12 +63,10 @@ const isHardwareWalletUserRejection = (error: unknown): boolean => {
 };
 
 export default function useSubmitBridgeTransaction() {
-  const {
-    navigateToBridgePage,
-    navigateToHwSigningPage,
-    navigateToActivityPage,
-  } = useBridgeNavigation();
-  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  const { navigateToBridgePage, navigateToHwSigningPage } =
+    useBridgeNavigation();
+  const dispatch = useDispatch<MetaMaskReduxDispatch>();
   const hardwareWalletUsed = useSelector(isHardwareWallet);
 
   const smartTransactionsEnabled = useSelector(getIsStxEnabled);
@@ -130,25 +131,23 @@ export default function useSubmitBridgeTransaction() {
             accountAddress: fromAccount.address,
           }),
         );
-        navigateToActivityPage();
-        return;
-      }
-
-      await dispatch(
-        submitBridgeTx(
-          fromAccount.address,
-          quoteResponse,
-          smartTransactionsEnabled,
-          getQuotesReceivedProperties(
+      } else {
+        await dispatch(
+          submitBridgeTx(
+            fromAccount.address,
             quoteResponse,
-            // @ts-expect-error 'market_closed' will be added to QuoteWarning in the controller
-            warnings,
-            true,
-            recommendedQuote,
-            fromTokenBalanceInUsd,
+            smartTransactionsEnabled,
+            getQuotesReceivedProperties(
+              quoteResponse,
+              // @ts-expect-error 'market_closed' will be added to QuoteWarning in the controller
+              warnings,
+              true,
+              recommendedQuote,
+              fromTokenBalanceInUsd,
+            ),
           ),
-        ),
-      );
+        );
+      }
     } catch (e) {
       captureException(e);
       if (hardwareWalletUsed && isHardwareWalletUserRejection(e)) {
@@ -160,7 +159,10 @@ export default function useSubmitBridgeTransaction() {
       setIsSubmitting(false);
     }
 
-    navigateToActivityPage();
+    navigate(DEFAULT_ROUTE, {
+      state: { stayOnHomePage: true },
+      replace: true,
+    });
   };
 
   return {
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index a1470638f4ec..85a6b4fad98a 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import { act, fireEvent } from '@testing-library/react';
 import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
 import { enLocale as messages } from '../../../test/lib/i18n-helpers';
 import { createBridgeMockStore } from '../../../test/data/bridge/mock-bridge-store';
@@ -11,8 +12,10 @@ import {
   HardwareConnectionPermissionState,
   HardwareWalletProvider,
 } from '../../contexts/hardware-wallets';
+import * as bridgeActions from '../../ducks/bridge/actions';
 import CrossChainSwap from '.';
 
+const mockResetBridgeStore = jest.spyOn(bridgeActions, 'resetInputFields');
 const mockResetBridgeState = jest.fn();
 const mockUseHardwareWalletConfig = jest.fn();
 const mockUseHardwareWalletActions = jest.fn();
@@ -126,6 +129,44 @@ describe('Bridge', () => {
 
     expect(getByText(messages.swap.message)).toBeInTheDocument();
     expect(container).toMatchSnapshot();
+    expect(mockResetBridgeStore).toHaveBeenCalledTimes(0);
+    expect(mockResetBridgeState).toHaveBeenCalledTimes(0);
+  });
+
+  it('resets the bridge store and state when the Back button is clicked', async () => {
+    const bridgeMockStore = createBridgeMockStore({
+      featureFlagOverrides: {
+        bridgeConfig: {
+          support: true,
+          refreshRate: 5000,
+          maxRefreshCount: 5,
+          chains: {
+            '1': {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+          },
+        },
+      },
+      metamaskStateOverrides: {
+        useExternalServices: true,
+      },
+    });
+    const store = configureMockStore(middleware)(bridgeMockStore);
+
+    const { getByRole } = renderWithProvider(
+      <HardwareWalletProvider>
+        <CrossChainSwap />
+      </HardwareWalletProvider>,
+      store,
+      PREPARE_SWAP_ROUTE,
+    );
+
+    const backButton = getByRole('button', { name: messages.back.message });
+    await act(async () => {
+      fireEvent.click(backButton);
+    });
+    expect(mockResetBridgeStore).toHaveBeenCalledTimes(0);
     expect(mockResetBridgeState).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/ui/pages/bridge/prepare/__snapshots__/bridge-input-group.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/bridge-input-group.test.tsx.snap
index 981f801f2246..177fbd5157fd 100644
--- a/ui/pages/bridge/prepare/__snapshots__/bridge-input-group.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/bridge-input-group.test.tsx.snap
@@ -368,6 +368,7 @@ exports[`BridgeInputGroup should render popular tokens 2`] = `
         "chainId": "eip155:1",
         "decimals": 18,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png",
+        "isVerified": undefined,
         "name": "Ether",
         "rwaData": undefined,
         "symbol": "ETH",
@@ -380,6 +381,7 @@ exports[`BridgeInputGroup should render popular tokens 2`] = `
         "chainId": "eip155:1",
         "decimals": 10,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984.png",
+        "isVerified": undefined,
         "name": "Uniswap",
         "rwaData": undefined,
         "symbol": "UNI",
@@ -392,6 +394,7 @@ exports[`BridgeInputGroup should render popular tokens 2`] = `
         "chainId": "eip155:1",
         "decimals": 9,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x514910771af9ca656af840dff83e8264ecf986ca.png",
+        "isVerified": undefined,
         "name": "Link",
         "rwaData": undefined,
         "symbol": "LINK",
@@ -744,9 +747,9 @@ exports[`BridgeInputGroup should search for tokens 1`] = `
             style="position: relative; height: 234px; overflow-y: scroll;"
           >
             <div
-              class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+              class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
               data-index="0"
-              data-testid="bridge-asset"
+              data-testid="bridge-asset--eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
               style="position: absolute; top: 0px; left: 0px; transform: translateY(0px);"
             >
               <div
@@ -823,6 +826,7 @@ exports[`BridgeInputGroup should search for tokens 1`] = `
               <button
                 aria-label="View token details"
                 class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+                data-testid="bridge-asset-info-icon-eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
               >
                 <svg
                   class="inline-block w-4 h-4 text-inherit"
@@ -837,9 +841,9 @@ exports[`BridgeInputGroup should search for tokens 1`] = `
               </button>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+              class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
               data-index="1"
-              data-testid="bridge-asset"
+              data-testid="bridge-asset--eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5832"
               style="position: absolute; top: 0px; left: 0px; transform: translateY(78px);"
             >
               <div
@@ -916,6 +920,7 @@ exports[`BridgeInputGroup should search for tokens 1`] = `
               <button
                 aria-label="View token details"
                 class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+                data-testid="bridge-asset-info-icon-eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5832"
               >
                 <svg
                   class="inline-block w-4 h-4 text-inherit"
@@ -977,6 +982,7 @@ exports[`BridgeInputGroup should search for tokens 4`] = `
         "chainId": "eip155:1",
         "decimals": 18,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png",
+        "isVerified": undefined,
         "name": "Ether",
         "rwaData": undefined,
         "symbol": "ETH",
@@ -989,6 +995,7 @@ exports[`BridgeInputGroup should search for tokens 4`] = `
         "chainId": "eip155:1",
         "decimals": 10,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984.png",
+        "isVerified": undefined,
         "name": "Uniswap",
         "rwaData": undefined,
         "symbol": "UNI",
@@ -1001,6 +1008,7 @@ exports[`BridgeInputGroup should search for tokens 4`] = `
         "chainId": "eip155:1",
         "decimals": 9,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x514910771af9ca656af840dff83e8264ecf986ca.png",
+        "isVerified": undefined,
         "name": "Link",
         "rwaData": undefined,
         "symbol": "LINK",
@@ -1121,9 +1129,9 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
             style="position: relative; height: 234px; overflow-y: scroll;"
           >
             <div
-              class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+              class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
               data-index="0"
-              data-testid="bridge-asset"
+              data-testid="bridge-asset--eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
               style="position: absolute; top: 0px; left: 0px; transform: translateY(0px);"
             >
               <div
@@ -1200,6 +1208,7 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
               <button
                 aria-label="View token details"
                 class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+                data-testid="bridge-asset-info-icon-eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
               >
                 <svg
                   class="inline-block w-4 h-4 text-inherit"
@@ -1214,9 +1223,9 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
               </button>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+              class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
               data-index="1"
-              data-testid="bridge-asset"
+              data-testid="bridge-asset--eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5832"
               style="position: absolute; top: 0px; left: 0px; transform: translateY(78px);"
             >
               <div
@@ -1293,6 +1302,7 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
               <button
                 aria-label="View token details"
                 class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+                data-testid="bridge-asset-info-icon-eip155:1/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5832"
               >
                 <svg
                   class="inline-block w-4 h-4 text-inherit"
@@ -1307,9 +1317,9 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
               </button>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+              class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
               data-index="2"
-              data-testid="bridge-asset"
+              data-testid="bridge-asset--eip155:59144/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5833"
               style="position: absolute; top: 0px; left: 0px; transform: translateY(156px);"
             >
               <div
@@ -1386,6 +1396,7 @@ exports[`BridgeInputGroup should search for tokens 5`] = `
               <button
                 aria-label="View token details"
                 class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+                data-testid="bridge-asset-info-icon-eip155:59144/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5833"
               >
                 <svg
                   class="inline-block w-4 h-4 text-inherit"
@@ -1424,6 +1435,7 @@ exports[`BridgeInputGroup should search for tokens with hasNextPage 3`] = `
         "chainId": "eip155:1",
         "decimals": 18,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png",
+        "isVerified": undefined,
         "name": "Ether",
         "rwaData": undefined,
         "symbol": "ETH",
@@ -1436,6 +1448,7 @@ exports[`BridgeInputGroup should search for tokens with hasNextPage 3`] = `
         "chainId": "eip155:1",
         "decimals": 10,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984.png",
+        "isVerified": undefined,
         "name": "Uniswap",
         "rwaData": undefined,
         "symbol": "UNI",
@@ -1448,6 +1461,7 @@ exports[`BridgeInputGroup should search for tokens with hasNextPage 3`] = `
         "chainId": "eip155:1",
         "decimals": 9,
         "iconUrl": "https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x514910771af9ca656af840dff83e8264ecf986ca.png",
+        "isVerified": undefined,
         "name": "Link",
         "rwaData": undefined,
         "symbol": "LINK",
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index 4857e394de35..a475bb350995 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -27,52 +27,54 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
           />
         </div>
         <button
-          class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
           data-testid="bridge-source-button"
           style="padding: 8px 11px 8px 8px; min-width: fit-content;"
         >
           <div
-            class="relative inline-flex self-start"
-            style="margin-right: 2px;"
+            class="flex items-center gap-2"
           >
             <div
-              class="inline-flex"
+              class="relative inline-flex self-start"
             >
               <div
-                class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                class="inline-flex"
               >
-                <img
-                  alt="ETH"
-                  class="size-full object-contain"
-                  src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png"
-                />
+                <div
+                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                >
+                  <img
+                    alt="ETH"
+                    class="size-full object-contain"
+                    src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png"
+                  />
+                </div>
               </div>
-            </div>
-            <div
-              class="absolute"
-              style="bottom: 0px; right: 0px;"
-            >
               <div
-                class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                style="border-width: 1px; border-radius: 6px;"
+                class="absolute"
+                style="bottom: 0px; right: 0px;"
               >
-                <img
-                  alt="Ethereum"
-                  class="size-full object-contain"
-                  src="./images/eth_logo.svg"
-                />
+                <div
+                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                  style="border-width: 1px; border-radius: 6px;"
+                >
+                  <img
+                    alt="Ethereum"
+                    class="size-full object-contain"
+                    src="./images/eth_logo.svg"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-          <span
-            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-          >
             <label
-              class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+              class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
             >
               ETH
             </label>
-          </span>
+          </div>
+          <span
+            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+          />
           <span
             class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
             style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
@@ -137,52 +139,54 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
             />
           </div>
           <button
-            class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
             data-testid="bridge-destination-button"
             style="padding: 8px 11px 8px 8px; min-width: fit-content;"
           >
             <div
-              class="relative inline-flex self-start"
-              style="margin-right: 2px;"
+              class="flex items-center gap-2"
             >
               <div
-                class="inline-flex"
+                class="relative inline-flex self-start"
               >
                 <div
-                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                  class="inline-flex"
                 >
-                  <img
-                    alt="mUSD"
-                    class="size-full object-contain"
-                    src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
-                  />
+                  <div
+                    class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                  >
+                    <img
+                      alt="mUSD"
+                      class="size-full object-contain"
+                      src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
+                    />
+                  </div>
                 </div>
-              </div>
-              <div
-                class="absolute"
-                style="bottom: 0px; right: 0px;"
-              >
                 <div
-                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                  style="border-width: 1px; border-radius: 6px;"
+                  class="absolute"
+                  style="bottom: 0px; right: 0px;"
                 >
-                  <img
-                    alt="Ethereum"
-                    class="size-full object-contain"
-                    src="./images/eth_logo.svg"
-                  />
+                  <div
+                    class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                    style="border-width: 1px; border-radius: 6px;"
+                  >
+                    <img
+                      alt="Ethereum"
+                      class="size-full object-contain"
+                      src="./images/eth_logo.svg"
+                    />
+                  </div>
                 </div>
               </div>
-            </div>
-            <span
-              class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-            >
               <label
-                class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+                class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
               >
                 mUSD
               </label>
-            </span>
+            </div>
+            <span
+              class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+            />
             <span
               class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
               style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
@@ -258,52 +262,54 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
           />
         </div>
         <button
-          class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
           data-testid="bridge-source-button"
           style="padding: 8px 11px 8px 8px; min-width: fit-content;"
         >
           <div
-            class="relative inline-flex self-start"
-            style="margin-right: 2px;"
+            class="flex items-center gap-2"
           >
             <div
-              class="inline-flex"
+              class="relative inline-flex self-start"
             >
               <div
-                class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                class="inline-flex"
               >
-                <span
-                  class="text-muted text-s-body-sm leading-s-body-sm tracking-s-body-sm md:text-l-body-sm md:leading-l-body-sm md:tracking-l-body-sm font-medium font-default uppercase"
+                <div
+                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
                 >
-                  U
-                </span>
+                  <span
+                    class="text-muted text-s-body-sm leading-s-body-sm tracking-s-body-sm md:text-l-body-sm md:leading-l-body-sm md:tracking-l-body-sm font-medium font-default uppercase"
+                  >
+                    U
+                  </span>
+                </div>
               </div>
-            </div>
-            <div
-              class="absolute"
-              style="bottom: 0px; right: 0px;"
-            >
               <div
-                class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                style="border-width: 1px; border-radius: 6px;"
+                class="absolute"
+                style="bottom: 0px; right: 0px;"
               >
-                <img
-                  alt="Ethereum"
-                  class="size-full object-contain"
-                  src="./images/eth_logo.svg"
-                />
+                <div
+                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                  style="border-width: 1px; border-radius: 6px;"
+                >
+                  <img
+                    alt="Ethereum"
+                    class="size-full object-contain"
+                    src="./images/eth_logo.svg"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-          <span
-            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-          >
             <label
-              class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+              class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
             >
               USDC
             </label>
-          </span>
+          </div>
+          <span
+            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+          />
           <span
             class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
             style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
@@ -370,52 +376,54 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
             />
           </div>
           <button
-            class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
             data-testid="bridge-destination-button"
             style="padding: 8px 11px 8px 8px; min-width: fit-content;"
           >
             <div
-              class="relative inline-flex self-start"
-              style="margin-right: 2px;"
+              class="flex items-center gap-2"
             >
               <div
-                class="inline-flex"
+                class="relative inline-flex self-start"
               >
                 <div
-                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                  class="inline-flex"
                 >
-                  <img
-                    alt="UNI"
-                    class="size-full object-contain"
-                    src="http://url"
-                  />
+                  <div
+                    class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+                  >
+                    <img
+                      alt="UNI"
+                      class="size-full object-contain"
+                      src="http://url"
+                    />
+                  </div>
                 </div>
-              </div>
-              <div
-                class="absolute"
-                style="bottom: 0px; right: 0px;"
-              >
                 <div
-                  class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
-                  style="border-width: 1px; border-radius: 6px;"
+                  class="absolute"
+                  style="bottom: 0px; right: 0px;"
                 >
-                  <img
-                    alt="Linea"
-                    class="size-full object-contain"
-                    src="./images/linea-logo-mainnet.svg"
-                  />
+                  <div
+                    class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+                    style="border-width: 1px; border-radius: 6px;"
+                  >
+                    <img
+                      alt="Linea"
+                      class="size-full object-contain"
+                      src="./images/linea-logo-mainnet.svg"
+                    />
+                  </div>
                 </div>
               </div>
-            </div>
-            <span
-              class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-            >
               <label
-                class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+                class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
               >
                 UNI
               </label>
-            </span>
+            </div>
+            <span
+              class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+            />
             <span
               class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
               style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index 997536067cab..7398693b036b 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -6,8 +6,11 @@ import {
   formatChainIdToCaip,
 } from '@metamask/bridge-controller';
 import { userEvent } from '@testing-library/user-event';
-import { act } from '@testing-library/react';
-import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { act, render, waitFor } from '@testing-library/react';
+import {
+  createProviderWrapper,
+  renderWithProvider,
+} from '../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../store/store';
 import { createBridgeMockStore } from '../../../../test/data/bridge/mock-bridge-store';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
@@ -22,12 +25,24 @@ import {
   HardwareWalletType,
 } from '../../../contexts/hardware-wallets';
 import { setBackgroundConnection } from '../../../store/background-connection';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsHardwareWalletRecoveryLocation,
+} from '../../../../shared/constants/metametrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from '../../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked';
+import * as useSubmitBridgeTransactionModule from '../hooks/useSubmitBridgeTransaction';
 import { BridgeCTAButton } from './bridge-cta-button';
 
+const mockTrackHardwareWalletRecoveryConnectCtaClicked = jest.mocked(
+  trackHardwareWalletRecoveryConnectCtaClicked,
+);
+
 const mockUseHardwareWalletConfig = jest.fn();
 const mockUseHardwareWalletActions = jest.fn();
 const mockUseHardwareWalletState = jest.fn();
 const mockOnOpenPriceImpactWarningModal = jest.fn();
+const mockResetState = jest.fn();
 
 jest.mock('../../../contexts/hardware-wallets', () => ({
   ...jest.requireActual('../../../contexts/hardware-wallets'),
@@ -35,6 +50,9 @@ jest.mock('../../../contexts/hardware-wallets', () => ({
   useHardwareWalletActions: () => mockUseHardwareWalletActions(),
   useHardwareWalletState: () => mockUseHardwareWalletState(),
 }));
+jest.mock(
+  '../../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked',
+);
 
 const baseHardwareWalletConfig = {
   isHardwareWalletAccount: false,
@@ -48,11 +66,13 @@ setBackgroundConnection({
   submitTx: jest.fn(),
   setEnabledAllPopularNetworks: jest.fn(),
   getStatePatches: jest.fn(),
+  resetState: () => mockResetState(),
 } as never);
 
 describe('BridgeCTAButton', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    mockTrackHardwareWalletRecoveryConnectCtaClicked.mockReset();
     mockUseHardwareWalletConfig.mockReturnValue(baseHardwareWalletConfig);
     mockUseHardwareWalletActions.mockReturnValue({
       ensureDeviceReady: jest.fn().mockResolvedValue(true),
@@ -87,6 +107,7 @@ describe('BridgeCTAButton', () => {
     expect(container).toMatchSnapshot();
 
     expect(getByText(messages.swapSelectToken.message)).toBeInTheDocument();
+    expect(mockResetState).not.toHaveBeenCalled();
   });
 
   it('should render the component when amount is missing', () => {
@@ -299,6 +320,78 @@ describe('BridgeCTAButton', () => {
     expect(getByRole('button')).not.toBeDisabled();
   });
 
+  it('calls recovery CTA analytics when hardware wallet user submits while device is disconnected', async () => {
+    const mockSubmitBridgeTransaction = jest.fn().mockResolvedValue(undefined);
+    const useSubmitSpy = jest
+      .spyOn(useSubmitBridgeTransactionModule, 'default')
+      .mockImplementation(() => ({
+        submitBridgeTransaction: mockSubmitBridgeTransaction,
+        isSubmitting: false,
+      }));
+
+    const mockTrackEvent = jest.fn().mockResolvedValue(undefined);
+    const connectionState = { status: ConnectionStatus.Disconnected as const };
+    mockUseHardwareWalletConfig.mockReturnValue({
+      ...baseHardwareWalletConfig,
+      isHardwareWalletAccount: true,
+      walletType: HardwareWalletType.Ledger,
+    });
+    mockUseHardwareWalletState.mockReturnValue({
+      connectionState,
+    });
+
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
+        bridgeConfig: {
+          chainRanking: [
+            { chainId: formatChainIdToCaip(CHAIN_IDS.MAINNET) },
+            { chainId: formatChainIdToCaip(CHAIN_IDS.OPTIMISM) },
+            { chainId: formatChainIdToCaip(CHAIN_IDS.LINEA_MAINNET) },
+          ],
+        },
+      },
+      bridgeSliceOverrides: {
+        fromTokenInputValue: '1',
+        fromToken: toBridgeToken(getNativeAssetForChainId(CHAIN_IDS.MAINNET)),
+        toToken: toBridgeToken(
+          getNativeAssetForChainId(CHAIN_IDS.LINEA_MAINNET),
+        ),
+      },
+      bridgeStateOverrides: {
+        quotes: mockBridgeQuotesNativeErc20 as unknown as QuoteResponse[],
+        quotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.FETCHED,
+      },
+    });
+    const store = configureStore(mockStore);
+    const Wrapper = createProviderWrapper(store, '/', () => mockTrackEvent);
+
+    const { getByRole } = render(
+      <HardwareWalletProvider>
+        <BridgeCTAButton
+          onFetchNewQuotes={jest.fn()}
+          onOpenPriceImpactWarningModal={mockOnOpenPriceImpactWarningModal}
+        />
+      </HardwareWalletProvider>,
+      { wrapper: Wrapper },
+    );
+
+    await act(async () => {
+      await userEvent.click(getByRole('button'));
+    });
+
+    expect(
+      mockTrackHardwareWalletRecoveryConnectCtaClicked,
+    ).toHaveBeenCalledWith(mockTrackEvent, {
+      location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+      walletType: HardwareWalletType.Ledger,
+      connectionState,
+    });
+    expect(mockSubmitBridgeTransaction).toHaveBeenCalledTimes(1);
+
+    useSubmitSpy.mockRestore();
+  });
+
   it('should disable the component when quotes are loading and there are no existing quotes', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index 4767993f64a8..0099d412e7cd 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useContext, useMemo } from 'react';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import {
   Button,
@@ -34,6 +34,9 @@ import {
   useHardwareWalletState,
 } from '../../../contexts/hardware-wallets';
 import { setWasTxDeclined } from '../../../ducks/bridge/actions';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from '../../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked';
+import { MetaMetricsHardwareWalletRecoveryLocation } from '../../../../shared/constants/metametrics';
 
 export const BridgeCTAButton = ({
   onFetchNewQuotes,
@@ -81,6 +84,8 @@ export const BridgeCTAButton = ({
 
   const isTxSubmittable = useIsTxSubmittable();
 
+  const { trackEvent } = useContext(MetaMetricsContext);
+
   const { isHardwareWalletAccount, walletType } = useHardwareWalletConfig();
   const { connectionState } = useHardwareWalletState();
 
@@ -206,6 +211,13 @@ export const BridgeCTAButton = ({
           if (isPriceImpactError) {
             onOpenPriceImpactWarningModal();
           } else {
+            if (isHardwareWalletAccount && !isHardwareWalletReady) {
+              trackHardwareWalletRecoveryConnectCtaClicked(trackEvent, {
+                location: MetaMetricsHardwareWalletRecoveryLocation.Swaps,
+                walletType,
+                connectionState,
+              });
+            }
             await submitBridgeTransaction(activeQuote);
           }
         }
diff --git a/ui/pages/bridge/prepare/bridge-input-group.test.tsx b/ui/pages/bridge/prepare/bridge-input-group.test.tsx
index 72350e7e6246..f107c576ae1e 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.test.tsx
@@ -24,6 +24,9 @@ import configureStore from '../../../store/store';
 import { toBridgeToken } from '../../../ducks/bridge/utils';
 import { BridgeInputGroup } from './bridge-input-group';
 
+/** Matches `data-testid` on asset rows: `bridge-asset--${caipAssetId}` */
+const BRIDGE_ASSET_ROW_TEST_ID = /^bridge-asset--/u;
+
 const mockUseVirtualizer = jest.fn();
 
 jest.mock('lodash/debounce', () => ({
@@ -220,7 +223,7 @@ describe('BridgeInputGroup', () => {
     expect(getByTestId('bridge-asset-picker-modal')).toMatchSnapshot();
     expect(
       screen
-        .getAllByTestId('bridge-asset')
+        .getAllByTestId(BRIDGE_ASSET_ROW_TEST_ID)
         .map(({ textContent }) => textContent),
     ).toMatchInlineSnapshot(`
       [
@@ -234,7 +237,7 @@ describe('BridgeInputGroup', () => {
     await waitFor(() => {
       expect(
         screen
-          .getAllByTestId('bridge-asset')
+          .getAllByTestId(BRIDGE_ASSET_ROW_TEST_ID)
           .map(({ textContent }) => textContent),
       ).toMatchInlineSnapshot(`
               [
@@ -268,7 +271,7 @@ describe('BridgeInputGroup', () => {
     await openAssetPicker();
     expect(
       screen
-        .getAllByTestId('bridge-asset')
+        .getAllByTestId(BRIDGE_ASSET_ROW_TEST_ID)
         .map(({ textContent }) => textContent),
     ).toMatchInlineSnapshot(`
       [
@@ -281,7 +284,7 @@ describe('BridgeInputGroup', () => {
     await waitFor(() => {
       expect(
         screen
-          .getAllByTestId('bridge-asset')
+          .getAllByTestId(BRIDGE_ASSET_ROW_TEST_ID)
           .map(({ textContent }) => textContent),
       ).toMatchInlineSnapshot(`
         [
@@ -318,7 +321,7 @@ describe('BridgeInputGroup', () => {
 
     expect(
       screen
-        .getAllByTestId('bridge-asset')
+        .getAllByTestId(BRIDGE_ASSET_ROW_TEST_ID)
         .map(({ textContent }) => textContent),
     ).toMatchInlineSnapshot(`
         [
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/asset.test.tsx.snap b/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/asset.test.tsx.snap
index 081d55d0bac3..0ce38d768f68 100644
--- a/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/asset.test.tsx.snap
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/asset.test.tsx.snap
@@ -2,8 +2,8 @@
 
 exports[`BridgeAsset should render ERC20 asset 1`] = `
 <div
-  class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
-  data-testid="bridge-asset"
+  class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+  data-testid="bridge-asset--eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
 >
   <div
     class="relative inline-flex self-start"
@@ -79,6 +79,7 @@ exports[`BridgeAsset should render ERC20 asset 1`] = `
   <button
     aria-label="View token details"
     class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+    data-testid="bridge-asset-info-icon-eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
   >
     <svg
       class="inline-block w-4 h-4 text-inherit"
@@ -96,8 +97,8 @@ exports[`BridgeAsset should render ERC20 asset 1`] = `
 
 exports[`BridgeAsset should render asset with accountType 1`] = `
 <div
-  class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
-  data-testid="bridge-asset"
+  class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+  data-testid="bridge-asset--bip122:000000000019d6689c085ae165831e93/slip44:0"
 >
   <div
     class="relative inline-flex self-start"
@@ -182,6 +183,7 @@ exports[`BridgeAsset should render asset with accountType 1`] = `
   <button
     aria-label="View token details"
     class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+    data-testid="bridge-asset-info-icon-bip122:000000000019d6689c085ae165831e93/slip44:0"
   >
     <svg
       class="inline-block w-4 h-4 text-inherit"
@@ -199,8 +201,8 @@ exports[`BridgeAsset should render asset with accountType 1`] = `
 
 exports[`BridgeAsset should render asset with balance 1`] = `
 <div
-  class="mm-box mm-container mm-container--max-width-undefined bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
-  data-testid="bridge-asset"
+  class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+  data-testid="bridge-asset--eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
 >
   <div
     class="relative inline-flex self-start"
@@ -280,6 +282,7 @@ exports[`BridgeAsset should render asset with balance 1`] = `
   <button
     aria-label="View token details"
     class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+    data-testid="bridge-asset-info-icon-eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
   >
     <svg
       class="inline-block w-4 h-4 text-inherit"
@@ -297,8 +300,8 @@ exports[`BridgeAsset should render asset with balance 1`] = `
 
 exports[`BridgeAsset should render native asset 1`] = `
 <div
-  class="mm-box mm-container mm-container--max-width-undefined bridge-asset--selected mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-primary-muted mm-box--rounded-none"
-  data-testid="bridge-asset"
+  class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset--selected mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-primary-muted mm-box--rounded-none"
+  data-testid="bridge-asset--eip155:1/slip44:60"
 >
   <div
     class="bg-primary-default multichain-network-list-item__selected-indicator"
@@ -378,6 +381,113 @@ exports[`BridgeAsset should render native asset 1`] = `
   <button
     aria-label="View token details"
     class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+    data-testid="bridge-asset-info-icon-eip155:1/slip44:60"
+  >
+    <svg
+      class="inline-block w-4 h-4 text-inherit"
+      fill="currentColor"
+      viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M11 17h2v-6h-2zm1-8q.424 0 .713-.287c.289-.287.287-.43.287-.713s-.096-.52-.287-.712S12.283 7 12 7s-.52.096-.712.288S11 7.717 11 8s.096.52.288.713S11.717 9 12 9m0 13q-2.075 0-3.9-.787c-1.825-.788-2.275-1.238-3.175-2.138S3.313 17.117 2.788 15.9 2 13.383 2 12s.262-2.683.787-3.9 1.238-2.275 2.138-3.175S6.883 3.312 8.1 2.787 10.617 2 12 2s2.683.262 3.9.787 2.275 1.238 3.175 2.138 1.613 1.958 2.138 3.175S22 10.617 22 12s-.262 2.683-.787 3.9-1.238 2.275-2.138 3.175-1.958 1.613-3.175 2.138S13.383 22 12 22m0-2q3.35 0 5.675-2.325C20 15.35 20 14.233 20 12q0-3.35-2.325-5.675C15.35 4 14.233 4 12 4Q8.65 4 6.325 6.325C4 8.65 4 9.767 4 12q0 3.35 2.325 5.675C8.65 20 9.767 20 12 20"
+      />
+    </svg>
+  </button>
+</div>
+`;
+
+exports[`BridgeAsset should render verified badge when isVerified is true 1`] = `
+<div
+  class="mm-box mm-container mm-container--max-width-undefined cursor-pointer bridge-asset mm-box--padding-4 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--height-max mm-box--background-color-transparent mm-box--rounded-none"
+  data-testid="bridge-asset--eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
+>
+  <div
+    class="relative inline-flex self-start"
+    style="align-self: center;"
+  >
+    <div
+      class="inline-flex"
+    >
+      <div
+        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+      >
+        <img
+          alt="mUSD"
+          class="size-full object-contain"
+          src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
+        />
+      </div>
+    </div>
+    <div
+      class="absolute"
+      color="background-default"
+      style="bottom: 0px; right: 0px;"
+    >
+      <div
+        class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-lg h-[34px] w-[34px] border-background-default border"
+        style="width: 20px; height: 20px; border-width: 2px; border-radius: 4px;"
+      >
+        <img
+          alt="Ethereum"
+          class="size-full object-contain"
+          src="./images/eth_logo.svg"
+        />
+      </div>
+    </div>
+  </div>
+  <div
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    style="overflow: hidden; margin-left: 8px;"
+  >
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-flex-start"
+    >
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
+        <p
+          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default truncate"
+          data-testid="bridge-asset-symbol"
+        >
+          mUSD
+        </p>
+        <svg
+          class="inline-block w-4 h-4 text-info-default"
+          data-testid="bridge-asset-verified-badge"
+          fill="currentColor"
+          viewBox="0 0 24 24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="m8.6 22.5-1.9-3.2-3.6-.8.35-3.7L1 12l2.45-2.8-.35-3.7 3.6-.8 1.9-3.2L12 2.95l3.4-1.45 1.9 3.2 3.6.8-.35 3.7L23 12l-2.45 2.8.35 3.7-3.6.8-1.9 3.2-3.4-1.45zm2.35-6.95L16.6 9.9l-1.4-1.45-4.25 4.25-2.15-2.1L7.4 12z"
+          />
+        </svg>
+      </div>
+      <p
+        class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default"
+        style="white-space: nowrap;"
+      />
+    </div>
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-flex-end"
+    >
+      <p
+        class="text-alternative text-s-body-sm leading-s-body-sm tracking-s-body-sm md:text-l-body-sm md:leading-l-body-sm md:tracking-l-body-sm font-regular font-default truncate"
+        style="white-space: nowrap;"
+      >
+        MetaMask USD
+      </p>
+      <p
+        class="text-alternative text-s-body-sm leading-s-body-sm tracking-s-body-sm md:text-l-body-sm md:leading-l-body-sm md:tracking-l-body-sm font-regular font-default"
+        style="white-space: nowrap;"
+      />
+    </div>
+  </div>
+  <button
+    aria-label="View token details"
+    class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default bridge-asset-info-icon"
+    data-testid="bridge-asset-info-icon-eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA"
   >
     <svg
       class="inline-block w-4 h-4 text-inherit"
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/selected-asset-button.test.tsx.snap b/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/selected-asset-button.test.tsx.snap
new file mode 100644
index 000000000000..06d06babd6a9
--- /dev/null
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/__snapshots__/selected-asset-button.test.tsx.snap
@@ -0,0 +1,175 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SelectedAssetButton renders with a native asset 1`] = `
+<div>
+  <button
+    class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+    style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+  >
+    <div
+      class="flex items-center gap-2"
+    >
+      <div
+        class="relative inline-flex self-start"
+      >
+        <div
+          class="inline-flex"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+          >
+            <img
+              alt="ETH"
+              class="size-full object-contain"
+              src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png"
+            />
+          </div>
+        </div>
+        <div
+          class="absolute"
+          style="bottom: 0px; right: 0px;"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+            style="border-width: 1px; border-radius: 6px;"
+          >
+            <img
+              alt="Ethereum"
+              class="size-full object-contain"
+              src="./images/eth_logo.svg"
+            />
+          </div>
+        </div>
+      </div>
+      <label
+        class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+      >
+        ETH
+      </label>
+    </div>
+    <span
+      class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    />
+    <span
+      class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+      style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
+    />
+  </button>
+</div>
+`;
+
+exports[`SelectedAssetButton renders with a non-EVM asset 1`] = `
+<div>
+  <button
+    class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+    style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+  >
+    <div
+      class="flex items-center gap-2"
+    >
+      <div
+        class="relative inline-flex self-start"
+      >
+        <div
+          class="inline-flex"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+          >
+            <img
+              alt="BTC"
+              class="size-full object-contain"
+              src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/bip122/000000000019d6689c085ae165831e93/slip44/0.png"
+            />
+          </div>
+        </div>
+        <div
+          class="absolute"
+          style="bottom: 0px; right: 0px;"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+            style="border-width: 1px; border-radius: 6px;"
+          >
+            <img
+              alt="Bitcoin"
+              class="size-full object-contain"
+              src="./images/bitcoin-logo.svg"
+            />
+          </div>
+        </div>
+      </div>
+      <label
+        class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+      >
+        BTC
+      </label>
+    </div>
+    <span
+      class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    />
+    <span
+      class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+      style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
+    />
+  </button>
+</div>
+`;
+
+exports[`SelectedAssetButton renders with an ERC20 asset 1`] = `
+<div>
+  <button
+    class="mm-box mm-text mm-select-button mm-select-button--size-lg bridge-selected-asset-button mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+    style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+  >
+    <div
+      class="flex items-center gap-2"
+    >
+      <div
+        class="relative inline-flex self-start"
+      >
+        <div
+          class="inline-flex"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-full h-8 w-8"
+          >
+            <img
+              alt="mUSD"
+              class="size-full object-contain"
+              src="https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png"
+            />
+          </div>
+        </div>
+        <div
+          class="absolute"
+          style="bottom: 0px; right: 0px;"
+        >
+          <div
+            class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-sm h-[18px] w-[18px] border-background-default border"
+            style="border-width: 1px; border-radius: 6px;"
+          >
+            <img
+              alt="Ethereum"
+              class="size-full object-contain"
+              src="./images/eth_logo.svg"
+            />
+          </div>
+        </div>
+      </div>
+      <label
+        class="mm-box mm-text mm-label cursor-pointer mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+      >
+        mUSD
+      </label>
+    </div>
+    <span
+      class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+    />
+    <span
+      class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+      style="mask-image: url('./images/icons/arrow-down.svg'); display: none;"
+    />
+  </button>
+</div>
+`;
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.test.tsx b/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.test.tsx
index ea4c03f45695..d349852f11bf 100644
--- a/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.test.tsx
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.test.tsx
@@ -18,7 +18,7 @@ describe('BridgeAsset', () => {
     );
 
     expect(getByText('ETH')).toBeInTheDocument();
-    expect(getByTestId('bridge-asset')).toMatchSnapshot();
+    expect(getByTestId(/^bridge-asset--/u)).toMatchSnapshot();
   });
 
   it('should render ERC20 asset', () => {
@@ -32,7 +32,7 @@ describe('BridgeAsset', () => {
       configureStore(createBridgeMockStore({})),
     );
     expect(getByText('mUSD')).toBeInTheDocument();
-    expect(getByTestId('bridge-asset')).toMatchSnapshot();
+    expect(getByTestId(/^bridge-asset--/u)).toMatchSnapshot();
   });
 
   it('should render asset with balance', () => {
@@ -50,7 +50,7 @@ describe('BridgeAsset', () => {
       configureStore(createBridgeMockStore({})),
     );
     expect(getByText('mUSD')).toBeInTheDocument();
-    expect(getByTestId('bridge-asset')).toMatchSnapshot();
+    expect(getByTestId(/^bridge-asset--/u)).toMatchSnapshot();
   });
 
   it('should render asset with accountType', () => {
@@ -66,6 +66,58 @@ describe('BridgeAsset', () => {
     );
     expect(getByText('BTC')).toBeInTheDocument();
     expect(getByText('Native SegWit')).toBeInTheDocument();
-    expect(getByTestId('bridge-asset')).toMatchSnapshot();
+    expect(getByTestId(/^bridge-asset--/u)).toMatchSnapshot();
+  });
+
+  it('should render verified badge when isVerified is true', () => {
+    const { getByTestId } = renderWithProvider(
+      <BridgeAsset
+        asset={{
+          ...toBridgeToken(
+            BRIDGE_CHAINID_COMMON_TOKEN_PAIR['eip155:1'] as never,
+          ),
+          isVerified: true,
+        }}
+        selected={false}
+      />,
+      configureStore(createBridgeMockStore({})),
+    );
+    expect(getByTestId('bridge-asset-verified-badge')).toBeInTheDocument();
+    expect(getByTestId(/^bridge-asset--/u)).toMatchSnapshot();
+  });
+
+  it('does not render verified badge when isVerified is false', () => {
+    const { getByTestId, queryByTestId } = renderWithProvider(
+      <BridgeAsset
+        asset={{
+          ...toBridgeToken(
+            BRIDGE_CHAINID_COMMON_TOKEN_PAIR['eip155:1'] as never,
+          ),
+          isVerified: false,
+        }}
+        selected={false}
+      />,
+      configureStore(createBridgeMockStore({})),
+    );
+    expect(getByTestId('bridge-asset-symbol')).toBeInTheDocument();
+    expect(
+      queryByTestId('bridge-asset-verified-badge'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('does not render verified badge when isVerified is absent', () => {
+    const { getByTestId, queryByTestId } = renderWithProvider(
+      <BridgeAsset
+        asset={toBridgeToken(
+          BRIDGE_CHAINID_COMMON_TOKEN_PAIR['eip155:1'] as never,
+        )}
+        selected={false}
+      />,
+      configureStore(createBridgeMockStore({})),
+    );
+    expect(getByTestId('bridge-asset-symbol')).toBeInTheDocument();
+    expect(
+      queryByTestId('bridge-asset-verified-badge'),
+    ).not.toBeInTheDocument();
   });
 });
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.tsx b/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.tsx
index 9a85c70147da..3ca7b088ce7f 100644
--- a/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.tsx
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/asset.tsx
@@ -8,6 +8,8 @@ import {
   Box,
   BoxBackgroundColor,
   ButtonIcon,
+  Icon,
+  IconColor,
   IconName,
   IconSize,
   Text,
@@ -75,10 +77,10 @@ export const BridgeAsset = React.forwardRef(
         backgroundColor={
           selected ? BackgroundColor.primaryMuted : BackgroundColor.transparent
         }
-        className={`bridge-asset${selected ? '--selected' : ''}`}
+        className={`cursor-pointer bridge-asset${selected ? '--selected' : ''}`}
         height={BlockSize.Max}
         width={BlockSize.Full}
-        data-testid={'bridge-asset'}
+        data-testid={`bridge-asset--${asset.assetId}`}
       >
         {selected && (
           <Box
@@ -128,6 +130,14 @@ export const BridgeAsset = React.forwardRef(
               <Text ellipsis data-testid="bridge-asset-symbol">
                 {asset.symbol}
               </Text>
+              {asset.isVerified && (
+                <Icon
+                  data-testid="bridge-asset-verified-badge"
+                  name={IconName.VerifiedFilled}
+                  size={IconSize.Sm}
+                  color={IconColor.InfoDefault}
+                />
+              )}
               {asset.accountType && ACCOUNT_TYPE_LABELS[asset.accountType] && (
                 <Tag label={ACCOUNT_TYPE_LABELS[asset.accountType]} />
               )}
@@ -182,6 +192,7 @@ export const BridgeAsset = React.forwardRef(
           iconProps={{
             size: IconSize.Sm,
           }}
+          data-testid={`bridge-asset-info-icon-${asset.assetId}`}
         />
       </Row>
     );
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/index.scss b/ui/pages/bridge/prepare/components/bridge-asset-picker/index.scss
index 0026b9499a62..e90de1fcc50c 100644
--- a/ui/pages/bridge/prepare/components/bridge-asset-picker/index.scss
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/index.scss
@@ -19,3 +19,12 @@
   height: fit-content;
   color: var(--color-icon-alternative);
 }
+
+.bridge-selected-asset-button {
+  // SelectButton always renders a content Box for label/description slots.
+  // Since we put all content in startAccessory, hide it when empty to
+  // prevent it from adding extra width inside the flex row.
+  .mm-select-button__content:empty {
+    display: none;
+  }
+}
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.test.tsx b/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.test.tsx
new file mode 100644
index 000000000000..e5c5461888ef
--- /dev/null
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.test.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { ChainId, getNativeAssetForChainId } from '@metamask/bridge-controller';
+import { BRIDGE_CHAINID_COMMON_TOKEN_PAIR } from '../../../../../../shared/constants/bridge';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
+import { createBridgeMockStore } from '../../../../../../test/data/bridge/mock-bridge-store';
+import configureStore from '../../../../../store/store';
+import { toBridgeToken } from '../../../../../ducks/bridge/utils';
+import { SelectedAssetButton } from './selected-asset-button';
+
+const renderButton = (asset: ReturnType<typeof toBridgeToken>) =>
+  renderWithProvider(
+    <SelectedAssetButton asset={asset} onClick={jest.fn()} />,
+    configureStore(createBridgeMockStore({})),
+  );
+
+describe('SelectedAssetButton', () => {
+  it('renders with a native asset', () => {
+    const { getByText, container } = renderButton(
+      toBridgeToken(getNativeAssetForChainId('0x1')),
+    );
+
+    expect(getByText('ETH')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders with an ERC20 asset', () => {
+    const { getByText, container } = renderButton(
+      toBridgeToken(BRIDGE_CHAINID_COMMON_TOKEN_PAIR['eip155:1'] as never),
+    );
+
+    expect(getByText('mUSD')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders with a non-EVM asset', () => {
+    const { getByText, container } = renderButton(
+      toBridgeToken(getNativeAssetForChainId(ChainId.BTC)),
+    );
+
+    expect(getByText('BTC')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the network badge overlay', () => {
+    const { container } = renderButton(
+      toBridgeToken(getNativeAssetForChainId('0x1')),
+    );
+
+    // BadgeWrapper renders an absolute-positioned overlay badge
+    const badgeWrapper = container.querySelector('.relative.inline-flex');
+    expect(badgeWrapper).toBeInTheDocument();
+  });
+
+  it('applies the bridge-selected-asset-button class', () => {
+    const { container } = renderButton(
+      toBridgeToken(getNativeAssetForChainId('0x1')),
+    );
+
+    expect(
+      container.querySelector('.bridge-selected-asset-button'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.tsx b/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.tsx
index c42693e73682..9a4cafa31bf3 100644
--- a/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.tsx
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker/selected-asset-button.tsx
@@ -16,11 +16,11 @@ import {
   BorderColor,
   BorderRadius,
   Display,
-  OverflowWrap,
 } from '../../../../../helpers/constants/design-system';
 import { BridgeToken } from '../../../../../ducks/bridge/types';
 import {
   IconName,
+  Label,
   SelectButton,
 } from '../../../../../components/component-library';
 import {
@@ -38,6 +38,7 @@ export const SelectedAssetButton = ({
 
   return (
     <SelectButton
+      className="bridge-selected-asset-button"
       borderRadius={BorderRadius.pill}
       backgroundColor={BackgroundColor.backgroundDefault}
       borderColor={BorderColor.borderMuted}
@@ -48,31 +49,28 @@ export const SelectedAssetButton = ({
       }}
       size={SelectButtonSize.Lg}
       alignItems={AlignItems.center}
-      descriptionProps={{
-        overflowWrap: OverflowWrap.BreakWord,
-        ellipsis: false,
-      }}
       caretIconProps={{
         name: IconName.ArrowDown,
         style: { display: Display.None },
       }}
-      label={asset.symbol}
       startAccessory={
-        <BadgeWrapper
-          key={asset.assetId}
-          style={{ marginRight: 2 }}
-          badge={
-            <AvatarNetwork
-              name={NETWORK_TO_SHORT_NETWORK_NAME_MAP[caipChainId]}
-              src={BRIDGE_CHAIN_ID_TO_NETWORK_IMAGE_MAP[caipChainId]}
-              size={AvatarNetworkSize.Xs}
-              style={{ borderWidth: 1, borderRadius: 6 }}
-              hasBorder
-            />
-          }
-        >
-          <AvatarToken src={asset.iconUrl ?? undefined} name={asset.symbol} />
-        </BadgeWrapper>
+        <div className="flex items-center gap-2">
+          <BadgeWrapper
+            key={asset.assetId}
+            badge={
+              <AvatarNetwork
+                name={NETWORK_TO_SHORT_NETWORK_NAME_MAP[caipChainId]}
+                src={BRIDGE_CHAIN_ID_TO_NETWORK_IMAGE_MAP[caipChainId]}
+                size={AvatarNetworkSize.Xs}
+                style={{ borderWidth: 1, borderRadius: 6 }}
+                hasBorder
+              />
+            }
+          >
+            <AvatarToken src={asset.iconUrl ?? undefined} name={asset.symbol} />
+          </BadgeWrapper>
+          <Label className="cursor-pointer">{asset.symbol}</Label>
+        </div>
       }
       {...props}
     />
diff --git a/ui/pages/bridge/prepare/components/index.scss b/ui/pages/bridge/prepare/components/index.scss
index fbf0fe9814c0..c182c4f471c5 100644
--- a/ui/pages/bridge/prepare/components/index.scss
+++ b/ui/pages/bridge/prepare/components/index.scss
@@ -9,7 +9,7 @@
 }
 
 .bridge-asset {
-  &:hover:not(&--selected) {
+  &:hover:not(&--selected):not(:has(.bridge-asset-info-icon:hover)) {
     background: var(--color-background-default-hover);
   }
 }
diff --git a/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap b/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
index ed2b098e124c..6964ff79490b 100644
--- a/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
+++ b/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
@@ -67,11 +67,11 @@ exports[`BridgeQuotesModal should render gasIncluded quotes 1`] = `
           </div>
           <div
             class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-            style="overflow: scroll;"
+            style="overflow: auto;"
           >
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option bridge-quote-option--selected mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--background-color-primary-default"
@@ -125,8 +125,8 @@ exports[`BridgeQuotesModal should render gasIncluded quotes 1`] = `
               </div>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full"
@@ -245,11 +245,11 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
           </div>
           <div
             class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-            style="overflow: scroll;"
+            style="overflow: auto;"
           >
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option bridge-quote-option--selected mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--background-color-primary-default"
@@ -303,8 +303,8 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
               </div>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full"
@@ -423,11 +423,11 @@ exports[`BridgeQuotesModal should render the modal when exchange rates are not a
           </div>
           <div
             class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
-            style="overflow: scroll;"
+            style="overflow: auto;"
           >
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option bridge-quote-option--selected mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full mm-box--background-color-primary-muted"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--background-color-primary-default"
@@ -479,8 +479,8 @@ exports[`BridgeQuotesModal should render the modal when exchange rates are not a
               </div>
             </div>
             <div
-              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
-              style="position: relative;"
+              class="mm-box mm-container mm-container--max-width-undefined bridge-quote-option mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-start mm-box--width-full"
+              style="position: relative; cursor: pointer;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-full mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full"
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
index f0558a14861d..f5134ac3688f 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -128,7 +128,7 @@ export const BridgeQuotesModal = ({
           </Text>
         </Row>
         {/* QUOTE LIST */}
-        <Column maxWidth={BlockSize.Full} style={{ overflow: 'scroll' }}>
+        <Column maxWidth={BlockSize.Full} style={{ overflow: 'auto' }}>
           {sortedQuotes.map(
             (quote: QuoteMetadata & QuoteResponse, index: number) => {
               const {
@@ -142,6 +142,7 @@ export const BridgeQuotesModal = ({
 
               return (
                 <Column
+                  className={`bridge-quote-option${isQuoteActive ? ' bridge-quote-option--selected' : ''}`}
                   alignItems={AlignItems.flexStart}
                   key={index}
                   backgroundColor={
@@ -151,7 +152,7 @@ export const BridgeQuotesModal = ({
                   paddingInline={4}
                   paddingTop={3}
                   paddingBottom={3}
-                  style={{ position: 'relative' }}
+                  style={{ position: 'relative', cursor: 'pointer' }}
                 >
                   {isQuoteActive && (
                     <Column
diff --git a/ui/pages/bridge/quotes/index.scss b/ui/pages/bridge/quotes/index.scss
index 07d9e1c2bb3a..e72ca15e44d7 100644
--- a/ui/pages/bridge/quotes/index.scss
+++ b/ui/pages/bridge/quotes/index.scss
@@ -1,5 +1,11 @@
 @use "design-system";
 
+.bridge-quote-option {
+  &:hover:not(&--selected) {
+    background: var(--color-background-default-hover);
+  }
+}
+
 .quotes-modal {
   .mm-modal-content {
     padding: 0;
diff --git a/ui/pages/bridge/utils/tokens.test.ts b/ui/pages/bridge/utils/tokens.test.ts
index 3d967731f2d4..c4951174f746 100644
--- a/ui/pages/bridge/utils/tokens.test.ts
+++ b/ui/pages/bridge/utils/tokens.test.ts
@@ -281,6 +281,71 @@ describe('Bridge token utils', () => {
     });
   });
 
+  describe('fetchPopularTokens - isVerified', () => {
+    it('passes through isVerified from the API response', async () => {
+      const verifiedEthAsset = { ...ETH_ASSET, isVerified: true };
+      const unverifiedMusdAsset = { ...MUSD_ASSET, isVerified: false };
+
+      nock(BRIDGE_API_BASE_URL)
+        .post('/getTokens/popular')
+        .reply(200, [verifiedEthAsset, unverifiedMusdAsset, INVALID_ASSET]);
+
+      const tokens = await fetchPopularTokens({
+        chainIds: ['eip155:1'] as CaipChainId[],
+        signal: new AbortController().signal,
+        clientId: 'test',
+        bridgeApiBaseUrl: BRIDGE_API_BASE_URL,
+      });
+
+      expect(tokens).toHaveLength(2);
+      expect(tokens[0]).toMatchObject({ symbol: 'ETH', isVerified: true });
+      expect(tokens[1]).toMatchObject({ symbol: 'mUSD', isVerified: false });
+    });
+
+    it('treats isVerified as optional — tokens without it still pass validation', async () => {
+      nock(BRIDGE_API_BASE_URL)
+        .post('/getTokens/popular')
+        .reply(200, [ETH_ASSET]);
+
+      const tokens = await fetchPopularTokens({
+        chainIds: ['eip155:1'] as CaipChainId[],
+        signal: new AbortController().signal,
+        clientId: 'test',
+        bridgeApiBaseUrl: BRIDGE_API_BASE_URL,
+      });
+
+      expect(tokens).toHaveLength(1);
+      expect(tokens[0]).toMatchObject({ symbol: 'ETH' });
+      expect(tokens[0]).not.toHaveProperty('isVerified');
+    });
+  });
+
+  describe('fetchTokensBySearchQuery - isVerified', () => {
+    it('passes through isVerified from the search API response', async () => {
+      nock(BRIDGE_API_BASE_URL)
+        .post('/getTokens/search')
+        .reply(200, {
+          data: [
+            { ...ETH_ASSET, isVerified: true },
+            { ...MUSD_ASSET, isVerified: false },
+          ],
+          pageInfo: { hasNextPage: false, endCursor: undefined },
+        });
+
+      const { tokens } = await fetchTokensBySearchQuery({
+        chainIds: ['eip155:1'] as CaipChainId[],
+        query: 'ETH',
+        signal: new AbortController().signal,
+        clientId: 'test',
+        bridgeApiBaseUrl: BRIDGE_API_BASE_URL,
+      });
+
+      expect(tokens).toHaveLength(2);
+      expect(tokens[0]).toMatchObject({ symbol: 'ETH', isVerified: true });
+      expect(tokens[1]).toMatchObject({ symbol: 'mUSD', isVerified: false });
+    });
+  });
+
   describe('fetchTokensBySearchQuery', () => {
     it('should add pages to cache when fetching tokens by search query', async () => {
       nock(BRIDGE_API_BASE_URL)
diff --git a/ui/pages/bridge/utils/tokens.ts b/ui/pages/bridge/utils/tokens.ts
index b50a4ca06eb9..07343d19d395 100644
--- a/ui/pages/bridge/utils/tokens.ts
+++ b/ui/pages/bridge/utils/tokens.ts
@@ -43,6 +43,7 @@ const BridgeAssetV2Schema = intersection([
         isSource: nullable(optional(boolean())),
       }),
     ),
+    isVerified: optional(boolean()),
   }),
 ]);
 
diff --git a/ui/pages/confirmations/cancel-speedup/cancel-speedup.test.tsx b/ui/pages/confirmations/cancel-speedup/cancel-speedup.test.tsx
index ff115ad79fd8..8ebabd287c44 100644
--- a/ui/pages/confirmations/cancel-speedup/cancel-speedup.test.tsx
+++ b/ui/pages/confirmations/cancel-speedup/cancel-speedup.test.tsx
@@ -206,6 +206,60 @@ describe('CancelSpeedup Component', () => {
     expect(container).toBeEmptyDOMElement();
   });
 
+  it('renders loading skeleton when previousGas is not set', async () => {
+    const transactionWithoutPreviousGas = {
+      ...mockTransaction,
+      previousGas: undefined,
+    } as unknown as TransactionMeta;
+
+    const store = configureStore({
+      appState: { isLoading: false },
+      metamask: {
+        ...mockState.metamask,
+        isInitialized: true,
+        accounts: {
+          [mockSelectedInternalAccount.address]: {
+            address: mockSelectedInternalAccount.address,
+            balance: '0x1F4',
+          },
+        },
+        preferences: { showFiatInTestnets: true },
+        featureFlags: { advancedInlineGas: true },
+        gasFeeEstimates:
+          mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
+        gasFeeEstimatesByChainId: {
+          ...mockState.metamask.gasFeeEstimatesByChainId,
+          '0x5': {
+            ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
+            gasFeeEstimates:
+              mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
+          },
+        },
+      },
+    });
+
+    renderWithProvider(
+      <CancelSpeedup
+        transaction={transactionWithoutPreviousGas}
+        editGasMode={EditGasModes.cancel}
+      />,
+      store,
+    );
+
+    await waitFor(() => {
+      expect(
+        screen.getByTestId('cancel-speedup-section-loading'),
+      ).toBeInTheDocument();
+    });
+
+    expect(
+      screen.queryByTestId('cancel-speedup-section'),
+    ).not.toBeInTheDocument();
+
+    const confirmButton = screen.getByTestId('cancel-speedup-confirm-button');
+    expect(confirmButton).toBeDisabled();
+  });
+
   it('renders correctly in Speed Up mode', async () => {
     render({ editGasMode: EditGasModes.speedUp });
 
diff --git a/ui/pages/confirmations/cancel-speedup/cancel-speedup.tsx b/ui/pages/confirmations/cancel-speedup/cancel-speedup.tsx
index 06b00d2b1d19..9727177fc071 100644
--- a/ui/pages/confirmations/cancel-speedup/cancel-speedup.tsx
+++ b/ui/pages/confirmations/cancel-speedup/cancel-speedup.tsx
@@ -24,6 +24,7 @@ import {
   AvatarToken,
   AvatarTokenSize,
 } from '../../../components/component-library';
+import { Skeleton } from '../../../components/component-library/skeleton';
 
 import { EditGasModes } from '../../../../shared/constants/gas';
 import { useI18nContext } from '../../../hooks/useI18nContext';
@@ -250,15 +251,26 @@ type CancelSpeedupModalProps = {
   onClose: () => void;
   dataTestId?: string;
   effectiveTransaction: TransactionMeta;
+  isInitialGasReady: boolean;
   cancelTransaction: () => void;
   speedUpTransaction: () => void;
 };
 
+const GasFeesSectionSkeleton = () => (
+  <ConfirmInfoSection data-testid="cancel-speedup-section-loading">
+    <Box flexDirection={BoxFlexDirection.Column} gap={3} padding={2}>
+      <Skeleton height={16} width="100%" />
+      <Skeleton height={16} width="60%" />
+    </Box>
+  </ConfirmInfoSection>
+);
+
 const CancelSpeedupModal = ({
   mode,
   onClose,
   dataTestId,
   effectiveTransaction,
+  isInitialGasReady,
   cancelTransaction,
   speedUpTransaction,
 }: CancelSpeedupModalProps) => {
@@ -289,14 +301,15 @@ const CancelSpeedupModal = ({
             : t('speedUpTransactionTitle')}
         </ModalHeader>
         <Box padding={4}>
-          <GasFeesSection transaction={effectiveTransaction} />
+          {isInitialGasReady ? (
+            <GasFeesSection transaction={effectiveTransaction} />
+          ) : (
+            <GasFeesSectionSkeleton />
+          )}
           <DescriptionSection isCancel={isCancel} />
         </Box>
         <ModalFooter>
-          <ConfirmButton
-            onClick={handleSubmit}
-            disabled={!effectiveTransaction.previousGas}
-          />
+          <ConfirmButton onClick={handleSubmit} disabled={!isInitialGasReady} />
         </ModalFooter>
       </ModalContent>
     </Modal>
@@ -327,7 +340,7 @@ const CancelSpeedupContent = ({
     updateTransactionUsingEstimate,
   } = useCancelSpeedupGasState(transaction, editGasMode);
 
-  useCancelSpeedupInitialGas({
+  const { isInitialGasReady } = useCancelSpeedupInitialGas({
     effectiveTransaction,
     gasFeeEstimates,
     updateTransactionUsingEstimate,
@@ -348,6 +361,7 @@ const CancelSpeedupContent = ({
           onClose={onClose}
           dataTestId="speed-up-and-cancel-modal"
           effectiveTransaction={effectiveTransaction}
+          isInitialGasReady={isInitialGasReady}
           cancelTransaction={cancelTransaction}
           speedUpTransaction={speedUpTransaction}
         />
diff --git a/ui/pages/confirmations/components/activity/transaction-details/transaction-details.test.tsx b/ui/pages/confirmations/components/activity/transaction-details/transaction-details.test.tsx
index a530b8598390..2823170ab20a 100644
--- a/ui/pages/confirmations/components/activity/transaction-details/transaction-details.test.tsx
+++ b/ui/pages/confirmations/components/activity/transaction-details/transaction-details.test.tsx
@@ -50,7 +50,8 @@ function createMockState(includeToken = false) {
         },
       },
       multichainNetworkConfigurationsByChainId: {},
-      accountTree: { wallets: {}, selectedAccountGroup: null },
+      selectedAccountGroup: null,
+      accountTree: { wallets: {} },
       allIgnoredTokens: {},
       marketData: {},
       currencyRates: {},
diff --git a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.component.js b/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.component.js
deleted file mode 100644
index 95084c624921..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.component.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-
-import { I18nContext } from '../../../../contexts/i18n';
-import FormField from '../../../../components/ui/form-field';
-import { getGasFormErrorText } from '../../../../helpers/constants/gas';
-
-export default function AdvancedGasControls({
-  onManualChange,
-  gasLimit,
-  setGasLimit,
-  gasPrice,
-  setGasPrice,
-  gasErrors,
-  minimumGasLimit,
-}) {
-  const t = useContext(I18nContext);
-
-  return (
-    <div className="advanced-gas-controls">
-      <FormField
-        titleText={t('gasLimit')}
-        error={
-          gasErrors?.gasLimit
-            ? getGasFormErrorText(gasErrors.gasLimit, t, { minimumGasLimit })
-            : null
-        }
-        onChange={(value) => {
-          onManualChange?.();
-          setGasLimit(value);
-        }}
-        tooltipText={t('editGasLimitTooltip')}
-        value={gasLimit}
-        allowDecimals={false}
-        numeric
-      />
-      <>
-        <FormField
-          titleText={t('advancedGasPriceTitle')}
-          titleUnit="(GWEI)"
-          onChange={(value) => {
-            onManualChange?.();
-            setGasPrice(value);
-          }}
-          tooltipText={t('editGasPriceTooltip')}
-          value={gasPrice}
-          numeric
-          allowDecimals
-          error={
-            gasErrors?.gasPrice
-              ? getGasFormErrorText(gasErrors.gasPrice, t)
-              : null
-          }
-        />
-      </>
-    </div>
-  );
-}
-
-AdvancedGasControls.propTypes = {
-  onManualChange: PropTypes.func,
-  gasLimit: PropTypes.number,
-  setGasLimit: PropTypes.func,
-  gasPrice: PropTypes.string,
-  setGasPrice: PropTypes.func,
-  minimumGasLimit: PropTypes.string,
-  gasErrors: PropTypes.object,
-};
diff --git a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.stories.js b/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.stories.js
deleted file mode 100644
index 913f76eb4ed3..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.stories.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-
-import AdvancedGasControls from '.';
-
-export default {
-  title: 'Confirmations/Components/AdvancedGasControls',
-};
-
-export const DefaultStory = () => {
-  return (
-    <div style={{ width: '600px' }}>
-      <AdvancedGasControls />
-    </div>
-  );
-};
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.test.js b/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.test.js
deleted file mode 100644
index 9448f3dffb67..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-controls/advanced-gas-controls.test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-import configureMockStore from 'redux-mock-store';
-import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-
-import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
-import AdvancedGasControls from './advanced-gas-controls.component';
-
-const renderComponent = (props) => {
-  const store = configureMockStore([])({
-    metamask: {},
-  });
-  return renderWithProvider(<AdvancedGasControls {...props} />, store);
-};
-
-describe('AdvancedGasControls Component', () => {
-  it('should render correctly', () => {
-    expect(() => {
-      renderComponent();
-    }).not.toThrow();
-  });
-
-  it('should render gasLimit and gasPrice inputs', () => {
-    const { queryByText } = renderComponent();
-    expect(queryByText(messages.gasLimit.message)).toBeInTheDocument();
-    expect(
-      queryByText(messages.advancedGasPriceTitle.message),
-    ).toBeInTheDocument();
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-controls/index.js b/ui/pages/confirmations/components/advanced-gas-controls/index.js
deleted file mode 100644
index ceedba1ec9dc..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-controls/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-controls.component';
diff --git a/ui/pages/confirmations/components/advanced-gas-controls/index.scss b/ui/pages/confirmations/components/advanced-gas-controls/index.scss
deleted file mode 100644
index 48e0d8707979..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-controls/index.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.advanced-gas-controls {
-  &__row {
-    margin-bottom: 20px;
-  }
-
-  .info-tooltip {
-    display: inline-block;
-  }
-
-  .form-field__row--error .form-field__heading-title h6 {
-    color: var(--color-error-default);
-
-    & path {
-      fill: var(--color-error-default);
-    }
-  }
-
-  h6 {
-    padding-bottom: 6px;
-    margin-inline-end: 6px;
-  }
-
-  path {
-    fill: var(--color-icon-alternative);
-  }
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
deleted file mode 100644
index d1cf6a614444..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-
-import { capitalize } from 'lodash';
-import { useTransactionEventFragment } from '../../../hooks/useTransactionEventFragment';
-import { EditGasModes } from '../../../../../../shared/constants/gas';
-
-import {
-  Display,
-  FlexDirection,
-} from '../../../../../helpers/constants/design-system';
-import {
-  getAdvancedGasFeeValues,
-  selectNetworkIdentifierByChainId,
-} from '../../../../../selectors';
-import { setAdvancedGasFee } from '../../../../../store/actions';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import { useAdvancedGasFeePopoverContext } from '../context';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import { Checkbox, Box } from '../../../../../components/component-library';
-import { Numeric } from '../../../../../../shared/lib/Numeric';
-
-const AdvancedGasFeeDefaults = () => {
-  const t = useI18nContext();
-  const dispatch = useDispatch();
-  const {
-    gasErrors,
-    maxBaseFee: maxBaseFeeNumber,
-    maxPriorityFeePerGas: maxPriorityFeePerGasNumber,
-  } = useAdvancedGasFeePopoverContext();
-  const maxBaseFee = new Numeric(maxBaseFeeNumber, 10).toString();
-  const maxPriorityFeePerGas = new Numeric(
-    maxPriorityFeePerGasNumber,
-    10,
-  ).toString();
-  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
-  const { updateTransactionEventFragment } = useTransactionEventFragment();
-  const { editGasMode, transaction } = useGasFeeContext();
-  const { chainId } = transaction;
-
-  const networkIdentifier = useSelector((state) =>
-    selectNetworkIdentifierByChainId(state, chainId),
-  );
-
-  const [isDefaultSettingsSelected, setDefaultSettingsSelected] = useState(
-    Boolean(advancedGasFeeValues) &&
-      advancedGasFeeValues.maxBaseFee === maxBaseFee &&
-      advancedGasFeeValues.priorityFee === maxPriorityFeePerGas,
-  );
-
-  useEffect(() => {
-    setDefaultSettingsSelected(
-      Boolean(advancedGasFeeValues) &&
-        advancedGasFeeValues.maxBaseFee === maxBaseFee &&
-        advancedGasFeeValues.priorityFee === maxPriorityFeePerGas,
-    );
-  }, [advancedGasFeeValues, maxBaseFee, maxPriorityFeePerGas]);
-
-  const handleUpdateDefaultSettings = () => {
-    if (isDefaultSettingsSelected) {
-      dispatch(setAdvancedGasFee({ chainId, gasFeePreferences: undefined }));
-      setDefaultSettingsSelected(false);
-      updateTransactionEventFragment({
-        properties: {
-          advanced_gas_defaults_updated_maxbasefee: null,
-          advanced_gas_defaults_updated_priorityfee: null,
-        },
-      });
-    } else {
-      dispatch(
-        setAdvancedGasFee({
-          chainId,
-          gasFeePreferences: {
-            maxBaseFee,
-            priorityFee: maxPriorityFeePerGas,
-          },
-        }),
-      );
-      updateTransactionEventFragment({
-        properties: {
-          advanced_gas_defaults_updated_maxbasefee: maxBaseFee,
-          advanced_gas_defaults_updated_priorityfee: maxPriorityFeePerGas,
-        },
-      });
-    }
-  };
-
-  if (editGasMode === EditGasModes.swaps) {
-    return null;
-  }
-
-  return (
-    <Box
-      display={Display.Flex}
-      flexDirection={FlexDirection.Row}
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
-      paddingTop={4}
-      paddingBottom={4}
-      className="advanced-gas-fee-defaults"
-    >
-      <Checkbox
-        isChecked={isDefaultSettingsSelected}
-        onChange={handleUpdateDefaultSettings}
-        isDisabled={gasErrors.maxFeePerGas || gasErrors.maxPriorityFeePerGas}
-        label={t('advancedGasFeeDefaultOptIn', [capitalize(networkIdentifier)])}
-      />
-    </Box>
-  );
-};
-
-export default AdvancedGasFeeDefaults;
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
deleted file mode 100644
index 15eb1850fa26..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.stories.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import mockEstimates from '../../../../../../test/data/mock-estimates.json';
-import mockState from '../../../../../../test/data/mock-state.json';
-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: {
-      [mockInternalAccount.address]: {
-        address: mockInternalAccount.address,
-        balance: '0x1F4',
-      },
-    },
-    featureFlags: { advancedInlineGas: true },
-    gasFeeEstimates: mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-  },
-});
-
-export default {
-  title:
-    'Confirmations/Components/AdvancedGasFeePopover/AdvancedGasFeeDefaults',
-  decorators: [
-    (story) => (
-      <Provider store={store}>
-        <GasFeeContextProvider
-          transaction={{
-            userFeeLevel: 'medium',
-          }}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            {story()}
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>
-      </Provider>
-    ),
-  ],
-};
-
-export const DefaultStory = () => <AdvancedGasFeeDefaults />;
-
-DefaultStory.storyName = 'Default';
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
deleted file mode 100644
index 5f93e476b2a3..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import React from 'react';
-import { act, fireEvent, screen } from '@testing-library/react';
-
-import {
-  EditGasModes,
-  GasEstimateTypes,
-} from '../../../../../../shared/constants/gas';
-import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import mockEstimates from '../../../../../../test/data/mock-estimates.json';
-import mockState from '../../../../../../test/data/mock-state.json';
-import * as Actions from '../../../../../store/actions';
-
-import { AdvancedGasFeePopoverContextProvider } from '../context';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
-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 { mockNetworkState } from '../../../../../../test/stub/networks';
-import AdvancedGasFeeDefaults from './advanced-gas-fee-defaults';
-
-const TEXT_SELECTOR = 'Save these values as my default for the Goerli network.';
-const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
-
-jest.mock('../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-  setAdvancedGasFee: jest.fn(),
-  updateEventFragment: jest.fn(),
-  createTransactionEventFragment: jest.fn(),
-}));
-
-const mockSelectedInternalAccount =
-  getSelectedInternalAccountFromMockState(mockState);
-
-const render = async (defaultGasParams, contextParams) => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-      ...defaultGasParams,
-      ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
-      accounts: {
-        [mockSelectedInternalAccount.address]: {
-          address: mockSelectedInternalAccount.address,
-          balance: '0x1F4',
-        },
-      },
-      featureFlags: { advancedInlineGas: true },
-      gasFeeEstimates:
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        ...mockState.metamask.gasFeeEstimatesByChainId,
-        '0x5': {
-          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
-          gasFeeEstimates:
-            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-        },
-      },
-    },
-  });
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider
-          transaction={{
-            chainId: CHAIN_ID_MOCK,
-            userFeeLevel: 'medium',
-          }}
-          {...contextParams}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            <AdvancedGasFeeInputs />
-            <AdvancedGasFeeDefaults />
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('AdvancedGasFeeDefaults', () => {
-  it('should renders correct message when the default is not set', async () => {
-    await render({ advancedGasFee: {} });
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-  });
-  it('should renders correct message when the default values are set', async () => {
-    await render({
-      advancedGasFee: {
-        [CHAIN_IDS.GOERLI]: { maxBaseFee: '50', priorityFee: '2' },
-      },
-    });
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-  });
-  it('should renders correct message when the default values are set and the maxBaseFee values are updated', async () => {
-    await render({
-      advancedGasFee: {
-        [CHAIN_IDS.GOERLI]: { maxBaseFee: '50', priorityFee: '2' },
-      },
-    });
-    expect(document.getElementsByTagName('input')[2]).toBeChecked();
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 75 },
-    });
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(75);
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-  });
-  it('should renders correct message when the default values are set and the priorityFee values are updated', async () => {
-    await render({
-      advancedGasFee: {
-        [CHAIN_IDS.GOERLI]: { maxBaseFee: '50', priorityFee: '2' },
-      },
-    });
-    expect(document.getElementsByTagName('input')[2]).toBeChecked();
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[1], {
-      target: { value: 5 },
-    });
-    expect(document.getElementsByTagName('input')[1]).toHaveValue(5);
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-    expect(screen.queryByText(TEXT_SELECTOR)).toBeInTheDocument();
-  });
-
-  it('should call action setAdvancedGasFee when checkbox or label text is clicked', async () => {
-    await render({
-      advancedGasFee: {
-        [CHAIN_IDS.GOERLI]: { maxBaseFee: 50, priorityFee: 2 },
-      },
-    });
-    const mock = jest
-      .spyOn(Actions, 'setAdvancedGasFee')
-      .mockReturnValue({ type: 'test' });
-    const checkboxLabel = screen.queryByText(TEXT_SELECTOR);
-    fireEvent.click(checkboxLabel);
-    expect(mock).toHaveBeenCalledTimes(1);
-    const checkbox = document.querySelector('input[type=checkbox]');
-    fireEvent.click(checkbox);
-    expect(mock).toHaveBeenCalledTimes(2);
-  });
-
-  it('should not render option to set default gas options in a swaps transaction', async () => {
-    await render({}, { editGasMode: EditGasModes.swaps });
-    expect(
-      document.querySelector('input[type=checkbox]'),
-    ).not.toBeInTheDocument();
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.js
deleted file mode 100644
index 6b63ee447ac5..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-fee-defaults';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss
deleted file mode 100644
index db3ad5f7409d..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.advanced-gas-fee-defaults {
-  border-top: 1px solid var(--color-border-muted);
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
deleted file mode 100644
index 33125d5ebefe..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import { bnGreaterThan, bnLessThan } from '../../../../../helpers/utils/util';
-import { TextVariant } from '../../../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import { MAX_GAS_LIMIT_DEC } from '../../../send-utils/send.constants';
-import FormField from '../../../../../components/ui/form-field';
-
-import { useAdvancedGasFeePopoverContext } from '../context';
-import {
-  Button,
-  ButtonVariant,
-  ButtonSize,
-  Text,
-} from '../../../../../components/component-library';
-import { IGNORE_GAS_LIMIT_CHAIN_IDS } from '../../../constants';
-import { hexToDecimal } from '../../../../../../shared/lib/conversion.utils';
-
-const validateGasLimit = (gasLimit, minGasLimit, maxGasLimit) =>
-  bnLessThan(gasLimit, minGasLimit) || bnGreaterThan(gasLimit, maxGasLimit)
-    ? 'editGasLimitOutOfBoundsV2'
-    : null;
-
-const AdvancedGasFeeGasLimit = () => {
-  const t = useI18nContext();
-  const { setGasLimit: setGasLimitInContext, setErrorValue } =
-    useAdvancedGasFeePopoverContext();
-  const {
-    gasLimit: gasLimitInTransaction,
-    minimumGasLimitDec,
-    transaction: { chainId, originalGasEstimate },
-  } = useGasFeeContext();
-  const originalGasEstimateDec =
-    originalGasEstimate !== undefined && hexToDecimal(originalGasEstimate);
-  const [maxGasLimit, setMaxGasLimit] = useState(
-    originalGasEstimateDec
-      ? Math.max(MAX_GAS_LIMIT_DEC, originalGasEstimateDec)
-      : MAX_GAS_LIMIT_DEC,
-  );
-  const [isEditing, setEditing] = useState(false);
-  const [gasLimit, setGasLimit] = useState(gasLimitInTransaction);
-  const [gasLimitError, setGasLimitError] = useState();
-
-  const updateGasLimit = (value) => {
-    setGasLimit(value || 0);
-  };
-
-  useEffect(() => {
-    setGasLimitInContext(gasLimit);
-    if (IGNORE_GAS_LIMIT_CHAIN_IDS.includes(chainId)) {
-      return;
-    }
-    const error = validateGasLimit(gasLimit, minimumGasLimitDec, maxGasLimit);
-    setGasLimitError(error);
-    setEditing(isEditing === true ? isEditing : error !== null);
-    setErrorValue('gasLimit', error === 'editGasLimitOutOfBoundsV2');
-  }, [
-    chainId,
-    gasLimit,
-    minimumGasLimitDec,
-    setGasLimitInContext,
-    setErrorValue,
-    maxGasLimit,
-    isEditing,
-    t,
-  ]);
-
-  useEffect(() => {
-    if (originalGasEstimateDec) {
-      setMaxGasLimit(Math.max(MAX_GAS_LIMIT_DEC, originalGasEstimateDec));
-    }
-  }, [minimumGasLimitDec, originalGasEstimateDec, setMaxGasLimit]);
-
-  if (isEditing) {
-    return (
-      <FormField
-        dataTestId="gas-limit-input"
-        error={
-          gasLimitError
-            ? t(gasLimitError, [minimumGasLimitDec - 1, maxGasLimit])
-            : ''
-        }
-        onChange={updateGasLimit}
-        titleText={t('gasLimitV2')}
-        value={gasLimit}
-        allowDecimals={false}
-        numeric
-      />
-    );
-  }
-
-  return (
-    <Text
-      tag={TextVariant.bodyMd}
-      variant={TextVariant.bodySm}
-      as="h6"
-      className="advanced-gas-fee-gas-limit"
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
-    >
-      <strong>{t('gasLimitV2')}</strong>
-      <span>{gasLimit}</span>
-      <Button
-        data-testid="advanced-gas-fee-edit"
-        className="advanced-gas-fee-gas-limit__edit-link"
-        onClick={() => setEditing(true)}
-        variant={ButtonVariant.Link}
-        size={ButtonSize.Inherit}
-      >
-        {t('edit')}
-      </Button>
-    </Text>
-  );
-};
-
-export default AdvancedGasFeeGasLimit;
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.stories.tsx b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.stories.tsx
deleted file mode 100644
index b235dfa25e47..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.stories.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react';
-import React from 'react';
-import { Provider } from 'react-redux';
-import testData from '../../../../../../.storybook/test-data';
-import configureStore from '../../../../../store/store';
-import { AdvancedGasFeePopoverContextProvider } from '../context';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
-import AdvancedGasFeeGasLimit from './advanced-gas-fee-gas-limit';
-
-const store = configureStore(testData);
-
-const meta: Meta<typeof AdvancedGasFeeGasLimit> = {
-  title:
-    'Pages/Confirmations/Components/AdvancedGasFeePopover/AdvancedGasFeeGasLimit',
-  component: AdvancedGasFeeGasLimit,
-  decorators: [
-    (Story) => (
-      <Provider store={store}>
-        <GasFeeContextProvider
-          transaction={{
-            userFeeLevel: 'custom',
-            txParams: { gas: '0x5208' }, // 21000 in hex
-            chainId: '0x1',
-            originalGasEstimate: '0x5208',
-          }}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            <Story />
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>
-      </Provider>
-    ),
-  ],
-};
-
-export default meta;
-type Story = StoryObj<typeof AdvancedGasFeeGasLimit>;
-
-export const Default: Story = {};
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
deleted file mode 100644
index 9282c35381e4..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import React from 'react';
-import { act, fireEvent, screen } from '@testing-library/react';
-
-import { GasEstimateTypes } from '../../../../../../shared/constants/gas';
-import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import mockEstimates from '../../../../../../test/data/mock-estimates.json';
-import mockState from '../../../../../../test/data/mock-state.json';
-import { MAX_GAS_LIMIT_DEC } from '../../../send-utils/send.constants';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
-import configureStore from '../../../../../store/store';
-
-import { AdvancedGasFeePopoverContextProvider } from '../context';
-import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks';
-import { enLocale as messages } from '../../../../../../test/lib/i18n-helpers';
-import AdvancedGasFeeGasLimit from './advanced-gas-fee-gas-limit';
-
-jest.mock('../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-}));
-
-const mockSelectedInternalAccount =
-  getSelectedInternalAccountFromMockState(mockState);
-
-const render = async (contextProps, transaction) => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-      accounts: {
-        [mockSelectedInternalAccount.address]: {
-          address: mockSelectedInternalAccount.address,
-          balance: '0x1F4',
-        },
-      },
-      advancedGasFee: { '0x5': { priorityFee: 100 } },
-      featureFlags: { advancedInlineGas: true },
-      gasFeeEstimates:
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        ...mockState.metamask.gasFeeEstimatesByChainId,
-        '0x5': {
-          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
-          gasFeeEstimates:
-            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-        },
-      },
-    },
-  });
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider
-          transaction={
-            transaction ?? {
-              userFeeLevel: 'custom',
-              txParams: { gas: '0x5208' },
-            }
-          }
-          {...contextProps}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            <AdvancedGasFeeGasLimit />
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('AdvancedGasFeeGasLimit', () => {
-  it('should show GasLimit from transaction', async () => {
-    await render();
-    expect(screen.getByText('21000')).toBeInTheDocument();
-  });
-
-  it('should show input when edit link is clicked', async () => {
-    await render();
-    expect(document.getElementsByTagName('input')).toHaveLength(0);
-    fireEvent.click(screen.queryByText(messages.edit.message));
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(21000);
-  });
-
-  it('should show error if gas limit is not in range', async () => {
-    await render();
-    fireEvent.click(screen.queryByText(messages.edit.message));
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 20000 },
-    });
-    expect(
-      screen.queryByText(
-        `Gas limit must be greater than 20999 and less than ${MAX_GAS_LIMIT_DEC}`,
-      ),
-    ).toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 80000000 },
-    });
-    expect(
-      screen.queryByText(
-        `Gas limit must be greater than 20999 and less than ${MAX_GAS_LIMIT_DEC}`,
-      ),
-    ).toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 7000000 },
-    });
-    expect(
-      screen.queryByText(
-        `Gas limit must be greater than 20999 and less than ${MAX_GAS_LIMIT_DEC}`,
-      ),
-    ).not.toBeInTheDocument();
-  });
-
-  it('should validate gas limit against minimumGasLimit it is passed to context', async () => {
-    await render({ minimumGasLimit: '0x5208' });
-    fireEvent.click(screen.queryByText(messages.edit.message));
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 2500 },
-    });
-    expect(
-      screen.queryByText(
-        `Gas limit must be greater than 20999 and less than ${MAX_GAS_LIMIT_DEC}`,
-      ),
-    ).toBeInTheDocument();
-  });
-
-  it('should replace maximum gas limit with originalGasEstimate if it is greater than maximum gas limit', async () => {
-    await render(
-      { minimumGasLimit: '0x7530' },
-      {
-        chainId: '0x5',
-        id: 8393540981007587,
-        time: 1536268017676,
-        status: 'unapproved',
-        loadingDefaults: false,
-        originalGasEstimate: '0x78D9B2',
-        txParams: {
-          data: '0xa9059cbb000000000000000000000000b19ac54efa18cc3a14a5b821bfec73d284bf0c5e0000000000000000000000000000000000000000000000003782dace9d900000',
-          from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-          to: '0xc42edfcc21ed14dda456aa0756c153f7985d8813',
-          value: '0x0',
-          gas: '0x3b9aca00',
-          gasPrice: '0x3b9aca00',
-        },
-        origin: 'metamask',
-      },
-    );
-    expect(
-      screen.queryByText(
-        `Gas limit must be greater than 29999 and less than 30000000`,
-      ),
-    ).toBeInTheDocument();
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.js
deleted file mode 100644
index 8ab2a4041e49..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-fee-gas-limit';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss
deleted file mode 100644
index 2bd86be19773..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use "design-system";
-
-.advanced-gas-fee-gas-limit {
-  display: flex;
-  align-items: center;
-  white-space: nowrap;
-  border-top: 1px solid var(--color-border-muted);
-  padding-top: 16px;
-
-  > * {
-    margin-right: 4px;
-  }
-
-  a.advanced-gas-fee-gas-limit__edit-link {
-    @include design-system.H7;
-
-    padding: 0;
-    width: auto;
-  }
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
deleted file mode 100644
index 5e1bb6533b3b..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'clsx';
-
-import { isNullish } from '../../../../../helpers/utils/util';
-import { formatGasFeeOrFeeRange } from '../../../../../helpers/utils/gas';
-import { I18nContext } from '../../../../../contexts/i18n';
-import Box from '../../../../../components/ui/box';
-import LoadingHeartBeat from '../../../../../components/ui/loading-heartbeat';
-
-function determineTrendInfo(trend, t) {
-  switch (trend) {
-    case 'up':
-      return {
-        className: 'fa-arrow-up advanced-gas-fee-input-subtext__up',
-        color: 'var(--color-success-default)',
-        title: t('upArrow'),
-      };
-    case 'down':
-      return {
-        className: 'fa-arrow-down advanced-gas-fee-input-subtext__down',
-        color: 'var(--color-error-default)',
-        title: t('downArrow'),
-      };
-    case 'level':
-      return {
-        className: 'fa-arrow-right advanced-gas-fee-input-subtext__level',
-        color: 'var(--color-icon-alternative)',
-        title: t('levelArrow'),
-      };
-    default:
-      return null;
-  }
-}
-
-const AdvancedGasFeeInputSubtext = ({ latest, historical, trend }) => {
-  const t = useContext(I18nContext);
-  const trendInfo = determineTrendInfo(trend, t);
-  return (
-    <Box
-      display="flex"
-      alignItems="center"
-      gap={4}
-      className="advanced-gas-fee-input-subtext"
-    >
-      {isNullish(latest) ? null : (
-        <Box display="flex" alignItems="center" data-testid="latest">
-          <span className="advanced-gas-fee-input-subtext__label">
-            {t('currentTitle')}
-          </span>
-          <span className="advanced-gas-fee-input-subtext__value">
-            <LoadingHeartBeat />
-            {formatGasFeeOrFeeRange(latest)}
-          </span>
-          {trendInfo === null ? null : (
-            <span className="advanced-gas-fee-input-subtext__icon">
-              <i
-                className={classnames('fa', trendInfo.className)}
-                style={{ color: trendInfo.color }}
-                title={trendInfo.title}
-                data-testid="fee-arrow"
-              />
-            </span>
-          )}
-        </Box>
-      )}
-      {isNullish(historical) ? null : (
-        <Box>
-          <span
-            className="advanced-gas-fee-input-subtext__label"
-            data-testid="historical"
-          >
-            {t('twelveHrTitle')}
-          </span>
-          <span className="advanced-gas-fee-input-subtext__value">
-            <LoadingHeartBeat />
-            {formatGasFeeOrFeeRange(historical)}
-          </span>
-        </Box>
-      )}
-    </Box>
-  );
-};
-
-AdvancedGasFeeInputSubtext.propTypes = {
-  latest: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
-  ]),
-  historical: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
-  ]),
-  trend: PropTypes.oneOf(['up', 'down', 'level']),
-};
-
-export default AdvancedGasFeeInputSubtext;
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js
deleted file mode 100644
index d24c57efc852..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import React from 'react';
-import { act } from '@testing-library/react';
-import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import configureStore from '../../../../../store/store';
-import AdvancedGasFeeInputSubtext from './advanced-gas-fee-input-subtext';
-
-jest.mock('../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest.fn().mockImplementation(() =>
-    Promise.resolve({
-      chainId: '0x5',
-    }),
-  ),
-  addPollingTokenToAppState: jest.fn(),
-  removePollingTokenFromAppState: jest.fn(),
-}));
-
-const renderComponent = async ({ props = {}, state = {} } = {}) => {
-  const store = configureStore(state);
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <AdvancedGasFeeInputSubtext {...props} />,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('AdvancedGasFeeInputSubtext', () => {
-  describe('when "latest" is non-nullish', () => {
-    it('should render the latest fee if given a fee', async () => {
-      const { getByText } = await renderComponent({
-        props: {
-          latest: '123.12345',
-        },
-      });
-
-      expect(getByText('123.12 GWEI')).toBeInTheDocument();
-    });
-
-    it('should render the latest fee range if given a fee range', async () => {
-      const { getByText } = await renderComponent({
-        props: {
-          latest: ['123.456', '456.789'],
-        },
-      });
-
-      expect(getByText('123.46 - 456.79 GWEI')).toBeInTheDocument();
-    });
-
-    it('should render a fee trend arrow image if given "up" as the trend', async () => {
-      const { getByTitle } = await renderComponent({
-        props: {
-          latest: '123.12345',
-          trend: 'up',
-        },
-      });
-
-      expect(getByTitle('up arrow')).toBeInTheDocument();
-    });
-
-    it('should render a fee trend arrow image if given "down" as the trend', async () => {
-      const { getByTitle } = await renderComponent({
-        props: {
-          latest: '123.12345',
-          trend: 'down',
-        },
-      });
-
-      expect(getByTitle('down arrow')).toBeInTheDocument();
-    });
-
-    it('should render a fee trend arrow image if given "level" as the trend', async () => {
-      const { getByTitle } = await renderComponent({
-        props: {
-          latest: '123.12345',
-          trend: 'level',
-        },
-      });
-
-      expect(getByTitle('level arrow')).toBeInTheDocument();
-    });
-
-    it('should not render a fee trend arrow image if given an invalid trend', async () => {
-      // Suppress warning from PropTypes, which we expect
-      jest.spyOn(console, 'error').mockImplementation();
-
-      const { queryByTestId } = await renderComponent({
-        props: {
-          latest: '123.12345',
-          trend: 'whatever',
-        },
-      });
-
-      expect(queryByTestId('fee-arrow')).not.toBeInTheDocument();
-    });
-
-    it('should not render a fee trend arrow image if given a nullish trend', async () => {
-      const { queryByTestId } = await renderComponent({
-        props: {
-          latest: '123.12345',
-          trend: null,
-        },
-      });
-
-      expect(queryByTestId('fee-arrow')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('when "latest" is nullish', () => {
-    it('should not render the container for the latest fee', async () => {
-      const { queryByTestId } = await renderComponent({
-        props: {
-          latest: null,
-        },
-      });
-
-      expect(queryByTestId('latest')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('when "historical" is not nullish', () => {
-    it('should render the historical fee if given a fee', async () => {
-      const { getByText } = await renderComponent({
-        props: {
-          historical: '123.12345',
-        },
-      });
-
-      expect(getByText('123.12 GWEI')).toBeInTheDocument();
-    });
-
-    it('should render the historical fee range if given a fee range', async () => {
-      const { getByText } = await renderComponent({
-        props: {
-          historical: ['123.456', '456.789'],
-        },
-      });
-
-      expect(getByText('123.46 - 456.79 GWEI')).toBeInTheDocument();
-    });
-  });
-
-  describe('when "historical" is nullish', () => {
-    it('should not render the container for the historical fee', async () => {
-      const { queryByTestId } = await renderComponent({
-        props: {
-          historical: null,
-        },
-      });
-
-      expect(queryByTestId('historical')).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js
deleted file mode 100644
index 13e6bb8447ec..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-fee-input-subtext';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
deleted file mode 100644
index 0a4633916b85..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@use "design-system";
-
-.advanced-gas-fee-input-subtext {
-  margin-top: 2px;
-  color: var(--color-text-alternative);
-  font-size: design-system.$font-size-h8;
-
-  &__label {
-    font-weight: bold;
-    margin-right: 4px;
-  }
-
-  &__value {
-    position: relative;
-  }
-
-  &__level {
-    margin-left: 2px;
-  }
-
-  &__up,
-  &__down {
-    padding-top: 2px;
-  }
-
-  &__icon {
-    margin-right: 8px;
-  }
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js
deleted file mode 100644
index 828a29212e72..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-import Box from '../../../../../components/ui/box';
-import BaseFeeInput from './base-fee-input';
-import PriorityFeeInput from './priority-fee-input';
-
-const AdvancedGasFeeInputs = () => {
-  return (
-    <Box className="advanced-gas-fee-inputs">
-      <BaseFeeInput />
-      <PriorityFeeInput />
-    </Box>
-  );
-};
-
-export default AdvancedGasFeeInputs;
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
deleted file mode 100644
index db79183c0a90..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import { HIGH_FEE_WARNING_MULTIPLIER } from '../../../../send-utils/send.constants';
-import {
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../../../../shared/constants/gas';
-import { PRIMARY } from '../../../../../../helpers/constants/common';
-import { getAdvancedGasFeeValues } from '../../../../../../selectors';
-import { useGasFeeContext } from '../../../../../../contexts/gasFee';
-import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { useUserPreferencedCurrency } from '../../../../../../hooks/useUserPreferencedCurrency';
-import { useCurrencyDisplay } from '../../../../../../hooks/useCurrencyDisplay';
-import Box from '../../../../../../components/ui/box';
-import FormField from '../../../../../../components/ui/form-field';
-
-import { useAdvancedGasFeePopoverContext } from '../../context';
-import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
-import { decGWEIToHexWEI } from '../../../../../../../shared/lib/conversion.utils';
-import { Numeric } from '../../../../../../../shared/lib/Numeric';
-import { IGNORE_GAS_LIMIT_CHAIN_IDS } from '../../../../constants';
-
-const validateBaseFee = (
-  value,
-  gasFeeEstimates,
-  maxPriorityFeePerGas,
-  chainId,
-) => {
-  const baseFeeValue = new Numeric(value, 10);
-  if (new Numeric(maxPriorityFeePerGas, 10).greaterThan(baseFeeValue)) {
-    return 'editGasMaxBaseFeeGWEIImbalance';
-  }
-  if (
-    gasFeeEstimates?.low &&
-    baseFeeValue.lessThan(gasFeeEstimates.low.suggestedMaxFeePerGas, 10) &&
-    IGNORE_GAS_LIMIT_CHAIN_IDS.includes(chainId)
-  ) {
-    return 'editGasMaxBaseFeeLow';
-  }
-  if (
-    gasFeeEstimates?.high &&
-    baseFeeValue.greaterThan(
-      gasFeeEstimates.high.suggestedMaxFeePerGas * HIGH_FEE_WARNING_MULTIPLIER,
-      10,
-    )
-  ) {
-    return 'editGasMaxBaseFeeHigh';
-  }
-  return null;
-};
-
-const BaseFeeInput = () => {
-  const t = useI18nContext();
-
-  const {
-    gasFeeEstimates,
-    estimateUsed,
-    maxFeePerGas: maxBaseFeeNumber,
-    editGasMode,
-    transaction: { chainId },
-  } = useGasFeeContext();
-  const maxFeePerGas = new Numeric(maxBaseFeeNumber, 10).toString();
-  const {
-    gasLimit,
-    maxPriorityFeePerGas,
-    setErrorValue,
-    setMaxFeePerGas,
-    setMaxBaseFee,
-  } = useAdvancedGasFeePopoverContext();
-
-  const { estimatedBaseFee, historicalBaseFeeRange, baseFeeTrend } =
-    gasFeeEstimates ?? {};
-
-  const [baseFeeError, setBaseFeeError] = useState();
-  const { currency, numberOfDecimals } = useUserPreferencedCurrency(PRIMARY);
-
-  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
-
-  const defaultBaseFee =
-    estimateUsed !== PriorityLevels.custom &&
-    advancedGasFeeValues?.maxBaseFee &&
-    editGasMode !== EditGasModes.swaps
-      ? advancedGasFeeValues.maxBaseFee
-      : maxFeePerGas;
-
-  const [baseFee, setBaseFee] = useState(
-    defaultBaseFee > 0 ? defaultBaseFee : undefined,
-  );
-  useEffect(() => {
-    if (baseFee === undefined && defaultBaseFee > 0) {
-      setBaseFee(defaultBaseFee);
-    }
-  }, [baseFee, defaultBaseFee, setBaseFee]);
-
-  const [baseFeeInPrimaryCurrency] = useCurrencyDisplay(
-    decGWEIToHexWEI(baseFee * gasLimit),
-    { currency, numberOfDecimals },
-    chainId,
-  );
-
-  const updateBaseFee = useCallback(
-    (value) => {
-      setBaseFee(value);
-    },
-    [setBaseFee],
-  );
-
-  useEffect(() => {
-    setMaxFeePerGas(baseFee);
-    const error = validateBaseFee(
-      baseFee,
-      gasFeeEstimates,
-      maxPriorityFeePerGas,
-      chainId,
-    );
-
-    setBaseFeeError(error);
-    setErrorValue('maxFeePerGas', error === 'editGasMaxBaseFeeGWEIImbalance');
-    setMaxBaseFee(baseFee);
-  }, [
-    baseFee,
-    chainId,
-    gasFeeEstimates,
-    maxPriorityFeePerGas,
-    setBaseFeeError,
-    setErrorValue,
-    setMaxFeePerGas,
-    setMaxBaseFee,
-  ]);
-
-  return (
-    <Box className="base-fee-input" marginLeft={2} marginRight={2}>
-      <FormField
-        dataTestId="base-fee-input"
-        error={baseFeeError ? t(baseFeeError) : ''}
-        onChange={updateBaseFee}
-        titleText={t('maxBaseFee')}
-        titleUnit={`(${t('gwei')})`}
-        tooltipText={t('advancedBaseGasFeeToolTip')}
-        value={baseFee}
-        detailText={`≈ ${baseFeeInPrimaryCurrency}`}
-        allowDecimals
-        numeric
-      />
-      <AdvancedGasFeeInputSubtext
-        latest={estimatedBaseFee}
-        historical={historicalBaseFeeRange}
-        trend={baseFeeTrend}
-      />
-    </Box>
-  );
-};
-
-export default BaseFeeInput;
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
deleted file mode 100644
index fd4c51a29ae4..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import React from 'react';
-import { act, fireEvent, screen } from '@testing-library/react';
-
-import {
-  EditGasModes,
-  GasEstimateTypes,
-} from '../../../../../../../shared/constants/gas';
-import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
-import mockEstimates from '../../../../../../../test/data/mock-estimates.json';
-import mockState from '../../../../../../../test/data/mock-state.json';
-import { GasFeeContextProvider } from '../../../../../../contexts/gasFee';
-import configureStore from '../../../../../../store/store';
-
-import { AdvancedGasFeePopoverContextProvider } from '../../context';
-import AdvancedGasFeeGasLimit from '../../advanced-gas-fee-gas-limit';
-import { getSelectedInternalAccountFromMockState } from '../../../../../../../test/jest/mocks';
-import { enLocale as messages } from '../../../../../../../test/lib/i18n-helpers';
-import BaseFeeInput from './base-fee-input';
-
-const LOW_BASE_FEE = 0.000000001;
-
-jest.mock('../../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-}));
-
-const mockSelectedInternalAccount =
-  getSelectedInternalAccountFromMockState(mockState);
-
-const render = async (txProps, contextProps) => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-      accounts: {
-        [mockSelectedInternalAccount.address]: {
-          address: mockSelectedInternalAccount.address,
-          balance: '0x1F4',
-        },
-      },
-      advancedGasFee: { '0x5': { maxBaseFee: 100 } },
-      featureFlags: { advancedInlineGas: true },
-      gasFeeEstimates:
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        ...mockState.metamask.gasFeeEstimatesByChainId,
-        '0x5': {
-          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
-          gasFeeEstimates:
-            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-        },
-      },
-    },
-  });
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider
-          transaction={{
-            userFeeLevel: 'custom',
-            ...txProps,
-          }}
-          {...contextProps}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            <BaseFeeInput />
-            <AdvancedGasFeeGasLimit />
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('BaseFeeInput', () => {
-  it('should renders advancedGasFee.baseFee value if current estimate used is not custom', async () => {
-    await render({
-      userFeeLevel: 'high',
-    });
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(100);
-  });
-
-  it('should not use advancedGasFee.baseFee value for swaps', async () => {
-    await render(
-      {
-        userFeeLevel: 'high',
-      },
-      { editGasMode: EditGasModes.swaps },
-    );
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(
-      parseInt(
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates.high
-          .suggestedMaxFeePerGas,
-        10,
-      ),
-    );
-  });
-
-  it('should renders baseFee values from transaction if current estimate used is custom', async () => {
-    await render({
-      txParams: {
-        maxFeePerGas: '0x2E90EDD000',
-      },
-    });
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(200);
-  });
-
-  describe('renders baseFee if current estimate used is custom', () => {
-    const testCases = [
-      {
-        description: 'with a high value',
-        maxFeePerGas: '0x2E90EDD000',
-        expectedValue: 200,
-      },
-      {
-        description: 'with a low value',
-        maxFeePerGas: '0x1',
-        expectedValue: LOW_BASE_FEE,
-      },
-    ];
-
-    it.each(testCases)(
-      '$description',
-      async ({ maxFeePerGas, expectedValue }) => {
-        await render({
-          txParams: {
-            maxFeePerGas,
-          },
-        });
-        expect(document.getElementsByTagName('input')[0]).toHaveValue(
-          expectedValue,
-        );
-      },
-    );
-  });
-
-  it('should show current value of estimatedBaseFee in users primary currency in right side of input box', async () => {
-    await render({
-      txParams: {
-        gas: '0x5208',
-        maxFeePerGas: '0x2E90EDD000',
-      },
-    });
-    expect(screen.queryByText('≈ 0.0042 ETH')).toBeInTheDocument();
-  });
-
-  it('should show current value of estimatedBaseFee in subtext', async () => {
-    await render();
-    expect(screen.queryByText('50 GWEI')).toBeInTheDocument();
-  });
-
-  it('should show 12hr range value in subtext', async () => {
-    await render();
-    expect(screen.queryByText('50 - 100 GWEI')).toBeInTheDocument();
-  });
-
-  it('should show error if base fee is less than suggested low value', async () => {
-    await render({
-      txParams: {
-        maxFeePerGas: '0x174876E800',
-      },
-    });
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 55 },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxBaseFeeLow.message),
-    ).not.toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 50 },
-    });
-  });
-
-  it('should show error if base if is more than suggested high value', async () => {
-    await render({
-      txParams: {
-        maxFeePerGas: '0x174876E800',
-      },
-    });
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 75 },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxBaseFeeHigh.message),
-    ).not.toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 500 },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxBaseFeeHigh.message),
-    ).toBeInTheDocument();
-  });
-
-  describe('updateBaseFee', () => {
-    it('updates base fee correctly', async () => {
-      const { getByTestId } = await render(<BaseFeeInput />);
-      const input = getByTestId('base-fee-input');
-
-      fireEvent.change(input, { target: { value: '1' } });
-
-      expect(input.value).toBe('1');
-    });
-
-    it('handles low numbers', async () => {
-      const { getByTestId } = await render(<BaseFeeInput />);
-      const input = getByTestId('base-fee-input');
-
-      fireEvent.change(input, { target: { value: LOW_BASE_FEE } });
-
-      expect(input.value).toBe('1e-9');
-    });
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js
deleted file mode 100644
index 61d1de89be49..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './base-fee-input';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss
deleted file mode 100644
index dea61d901e7f..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use "design-system";
-
-.base-fee-input {
-  a.base-fee-input__edit-link {
-    display: inline;
-    font-size: design-system.$font-size-h7;
-    padding: 0;
-    white-space: nowrap;
-  }
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js
deleted file mode 100644
index 787f2a6d84ee..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-fee-inputs';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss
deleted file mode 100644
index 309ede493e1a..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use "design-system";
-
-.advanced-gas-fee-inputs {
-  .form-field {
-    margin-bottom: 4px;
-  }
-
-  .form-field__heading-title > h6 {
-    font-size: design-system.$font-size-h7;
-  }
-}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js
deleted file mode 100644
index 0fddc8c30baa..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './priority-fee-input';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss
deleted file mode 100644
index f01cea236b88..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.priority-fee-input {
-  border-top: 1px solid var(--color-border-default);
-  padding-top: 16px;
-}
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
deleted file mode 100644
index 2df8fbc0a23b..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import { HIGH_FEE_WARNING_MULTIPLIER } from '../../../../send-utils/send.constants';
-import {
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../../../../shared/constants/gas';
-import { PRIMARY } from '../../../../../../helpers/constants/common';
-import { getAdvancedGasFeeValues } from '../../../../../../selectors';
-import { useCurrencyDisplay } from '../../../../../../hooks/useCurrencyDisplay';
-import { useGasFeeContext } from '../../../../../../contexts/gasFee';
-import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { useUserPreferencedCurrency } from '../../../../../../hooks/useUserPreferencedCurrency';
-import FormField from '../../../../../../components/ui/form-field';
-import Box from '../../../../../../components/ui/box';
-
-import { useAdvancedGasFeePopoverContext } from '../../context';
-import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
-import { decGWEIToHexWEI } from '../../../../../../../shared/lib/conversion.utils';
-import { Numeric } from '../../../../../../../shared/lib/Numeric';
-import { IGNORE_GAS_LIMIT_CHAIN_IDS } from '../../../../constants';
-
-const validatePriorityFee = (value, gasFeeEstimates, chainId) => {
-  const priorityFeeValue = new Numeric(value, 10);
-  if (priorityFeeValue.lessThan(0, 10)) {
-    return 'editGasMaxPriorityFeeBelowMinimumV2';
-  }
-  if (
-    gasFeeEstimates?.low &&
-    priorityFeeValue.lessThan(
-      gasFeeEstimates.low.suggestedMaxPriorityFeePerGas,
-      10,
-    ) &&
-    IGNORE_GAS_LIMIT_CHAIN_IDS.includes(chainId)
-  ) {
-    return 'editGasMaxPriorityFeeLowV2';
-  }
-  if (
-    gasFeeEstimates?.high &&
-    priorityFeeValue.greaterThan(
-      gasFeeEstimates.high.suggestedMaxPriorityFeePerGas *
-        HIGH_FEE_WARNING_MULTIPLIER,
-      10,
-    )
-  ) {
-    return 'editGasMaxPriorityFeeHighV2';
-  }
-  return null;
-};
-
-const PriorityFeeInput = () => {
-  const t = useI18nContext();
-  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
-  const { gasLimit, setErrorValue, setMaxPriorityFeePerGas } =
-    useAdvancedGasFeePopoverContext();
-  const {
-    editGasMode,
-    estimateUsed,
-    gasFeeEstimates,
-    maxPriorityFeePerGas: maxPriorityFeePerGasNumber,
-    transaction: { chainId },
-  } = useGasFeeContext();
-  const maxPriorityFeePerGas = new Numeric(
-    maxPriorityFeePerGasNumber,
-    10,
-  ).toString();
-  const {
-    latestPriorityFeeRange,
-    historicalPriorityFeeRange,
-    priorityFeeTrend,
-  } = gasFeeEstimates ?? {};
-  const [priorityFeeError, setPriorityFeeError] = useState();
-
-  const defaultPriorityFee =
-    estimateUsed !== PriorityLevels.custom &&
-    advancedGasFeeValues?.priorityFee &&
-    editGasMode !== EditGasModes.swaps
-      ? advancedGasFeeValues.priorityFee
-      : maxPriorityFeePerGas;
-
-  const [priorityFee, setPriorityFee] = useState(
-    defaultPriorityFee > 0 ? defaultPriorityFee : undefined,
-  );
-  useEffect(() => {
-    if (priorityFee === undefined && defaultPriorityFee > 0) {
-      setPriorityFee(defaultPriorityFee);
-    }
-  }, [priorityFee, defaultPriorityFee, setPriorityFee]);
-
-  const { currency, numberOfDecimals } = useUserPreferencedCurrency(PRIMARY);
-
-  const [priorityFeeInPrimaryCurrency] = useCurrencyDisplay(
-    decGWEIToHexWEI(priorityFee * gasLimit),
-    { currency, numberOfDecimals },
-    chainId,
-  );
-
-  const updatePriorityFee = (value) => {
-    setPriorityFee(value);
-  };
-
-  useEffect(() => {
-    setMaxPriorityFeePerGas(priorityFee);
-    const error = validatePriorityFee(priorityFee, gasFeeEstimates, chainId);
-    setErrorValue(
-      'maxPriorityFeePerGas',
-      error === 'editGasMaxPriorityFeeBelowMinimumV2',
-    );
-    setPriorityFeeError(error);
-  }, [
-    chainId,
-    gasFeeEstimates,
-    priorityFee,
-    setErrorValue,
-    setMaxPriorityFeePerGas,
-    setPriorityFeeError,
-  ]);
-
-  return (
-    <Box
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
-      className="priority-fee-input"
-    >
-      <FormField
-        dataTestId="priority-fee-input"
-        error={priorityFeeError ? t(priorityFeeError) : ''}
-        onChange={updatePriorityFee}
-        titleText={t('priorityFeeProperCase')}
-        titleUnit={`(${t('gwei')})`}
-        tooltipText={t('advancedPriorityFeeToolTip')}
-        value={priorityFee}
-        detailText={`≈ ${priorityFeeInPrimaryCurrency}`}
-        allowDecimals
-        numeric
-      />
-      <AdvancedGasFeeInputSubtext
-        latest={latestPriorityFeeRange}
-        historical={historicalPriorityFeeRange}
-        trend={priorityFeeTrend}
-      />
-    </Box>
-  );
-};
-
-export default PriorityFeeInput;
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
deleted file mode 100644
index ad70c7359b16..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
+++ /dev/null
@@ -1,205 +0,0 @@
-import React from 'react';
-import { act, fireEvent, screen } from '@testing-library/react';
-
-import {
-  EditGasModes,
-  GasEstimateTypes,
-} from '../../../../../../../shared/constants/gas';
-import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
-import mockEstimates from '../../../../../../../test/data/mock-estimates.json';
-import mockState from '../../../../../../../test/data/mock-state.json';
-import { GasFeeContextProvider } from '../../../../../../contexts/gasFee';
-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 { enLocale as messages } from '../../../../../../../test/lib/i18n-helpers';
-import PriorityfeeInput from './priority-fee-input';
-
-const LOW_PRIORITY_FEE = 0.000000001;
-
-jest.mock('../../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-}));
-
-const mockSelectedInternalAccount =
-  getSelectedInternalAccountFromMockState(mockState);
-
-const render = async (txProps, contextProps) => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-      accounts: {
-        [mockSelectedInternalAccount.address]: {
-          address: mockSelectedInternalAccount.address,
-          balance: '0x1F4',
-        },
-      },
-      advancedGasFee: { [CHAIN_IDS.GOERLI]: { priorityFee: 100 } },
-      featureFlags: { advancedInlineGas: true },
-      gasFeeEstimates:
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        ...mockState.metamask.gasFeeEstimatesByChainId,
-        '0x5': {
-          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
-          gasFeeEstimates:
-            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-        },
-      },
-    },
-  });
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider
-          transaction={{
-            userFeeLevel: 'custom',
-            ...txProps,
-          }}
-          {...contextProps}
-        >
-          <AdvancedGasFeePopoverContextProvider>
-            <PriorityfeeInput />
-            <AdvancedGasFeeGasLimit />
-          </AdvancedGasFeePopoverContextProvider>
-        </GasFeeContextProvider>,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('PriorityfeeInput', () => {
-  it('should renders advancedGasFee.priorityfee value if current estimate used is not custom', async () => {
-    await render({
-      userFeeLevel: 'high',
-    });
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(100);
-  });
-
-  it('should not use advancedGasFee.priorityfee value for swaps', async () => {
-    await render(
-      {
-        userFeeLevel: 'high',
-      },
-      { editGasMode: EditGasModes.swaps },
-    );
-    expect(document.getElementsByTagName('input')[0]).toHaveValue(
-      parseInt(
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates.high
-          .suggestedMaxPriorityFeePerGas,
-        10,
-      ),
-    );
-  });
-
-  describe('renders priorityFee if current estimate used is custom', () => {
-    const testCases = [
-      {
-        description: 'with a high value',
-        maxPriorityFeePerGas: '0x77359400',
-        expectedValue: 2,
-      },
-      {
-        description: 'with a low value',
-        maxPriorityFeePerGas: '0x1',
-        expectedValue: LOW_PRIORITY_FEE,
-      },
-    ];
-
-    it.each(testCases)(
-      '$description',
-      async ({ maxPriorityFeePerGas, expectedValue }) => {
-        await render({
-          txParams: {
-            maxPriorityFeePerGas,
-          },
-        });
-        expect(document.getElementsByTagName('input')[0]).toHaveValue(
-          expectedValue,
-        );
-      },
-    );
-  });
-
-  it('should show current priority fee range in subtext', async () => {
-    await render();
-    expect(screen.queryByText('1 - 20 GWEI')).toBeInTheDocument();
-  });
-
-  it('should show current value of priority fee in users primary currency in right side of input box', async () => {
-    await render({
-      txParams: {
-        gas: '0x5208',
-        maxPriorityFeePerGas: '0x77359400',
-      },
-    });
-    expect(screen.queryByText('≈ 0.000042 ETH')).toBeInTheDocument();
-  });
-
-  it('should show 12hr range value in subtext', async () => {
-    await render();
-    expect(screen.queryByText('2 - 125 GWEI')).toBeInTheDocument();
-  });
-
-  it('should not show error if value entered is 0', async () => {
-    await render({
-      txParams: {
-        maxPriorityFeePerGas: '0x174876E800',
-      },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxPriorityFeeBelowMinimumV2.message),
-    ).not.toBeInTheDocument();
-    fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 0 },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxPriorityFeeBelowMinimumV2.message),
-    ).not.toBeInTheDocument();
-  });
-
-  it('should not show the error if priority fee is 0', async () => {
-    await render({
-      txParams: {
-        maxPriorityFeePerGas: '0x0',
-      },
-    });
-    expect(
-      screen.queryByText(messages.editGasMaxPriorityFeeBelowMinimumV2.message),
-    ).not.toBeInTheDocument();
-  });
-
-  describe('updatePriorityFee', () => {
-    it('updates base fee correctly', async () => {
-      const { getByTestId } = await render(<PriorityfeeInput />);
-      const input = getByTestId('priority-fee-input');
-
-      fireEvent.change(input, { target: { value: '1' } });
-
-      expect(input.value).toBe('1');
-    });
-
-    it('handles low numbers', async () => {
-      const { getByTestId } = await render(<PriorityfeeInput />);
-      const input = getByTestId('priority-fee-input');
-
-      fireEvent.change(input, { target: { value: LOW_PRIORITY_FEE } });
-
-      expect(input.value).toBe('1e-9');
-    });
-  });
-});
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
deleted file mode 100644
index ba667848f414..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-import { PriorityLevels } from '../../../../../../shared/constants/gas';
-import { decGWEIToHexWEI } from '../../../../../../shared/lib/conversion.utils';
-import { useTransactionModalContext } from '../../../../../contexts/transaction-modal';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import { useTransactionEventFragment } from '../../../hooks/useTransactionEventFragment';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import {
-  Button,
-  ButtonVariant,
-} from '../../../../../components/component-library';
-
-import { useAdvancedGasFeePopoverContext } from '../context';
-
-const AdvancedGasFeeSaveButton = () => {
-  const { closeModal } = useTransactionModalContext();
-  const { updateTransactionEventFragment } = useTransactionEventFragment();
-  const { updateTransaction } = useGasFeeContext();
-  const t = useI18nContext();
-  const { gasLimit, hasErrors, maxFeePerGas, maxPriorityFeePerGas } =
-    useAdvancedGasFeePopoverContext();
-
-  const onSave = () => {
-    updateTransaction({
-      estimateUsed: PriorityLevels.custom,
-      maxFeePerGas: decGWEIToHexWEI(maxFeePerGas),
-      maxPriorityFeePerGas: decGWEIToHexWEI(maxPriorityFeePerGas),
-      gasLimit,
-    });
-    updateTransactionEventFragment({
-      properties: {
-        gas_edit_type: 'advanced',
-      },
-    });
-    closeModal(['advancedGasFee', 'editGasFee']);
-  };
-
-  return (
-    <Button
-      variant={ButtonVariant.Primary}
-      disabled={hasErrors}
-      onClick={onSave}
-      block
-    >
-      {t('save')}
-    </Button>
-  );
-};
-
-export default AdvancedGasFeeSaveButton;
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.stories.tsx b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.stories.tsx
deleted file mode 100644
index 6091d9f19828..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.stories.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react';
-import React from 'react';
-import { Provider } from 'react-redux';
-import testData from '../../../../../../.storybook/test-data';
-import configureStore from '../../../../../store/store';
-import { AdvancedGasFeePopoverContextProvider } from '../context';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
-import { TransactionModalContextProvider } from '../../../../../contexts/transaction-modal';
-import AdvancedGasFeeSaveButton from './advanced-gas-fee-save';
-
-const store = configureStore(testData);
-
-const meta: Meta<typeof AdvancedGasFeeSaveButton> = {
-  title:
-    'Pages/Confirmations/Components/AdvancedGasFeePopover/AdvancedGasFeeSaveButton',
-  component: AdvancedGasFeeSaveButton,
-  decorators: [
-    (Story) => (
-      <Provider store={store}>
-        <TransactionModalContextProvider>
-          <GasFeeContextProvider
-            transaction={{
-              userFeeLevel: 'custom',
-              txParams: { gas: '0x5208' },
-              chainId: '0x1',
-            }}
-          >
-            <AdvancedGasFeePopoverContextProvider>
-              <Story />
-            </AdvancedGasFeePopoverContextProvider>
-          </GasFeeContextProvider>
-        </TransactionModalContextProvider>
-      </Provider>
-    ),
-  ],
-};
-
-export default meta;
-type Story = StoryObj<typeof AdvancedGasFeeSaveButton>;
-
-export const Default: Story = {};
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/index.js
deleted file mode 100644
index 082c24190b8c..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-save/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './advanced-gas-fee-save';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/context/advancedGasFeePopover.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/context/advancedGasFeePopover.js
deleted file mode 100644
index 559b8638fddb..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/context/advancedGasFeePopover.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { createContext, useCallback, useContext, useState } from 'react';
-import PropTypes from 'prop-types';
-
-export const AdvancedGasFeePopoverContext = createContext({});
-
-export const AdvancedGasFeePopoverContextProvider = ({ children }) => {
-  const [gasLimit, setGasLimit] = useState();
-  const [maxFeePerGas, setMaxFeePerGas] = useState();
-  const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState();
-  const [errors, setErrors] = useState({
-    maxFeePerGas: false,
-    maxPriorityFeePerGas: false,
-    gasLimit: false,
-  });
-
-  const setErrorValue = useCallback(
-    (field, value) => {
-      if (errors[field] !== value) {
-        setErrors({ ...errors, [field]: value });
-      }
-    },
-    [errors, setErrors],
-  );
-  const [maxBaseFee, setMaxBaseFee] = useState();
-
-  return (
-    <AdvancedGasFeePopoverContext.Provider
-      value={{
-        gasLimit,
-        hasErrors:
-          errors.maxFeePerGas || errors.maxPriorityFeePerGas || errors.gasLimit,
-        gasErrors: errors,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        setErrorValue,
-        maxBaseFee,
-        setGasLimit,
-        setMaxPriorityFeePerGas,
-        setMaxFeePerGas,
-        setMaxBaseFee,
-      }}
-    >
-      {children}
-    </AdvancedGasFeePopoverContext.Provider>
-  );
-};
-
-export function useAdvancedGasFeePopoverContext() {
-  return useContext(AdvancedGasFeePopoverContext);
-}
-
-AdvancedGasFeePopoverContextProvider.propTypes = {
-  children: PropTypes.node.isRequired,
-};
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/context/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/context/index.js
deleted file mode 100644
index f959b46af2a8..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/context/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './advancedGasFeePopover';
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/index.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/index.js
deleted file mode 100644
index eab080a6328c..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Top-level AdvancedGasFeePopover component removed. Sub-components are imported
-// via direct paths (e.g. advanced-gas-fee-popover/advanced-gas-fee-inputs/).
-export {};
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/index.scss b/ui/pages/confirmations/components/advanced-gas-fee-popover/index.scss
deleted file mode 100644
index 752ae97e21d6..000000000000
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/index.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@use "design-system";
-
-.advanced-gas-fee-popover {
-  .form-field__heading-title > h6 {
-    font-size: design-system.$font-size-h7;
-  }
-
-  .popover-header {
-    border-radius: 0;
-    border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
-    border-bottom: 1px solid var(--color-border-muted);
-  }
-
-  .popover-footer {
-    border-top: none;
-  }
-}
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
index 96fc2ca00da7..2cae7cb45e94 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { TransactionType } from '@metamask/transaction-controller';
+import { MetaMetricsHardwareWalletRecoveryLocation } from '../../../../../../shared/constants/metametrics';
+import { trackHardwareWalletRecoveryConnectCtaClicked } from '../../../../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked';
 import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
 import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
 import {
@@ -68,6 +70,10 @@ const mockGetEnvironmentType = jest.fn();
 const mockNavigateNext = jest.fn();
 const mockNavigateToId = jest.fn();
 
+const mockTrackHardwareWalletRecoveryConnectCtaClicked = jest.mocked(
+  trackHardwareWalletRecoveryConnectCtaClicked,
+);
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let mockStore: any = null;
 
@@ -114,7 +120,9 @@ jest.mock(
 );
 
 jest.mock('../../../hooks/useOriginThrottling');
-
+jest.mock(
+  '../../../../../helpers/utils/track-hardware-wallet-recovery-connect-cta-clicked',
+);
 jest.mock('../../../../../hooks/subscription/useSubscription');
 jest.mock(
   '../../../../../contexts/hardware-wallets/HardwareWalletContext',
@@ -176,7 +184,18 @@ jest.mock('../../../hooks/useConfirmSendNavigation', () => ({
 }));
 
 const mockUseNavigate = jest.fn();
-const mockUseLocation = jest.fn();
+
+/** Default `useLocation()` shape for `useHardwareWalletRecoveryLocation` */
+function getDefaultFooterTestLocation() {
+  return {
+    pathname: '/confirm-transaction',
+    search: '',
+    hash: '',
+    state: null,
+  };
+}
+
+const mockUseLocation = jest.fn(getDefaultFooterTestLocation);
 jest.mock('react-router-dom', () => {
   return {
     ...jest.requireActual('react-router-dom'),
@@ -185,11 +204,24 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-const render = (args?: Record<string, unknown>) => {
+const render = (
+  args?: Record<string, unknown>,
+  options?: {
+    pathname?: string;
+    confirmationId?: string;
+    getMockTrackEvent?: () => jest.Mock;
+  },
+) => {
   const store = configureStore(args ?? getMockPersonalSignConfirmState());
   mockStore = store;
 
-  return renderWithConfirmContextProvider(<Footer />, store);
+  return renderWithConfirmContextProvider(
+    <Footer />,
+    store,
+    options?.pathname ?? DEFAULT_ROUTE,
+    options?.confirmationId,
+    options?.getMockTrackEvent,
+  );
 };
 
 const ALERT_MOCK = [
@@ -229,6 +261,7 @@ describe('ConfirmFooter', () => {
     mockUseHardwareWalletError.mockReset();
     mockIsHardwareWalletError.mockReset();
     mockIsUserRejectedHardwareWalletError.mockReset();
+    mockTrackHardwareWalletRecoveryConnectCtaClicked.mockReset();
 
     mockOnTransactionConfirm.mockResolvedValue(undefined);
     ensureDeviceReadyMock.mockResolvedValue(true);
@@ -265,12 +298,7 @@ describe('ConfirmFooter', () => {
       isGaslessLoading: false,
     });
 
-    mockUseLocation.mockReturnValue({
-      pathname: '/confirm-transaction',
-      search: '',
-      hash: '',
-      state: null,
-    });
+    mockUseLocation.mockImplementation(getDefaultFooterTestLocation);
     useUserSubscriptionsMock.mockReturnValue({
       trialedProducts: [],
       loading: false,
@@ -706,6 +734,43 @@ describe('ConfirmFooter', () => {
       expect(queryByTestId('confirm-footer-button')).not.toBeInTheDocument();
     });
 
+    it('tracks hardware wallet recovery CTA when reconnect is clicked', async () => {
+      const mockTrackEvent = jest.fn().mockResolvedValue(undefined);
+      const connectionState = {
+        status: ConnectionStatus.Disconnected as const,
+      };
+      mockUseHardwareWalletConfig.mockReturnValue({
+        isHardwareWalletAccount: true,
+        walletType: HardwareWalletType.Ledger,
+      });
+      mockUseHardwareWalletState.mockReturnValue({
+        connectionState,
+      });
+      mockUseHardwareWalletError.mockReturnValue({
+        showErrorModal: showHardwareWalletErrorModalMock,
+        dismissErrorModal: dismissHardwareWalletErrorModalMock,
+        setErrorModalSuppressed: setErrorModalSuppressedMock,
+        isDeviceConnected: false,
+      });
+
+      const { getByTestId } = render(undefined, {
+        getMockTrackEvent: () => mockTrackEvent,
+      });
+
+      fireEvent.click(getByTestId('reconnect-hardware-wallet-button'));
+
+      await waitFor(() => {
+        expect(
+          mockTrackHardwareWalletRecoveryConnectCtaClicked,
+        ).toHaveBeenCalledWith(mockTrackEvent, {
+          location: MetaMetricsHardwareWalletRecoveryLocation.Send,
+          walletType: HardwareWalletType.Ledger,
+          connectionState,
+        });
+      });
+      expect(ensureDeviceReadyMock).toHaveBeenCalled();
+    });
+
     it('does not confirm when hardware wallet preflight fails', async () => {
       ensureDeviceReadyMock.mockResolvedValue(false);
       mockUseHardwareWalletConfig.mockReturnValue({
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
index 2ff4ed34a780..a8421abd6513 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -311,6 +311,10 @@ const Footer = () => {
     !isHardwareWalletReady &&
     !hasUnconfirmedDangerAlerts;
 
+  const onReconnectHardwareWalletCta = useCallback(async () => {
+    await onSubmitPreflightCheck({ trackConnectCta: true });
+  }, [onSubmitPreflightCheck]);
+
   const onSubmit = useCallback(async () => {
     if (!currentConfirmation) {
       return;
@@ -464,7 +468,7 @@ const Footer = () => {
             <Button
               block
               data-testid="reconnect-hardware-wallet-button"
-              onClick={onSubmitPreflightCheck}
+              onClick={onReconnectHardwareWalletCta}
               size={ButtonSize.Lg}
             >
               {walletType
diff --git a/ui/pages/confirmations/components/confirm/header/header-info.tsx b/ui/pages/confirmations/components/confirm/header/header-info.tsx
index a50842fbea3f..fdd256e2df17 100644
--- a/ui/pages/confirmations/components/confirm/header/header-info.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header-info.tsx
@@ -56,7 +56,6 @@ const HeaderInfo = () => {
     senderAddress: fromAddress,
     senderName: fromName,
     walletName,
-    isBIP44,
     hasMoreThanOneWallet,
   } = useConfirmationRecipientInfo();
 
@@ -166,7 +165,7 @@ const HeaderInfo = () => {
                 >
                   {fromName}
                 </Text>
-                {isBIP44 && hasMoreThanOneWallet && (
+                {hasMoreThanOneWallet && (
                   <Text
                     variant={TextVariant.bodySm}
                     color={TextColor.textAlternative}
diff --git a/ui/pages/confirmations/components/confirm/header/header.tsx b/ui/pages/confirmations/components/confirm/header/header.tsx
index 32dbe81bfbf3..39602be6f8b4 100644
--- a/ui/pages/confirmations/components/confirm/header/header.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header.tsx
@@ -4,12 +4,7 @@ import {
 } from '@metamask/transaction-controller';
 import React from 'react';
 import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
-import {
-  AvatarNetwork,
-  AvatarNetworkSize,
-  Box,
-  Text,
-} from '../../../../../components/component-library';
+import { Box, Text } from '../../../../../components/component-library';
 import { PreferredAvatar } from '../../../../../components/app/preferred-avatar';
 import {
   AlignItems,
@@ -18,9 +13,7 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../../helpers/constants/design-system';
-import { getAvatarNetworkColor } from '../../../../../helpers/utils/accounts';
 import { useConfirmContext } from '../../../context/confirm';
-import useConfirmationNetworkInfo from '../../../hooks/useConfirmationNetworkInfo';
 import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
 import { Confirmation } from '../../../types/confirm';
 import { DAppInitiatedHeader } from './dapp-initiated-header';
@@ -41,24 +34,18 @@ const CONFIRMATIONS_WITH_ALT_HEADER = [
 ];
 
 const Header = () => {
-  const { networkImageUrl, networkDisplayName } = useConfirmationNetworkInfo();
   const {
     senderAddress: fromAddress,
     senderName: fromName,
     walletName,
-    isBIP44,
     hasMoreThanOneWallet,
   } = useConfirmationRecipientInfo();
 
   const { currentConfirmation } = useConfirmContext<Confirmation>();
   let secondaryText;
 
-  if (isBIP44) {
-    if (hasMoreThanOneWallet) {
-      secondaryText = walletName;
-    }
-  } else {
-    secondaryText = networkDisplayName;
+  if (hasMoreThanOneWallet) {
+    secondaryText = walletName;
   }
 
   const DefaultHeader = (
@@ -72,15 +59,6 @@ const Header = () => {
       <Box alignItems={AlignItems.flexStart} display={Display.Flex} padding={4}>
         <Box display={Display.Flex} marginTop={2}>
           <PreferredAvatar address={fromAddress} />
-          {!isBIP44 && (
-            <AvatarNetwork
-              src={networkImageUrl}
-              name={networkDisplayName}
-              size={AvatarNetworkSize.Xs}
-              backgroundColor={getAvatarNetworkColor(networkDisplayName)}
-              className="confirm_header__avatar-network"
-            />
-          )}
         </Box>
         <Box marginInlineStart={4} marginTop={secondaryText ? 0 : 3}>
           <Text
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.tsx
index d6736c12d794..27b1595cfc75 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.tsx
@@ -21,7 +21,6 @@ import { getIsRevokeSetApprovalForAll } from '../../utils';
 import { useIsNFT } from '../hooks/use-is-nft';
 import { useTokenTransactionData } from '../../hooks/useTokenTransactionData';
 import { NetworkRow } from '../../shared/network-row/network-row';
-import { useIsBIP44 } from '../../../../../hooks/useIsBIP44';
 
 const Spender = ({
   isSetApprovalForAll = false,
@@ -78,12 +77,10 @@ export const ApproveDetails = ({
   const showAdvancedDetails = useSelector(
     selectConfirmationAdvancedDetailsOpen,
   );
-  const isBIP44 = useIsBIP44();
-
   return (
     <ConfirmInfoSection data-testid="confirmation__approve-details">
       <Spender isSetApprovalForAll={isSetApprovalForAll} />
-      <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+      <NetworkRow />
       <OriginRow />
       <SigningInWithRow />
       <RecipientRow />
diff --git a/ui/pages/confirmations/components/confirm/info/approve/revoke-details/revoke-details.tsx b/ui/pages/confirmations/components/confirm/info/approve/revoke-details/revoke-details.tsx
index 9e86506e7679..bc657b8ca445 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/revoke-details/revoke-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/revoke-details/revoke-details.tsx
@@ -3,14 +3,11 @@ import { ConfirmInfoSection } from '../../../../../../../components/app/confirm/
 import { NetworkRow } from '../../shared/network-row/network-row';
 import { OriginRow } from '../../shared/transaction-details/transaction-details';
 import { SigningInWithRow } from '../../shared/sign-in-with-row/sign-in-with-row';
-import { useIsBIP44 } from '../../../../../hooks/useIsBIP44';
 
 export const RevokeDetails = () => {
-  const isBIP44 = useIsBIP44();
-
   return (
     <ConfirmInfoSection>
-      <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+      <NetworkRow />
       <OriginRow />
       <SigningInWithRow />
     </ConfirmInfoSection>
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 3fc407f15745..ccfe66a978c2 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
@@ -37,7 +37,6 @@ import { useConfirmContext } from '../../../../context/confirm';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
 import { SignatureRequestType } from '../../../../types/confirm';
 import { isSIWESignatureRequest } from '../../../../utils';
-import { useIsBIP44 } from '../../../../hooks/useIsBIP44';
 import { NetworkRow } from '../shared/network-row/network-row';
 import { SigningInWithRow } from '../shared/sign-in-with-row/sign-in-with-row';
 import { isValidUTF8 } from '../utils';
@@ -57,8 +56,6 @@ const PersonalSignInfo: React.FC = () => {
   const useTransactionSimulations = useSelector(
     selectUseTransactionSimulations,
   );
-  const isBIP44 = useIsBIP44();
-
   if (!currentConfirmation?.msgParams) {
     return null;
   }
@@ -140,7 +137,7 @@ const PersonalSignInfo: React.FC = () => {
         </ConfirmInfoSection>
       )}
       <ConfirmInfoSection>
-        <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+        <NetworkRow />
         <ConfirmInfoAlertRow
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/gas-fees-details.tsx b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/gas-fees-details.tsx
index d7f4ebf6531c..bb4e4bef7cb5 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/gas-fees-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/gas-fees-details.tsx
@@ -78,6 +78,7 @@ export const GasFeesDetails = (): JSX.Element | null => {
                 chainId={transactionMeta.chainId}
                 maxFeePerGas={maxFeePerGas}
                 maxPriorityFeePerGas={maxPriorityFeePerGas}
+                userFeeLevelOverride={transactionMeta.userFeeLevel}
               />
             </Box>
           </ConfirmInfoAlertRow>
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
index cbf842e1cd63..3754ce67cbff 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
@@ -29,7 +29,6 @@ import { hasValueAndNativeBalanceMismatch as checkValueAndNativeBalanceMismatch
 import { NetworkRow } from '../network-row/network-row';
 import { SigningInWithRow } from '../sign-in-with-row/sign-in-with-row';
 import { isBatchTransaction } from '../../../../../../../../shared/lib/transactions.utils';
-import { useIsBIP44 } from '../../../../../hooks/useIsBIP44';
 
 export const OriginRow = () => {
   const t = useI18nContext();
@@ -171,7 +170,6 @@ const PaymasterRow = () => {
 };
 
 export const TransactionDetails = () => {
-  const isBIP44 = useIsBIP44();
   const showAdvancedDetails = useSelector(
     selectConfirmationAdvancedDetailsOpen,
   );
@@ -190,7 +188,7 @@ export const TransactionDetails = () => {
   return (
     <>
       <ConfirmInfoSection data-testid="transaction-details-section">
-        <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+        <NetworkRow />
         <OriginRow />
         <RecipientRow />
         {showAdvancedDetails && <MethodDataRow />}
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
index c1a1964643cc..3eab9b7c9664 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
@@ -13,7 +13,6 @@ import {
   TypedSignDataV1Type,
 } from '../../../../types/confirm';
 import { useConfirmContext } from '../../../../context/confirm';
-import { useIsBIP44 } from '../../../../hooks/useIsBIP44';
 import { ConfirmInfoRowTypedSignDataV1 } from '../../row/typed-sign-data-v1/typedSignDataV1';
 import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { NetworkRow } from '../shared/network-row/network-row';
@@ -22,7 +21,6 @@ import { SigningInWithRow } from '../shared/sign-in-with-row/sign-in-with-row';
 const TypedSignV1Info: React.FC = () => {
   const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext<SignatureRequestType>();
-  const isBIP44 = useIsBIP44();
   if (!(currentConfirmation as SignatureRequestType)?.msgParams) {
     return null;
   }
@@ -35,7 +33,7 @@ const TypedSignV1Info: React.FC = () => {
   return (
     <>
       <ConfirmInfoSection>
-        <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+        <NetworkRow />
         <ConfirmInfoAlertRow
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
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 3c7bb2191282..40a256d5dc81 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
@@ -20,7 +20,6 @@ import {
   isPermitSignatureRequest,
 } from '../../../../utils';
 import { useConfirmContext } from '../../../../context/confirm';
-import { useIsBIP44 } from '../../../../hooks/useIsBIP44';
 import { useTypesSignSimulationEnabledInfo } from '../../../../hooks/useTypesSignSimulationEnabledInfo';
 import { ConfirmInfoRowTypedSignData } from '../../row/typed-sign-data/typedSignData';
 import { NetworkRow } from '../shared/network-row/network-row';
@@ -50,7 +49,6 @@ const useTokenContract = () => {
 const TypedSignInfo: React.FC = () => {
   const t = useI18nContext();
   const isSimulationSupported = useTypesSignSimulationEnabledInfo();
-  const isBIP44 = useIsBIP44();
   const { tokenContract, verifyingContract, spender, isPermit, chainId } =
     useTokenContract();
   const { decimalsNumber } = useGetTokenStandardAndDetails(
@@ -84,7 +82,7 @@ const TypedSignInfo: React.FC = () => {
             <ConfirmInfoRowDivider />
           </>
         )}
-        <NetworkRow isShownWithAlertsOnly={!isBIP44} />
+        <NetworkRow />
         <ConfirmInfoAlertRow
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
diff --git a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js b/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js
deleted file mode 100644
index e584dd1acb0e..000000000000
--- a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import React, { useContext, useRef } from 'react';
-import PropTypes from 'prop-types';
-
-import BigNumber from 'bignumber.js';
-import { EditGasModes } from '../../../../../shared/constants/gas';
-
-import {
-  TextAlign,
-  FontWeight,
-  TextColor,
-  TextVariant,
-  Severity,
-} from '../../../../helpers/constants/design-system';
-import {
-  BannerAlert,
-  Text,
-  ButtonBase,
-} from '../../../../components/component-library';
-import { areDappSuggestedAndTxParamGasFeesTheSame } from '../../../../helpers/utils/confirm-tx.util';
-
-import InfoTooltip from '../../../../components/ui/info-tooltip';
-import AdvancedGasControls from '../advanced-gas-controls/advanced-gas-controls.component';
-
-import { I18nContext } from '../../../../contexts/i18n';
-
-export default function EditGasDisplay({
-  mode = EditGasModes.modifyInPlace,
-  estimatedMinimumNative,
-  transaction,
-  gasPrice,
-  setGasPrice,
-  gasLimit,
-  setGasLimit,
-  properGasLimit,
-  dappSuggestedGasFeeAcknowledged,
-  setDappSuggestedGasFeeAcknowledged,
-  onManualChange,
-  minimumGasLimit,
-  balanceError,
-  gasErrors,
-  txParamsHaveBeenCustomized,
-}) {
-  const t = useContext(I18nContext);
-  const scrollRef = useRef(null);
-
-  const dappSuggestedAndTxParamGasFeesAreTheSame =
-    areDappSuggestedAndTxParamGasFeesTheSame(transaction);
-
-  const requireDappAcknowledgement = Boolean(
-    transaction?.dappSuggestedGasFees &&
-      !dappSuggestedGasFeeAcknowledged &&
-      dappSuggestedAndTxParamGasFeesAreTheSame,
-  );
-
-  let warningMessage;
-  if (
-    gasLimit !== undefined &&
-    properGasLimit !== undefined &&
-    new BigNumber(gasLimit || 0).lessThan(new BigNumber(properGasLimit))
-  ) {
-    warningMessage = t('gasLimitRecommended', [properGasLimit]);
-  }
-
-  const showTopError = balanceError && txParamsHaveBeenCustomized;
-
-  return (
-    <div className="edit-gas-display">
-      <div className="edit-gas-display__content">
-        {showTopError && (
-          <BannerAlert
-            severity={Severity.Danger}
-            description={t('insufficientFunds')}
-            marginBottom={6}
-          />
-        )}
-        {warningMessage && (
-          <BannerAlert
-            severity={Severity.Warning}
-            description={warningMessage}
-            marginBottom={6}
-          />
-        )}
-        {requireDappAcknowledgement && (
-          <BannerAlert
-            severity={Severity.Warning}
-            className="banner-alert--warning"
-            description={t('gasDisplayDappWarning', [transaction.origin])}
-            marginBottom={6}
-          />
-        )}
-        {mode === EditGasModes.speedUp && (
-          <div className="edit-gas-display__top-tooltip">
-            <Text
-              color={TextColor.textDefault}
-              variant={TextVariant.bodySm}
-              as="h6"
-              fontWeight={FontWeight.Bold}
-            >
-              {t('speedUpTooltipText')}{' '}
-              <InfoTooltip
-                position="top"
-                contentText={t('speedUpExplanation')}
-              />
-            </Text>
-          </div>
-        )}
-        <Text
-          color={TextColor.textDefault}
-          variant={TextVariant.headingLg}
-          as="h1"
-          textAlign={TextAlign.Center}
-        >
-          {estimatedMinimumNative}
-        </Text>
-        {requireDappAcknowledgement && (
-          <ButtonBase
-            className="edit-gas-display__dapp-acknowledgement-button"
-            onClick={() => setDappSuggestedGasFeeAcknowledged(true)}
-          >
-            {t('gasDisplayAcknowledgeDappButtonText')}
-          </ButtonBase>
-        )}
-        {!requireDappAcknowledgement && (
-          <AdvancedGasControls
-            gasLimit={gasLimit}
-            setGasLimit={setGasLimit}
-            gasPrice={gasPrice}
-            setGasPrice={setGasPrice}
-            onManualChange={onManualChange}
-            minimumGasLimit={minimumGasLimit}
-            gasErrors={gasErrors}
-          />
-        )}
-      </div>
-      <div ref={scrollRef} className="edit-gas-display__scroll-bottom" />
-    </div>
-  );
-}
-
-EditGasDisplay.propTypes = {
-  mode: PropTypes.oneOf(Object.values(EditGasModes)),
-  estimatedMinimumNative: PropTypes.string,
-  gasPrice: PropTypes.string,
-  setGasPrice: PropTypes.func,
-  gasLimit: PropTypes.number,
-  setGasLimit: PropTypes.func,
-  properGasLimit: PropTypes.number,
-  dappSuggestedGasFeeAcknowledged: PropTypes.bool,
-  setDappSuggestedGasFeeAcknowledged: PropTypes.func,
-  transaction: PropTypes.object,
-  onManualChange: PropTypes.func,
-  minimumGasLimit: PropTypes.string,
-  balanceError: PropTypes.bool,
-  gasErrors: PropTypes.object,
-  txParamsHaveBeenCustomized: PropTypes.bool,
-};
diff --git a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.stories.js b/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.stories.js
deleted file mode 100644
index a29012b8aee6..000000000000
--- a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.stories.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import EditGasDisplay from '.';
-
-export default {
-  title: 'Confirmations/Components/EditGasDisplay',
-
-  args: {
-    transaction: {},
-  },
-};
-
-export const DefaultStory = (args) => {
-  return (
-    <div style={{ width: '600px' }}>
-      <EditGasDisplay {...args} />
-    </div>
-  );
-};
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.test.js b/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.test.js
deleted file mode 100644
index 9d177ab5da04..000000000000
--- a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-import configureStore from '../../../../store/store';
-import EditGasDisplay from '.';
-
-jest.mock('../../../../selectors');
-jest.mock('../../../../helpers/utils/confirm-tx.util');
-jest.mock('../../../../helpers/utils/transactions.util');
-
-function render({ componentProps = {} } = {}) {
-  const store = configureStore({});
-  return renderWithProvider(<EditGasDisplay {...componentProps} />, store);
-}
-
-describe('EditGasDisplay', () => {
-  it('if render correctly', () => {
-    expect(render).not.toThrow();
-  });
-});
diff --git a/ui/pages/confirmations/components/edit-gas-display/index.js b/ui/pages/confirmations/components/edit-gas-display/index.js
deleted file mode 100644
index d2f752891ab6..000000000000
--- a/ui/pages/confirmations/components/edit-gas-display/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './edit-gas-display.component';
diff --git a/ui/pages/confirmations/components/edit-gas-display/index.scss b/ui/pages/confirmations/components/edit-gas-display/index.scss
deleted file mode 100644
index 8b6f10062020..000000000000
--- a/ui/pages/confirmations/components/edit-gas-display/index.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-.edit-gas-display {
-  &__top-tooltip {
-    text-align: center;
-
-    .info-tooltip {
-      display: inline-block;
-
-      img {
-        height: 10px;
-        width: 10px;
-      }
-    }
-  }
-
-  button.edit-gas-display__dapp-acknowledgement-button {
-    margin: 40px auto 0 auto;
-    display: block;
-    color: var(--color-warning-default);
-    border: 1px solid var(--color-warning-default);
-    text-transform: unset;
-    width: auto;
-    background: transparent;
-
-    &:hover {
-      color: var(--color-warning-default);
-      border: 1px solid var(--color-warning-default);
-      background-color: var(--color-background-hover);
-    }
-
-    &:active {
-      background-color: var(--color-background-pressed);
-    }
-  }
-
-  .radio-group {
-    margin: 20px auto;
-  }
-
-  .advanced-gas-controls {
-    margin-top: 20px;
-  }
-
-  &__scroll-bottom {
-    margin-bottom: -20px;
-    margin-top: 20px;
-  }
-}
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
deleted file mode 100644
index a2fd17717357..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import classNames from 'clsx';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import {
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../../../shared/constants/gas';
-import { PRIORITY_LEVEL_ICON_MAP } from '../../../../../helpers/constants/gas';
-import { PRIMARY } from '../../../../../helpers/constants/common';
-import { toHumanReadableTime } from '../../../../../helpers/utils/util';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import { useTransactionEventFragment } from '../../../hooks/useTransactionEventFragment';
-import { useTransactionModalContext } from '../../../../../contexts/transaction-modal';
-import InfoTooltip from '../../../../../components/ui/info-tooltip';
-import LoadingHeartBeat from '../../../../../components/ui/loading-heartbeat';
-import UserPreferencedCurrencyDisplay from '../../../../../components/app/user-preferenced-currency-display';
-import EditGasToolTip from '../edit-gas-tooltip/edit-gas-tooltip';
-
-import { useGasItemFeeDetails } from './useGasItemFeeDetails';
-
-const getTitleAndIcon = (priorityLevel, editGasMode) => {
-  let icon = priorityLevel;
-  let title = priorityLevel;
-  if (priorityLevel === PriorityLevels.dAppSuggested) {
-    title = 'dappSuggestedShortLabel';
-  } else if (priorityLevel === PriorityLevels.dappSuggestedHigh) {
-    title = 'dappSuggestedHighShortLabel';
-  } else if (priorityLevel === PriorityLevels.tenPercentIncreased) {
-    icon = null;
-    title = 'tenPercentIncreased';
-  } else if (
-    priorityLevel === PriorityLevels.high &&
-    editGasMode === EditGasModes.swaps
-  ) {
-    icon = 'swapSuggested';
-    title = 'swapSuggested';
-  }
-  return {
-    title,
-    icon,
-  };
-};
-
-const EditGasItem = ({ priorityLevel }) => {
-  const {
-    editGasMode,
-    estimateUsed,
-    gasLimit,
-    updateTransactionToTenPercentIncreasedGasFee,
-    updateTransactionUsingDAPPSuggestedValues,
-    updateTransactionUsingEstimate,
-    transaction,
-  } = useGasFeeContext();
-  const { updateTransactionEventFragment } = useTransactionEventFragment();
-  const t = useI18nContext();
-  const { closeModal, openModal } = useTransactionModalContext();
-  const { dappSuggestedGasFees } = transaction;
-
-  const {
-    // for cancel or speedup estimateGreaterThaGasUse is true if previous gas used
-    // was more than estimate for the priorityLevel
-    estimateGreaterThanGasUse,
-    hexMaximumTransactionFee,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    minWaitTime,
-  } = useGasItemFeeDetails(priorityLevel);
-
-  if (
-    priorityLevel === PriorityLevels.dAppSuggested &&
-    !dappSuggestedGasFees?.maxFeePerGas &&
-    !dappSuggestedGasFees?.gasPrice
-  ) {
-    return null;
-  }
-
-  const onOptionSelect = () => {
-    if (priorityLevel === PriorityLevels.custom) {
-      updateTransactionEventFragment({
-        properties: {
-          gas_edit_attempted: 'advanced',
-        },
-      });
-      openModal('advancedGasFee');
-    } else {
-      updateTransactionEventFragment({
-        properties: {
-          gas_edit_type: 'basic',
-        },
-      });
-
-      closeModal(['editGasFee']);
-
-      if (priorityLevel === PriorityLevels.tenPercentIncreased) {
-        updateTransactionToTenPercentIncreasedGasFee();
-      } else if (priorityLevel === PriorityLevels.dAppSuggested) {
-        updateTransactionUsingDAPPSuggestedValues();
-      } else {
-        updateTransactionUsingEstimate(priorityLevel);
-      }
-    }
-  };
-
-  const { title, icon } = getTitleAndIcon(priorityLevel, editGasMode);
-
-  return (
-    <button
-      className={classNames('edit-gas-item', {
-        'edit-gas-item--selected': priorityLevel === estimateUsed,
-        'edit-gas-item--disabled': estimateGreaterThanGasUse,
-      })}
-      onClick={onOptionSelect}
-      aria-label={priorityLevel}
-      autoFocus={priorityLevel === estimateUsed}
-      disabled={estimateGreaterThanGasUse}
-      data-testid={`edit-gas-fee-item-${priorityLevel}`}
-    >
-      <span className="edit-gas-item__name">
-        {icon && (
-          <span
-            className={`edit-gas-item__icon edit-gas-item__icon-${priorityLevel}`}
-          >
-            {PRIORITY_LEVEL_ICON_MAP[icon]}
-          </span>
-        )}
-        {t(title)}
-      </span>
-      <span
-        className={`edit-gas-item__time-estimate edit-gas-item__time-estimate-${priorityLevel}`}
-      >
-        {editGasMode !== EditGasModes.swaps &&
-          (minWaitTime ? toHumanReadableTime(t, minWaitTime) : '--')}
-      </span>
-      <span
-        className={`edit-gas-item__fee-estimate edit-gas-item__fee-estimate-${priorityLevel}`}
-      >
-        {hexMaximumTransactionFee ? (
-          <div className="edit-gas-item__maxfee">
-            <LoadingHeartBeat
-              backgroundColor={
-                priorityLevel === estimateUsed
-                  ? 'var(--color-primary-muted)'
-                  : 'var(--color-background-default)'
-              }
-              estimateUsed={priorityLevel}
-            />
-            <UserPreferencedCurrencyDisplay
-              key="editGasSubTextFeeAmount"
-              type={PRIMARY}
-              value={hexMaximumTransactionFee}
-            />
-          </div>
-        ) : (
-          '--'
-        )}
-      </span>
-      <span className="edit-gas-item__tooltip" data-testid="gas-tooltip">
-        <InfoTooltip
-          contentText={
-            <EditGasToolTip
-              t={t}
-              priorityLevel={priorityLevel}
-              maxFeePerGas={maxFeePerGas}
-              maxPriorityFeePerGas={maxPriorityFeePerGas}
-              editGasMode={editGasMode}
-              gasLimit={gasLimit}
-              transaction={transaction}
-              estimateGreaterThanGasUse={estimateGreaterThanGasUse}
-            />
-          }
-          position="top"
-        />
-      </span>
-    </button>
-  );
-};
-
-EditGasItem.propTypes = {
-  priorityLevel: PropTypes.string,
-};
-
-export default EditGasItem;
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
deleted file mode 100644
index f97a01a6417f..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
+++ /dev/null
@@ -1,291 +0,0 @@
-import React from 'react';
-import { act, screen } from '@testing-library/react';
-
-import {
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../../../shared/constants/gas';
-import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import configureStore from '../../../../../store/store';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
-
-import { CHAIN_IDS } from '../../../../../../shared/constants/network';
-import { mockNetworkState } from '../../../../../../test/stub/networks';
-import { enLocale as messages } from '../../../../../../test/lib/i18n-helpers';
-import EditGasItem from './edit-gas-item';
-
-jest.mock('../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-  getGasFeeTimeEstimate: jest
-    .fn()
-    .mockImplementation(() => Promise.resolve('unknown')),
-  createTransactionEventFragment: jest.fn(),
-}));
-
-const MOCK_FEE_ESTIMATE = {
-  low: {
-    minWaitTimeEstimate: 360000,
-    maxWaitTimeEstimate: 300000,
-    suggestedMaxPriorityFeePerGas: '3',
-    suggestedMaxFeePerGas: '53',
-  },
-  medium: {
-    minWaitTimeEstimate: 30000,
-    maxWaitTimeEstimate: 60000,
-    suggestedMaxPriorityFeePerGas: '7',
-    suggestedMaxFeePerGas: '70',
-  },
-  high: {
-    minWaitTimeEstimate: 15000,
-    maxWaitTimeEstimate: 15000,
-    suggestedMaxPriorityFeePerGas: '10',
-    suggestedMaxFeePerGas: '100',
-  },
-  estimatedBaseFee: '50',
-};
-
-const ESTIMATE_MOCK = {
-  maxFeePerGas: '0x59682f10',
-  maxPriorityFeePerGas: '0x59682f00',
-};
-
-const render = async ({
-  componentProps,
-  transactionProps,
-  contextProps,
-  chainId = CHAIN_IDS.GOERLI,
-  gasFeeEstimates = MOCK_FEE_ESTIMATE,
-} = {}) => {
-  const store = configureStore({
-    metamask: {
-      currencyRates: {},
-      ...mockNetworkState({ chainId, ticker: 'ETH' }),
-      accountsByChainId: {
-        [chainId]: {
-          '0xAddress': {
-            address: '0xAddress',
-            balance: '0x176e5b6f173ebe66',
-          },
-        },
-      },
-      accounts: {
-        '0xAddress': {
-          address: '0xAddress',
-          balance: '0x176e5b6f173ebe66',
-        },
-      },
-      internalAccounts: {
-        accounts: {
-          mockId: {
-            address: '0xAddress',
-            id: 'mockId',
-            metadata: {
-              name: 'Test Account',
-              keyring: {
-                type: 'HD Key Tree',
-              },
-            },
-            options: {},
-            methods: [
-              'personal_sign',
-              'eth_signTransaction',
-              'eth_signTypedData_v1',
-              'eth_signTypedData_v3',
-              'eth_signTypedData_v4',
-            ],
-            type: 'eip155:eoa',
-          },
-        },
-        selectedAccount: 'mock-id',
-      },
-      featureFlags: { advancedInlineGas: true },
-      gasEstimateType: 'fee-market',
-      gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        [chainId]: {
-          gasFeeEstimates,
-          gasEstimateType: 'fee-market',
-        },
-      },
-      advancedGasFee: {
-        [chainId]: {
-          maxBaseFee: '100',
-          priorityFee: '2',
-        },
-      },
-    },
-  });
-
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider
-          transaction={{
-            txParams: { gas: '0x5208' },
-            chainId,
-            ...transactionProps,
-          }}
-          {...contextProps}
-        >
-          <EditGasItem priorityLevel="low" {...componentProps} />
-        </GasFeeContextProvider>,
-        store,
-      )),
-  );
-
-  return result;
-};
-
-describe('EditGasItem', () => {
-  it('should renders low gas estimate option for priorityLevel low', async () => {
-    await render({ componentProps: { priorityLevel: PriorityLevels.low } });
-    expect(
-      screen.queryByRole('button', { name: messages.lowLowercase.message }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('🐢')).toBeInTheDocument();
-    expect(screen.queryByText(messages.low.message)).toBeInTheDocument();
-    expect(screen.queryByText('5 min')).toBeInTheDocument();
-    expect(screen.queryByTitle('0.001113 ETH')).toBeInTheDocument();
-  });
-
-  it('should renders market gas estimate option for priorityLevel medium', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.medium },
-    });
-    expect(
-      screen.queryByRole('button', { name: 'medium' }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('🦊')).toBeInTheDocument();
-    expect(screen.queryByText(messages.medium.message)).toBeInTheDocument();
-    expect(screen.queryByText('5 min')).toBeInTheDocument();
-    expect(screen.queryByTitle('0.00147 ETH')).toBeInTheDocument();
-  });
-
-  it('should renders aggressive gas estimate option for priorityLevel high', async () => {
-    await render({ componentProps: { priorityLevel: PriorityLevels.high } });
-    expect(
-      screen.queryByRole('button', { name: messages.highLowercase.message }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('🦍')).toBeInTheDocument();
-    expect(screen.queryByText(messages.high.message)).toBeInTheDocument();
-    expect(screen.queryByText('15 sec')).toBeInTheDocument();
-    expect(screen.queryByTitle('0.0021 ETH')).toBeInTheDocument();
-  });
-
-  it('should render priorityLevel high as "Swap suggested" for swaps', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.high },
-      contextProps: { editGasMode: EditGasModes.swaps },
-    });
-    expect(
-      screen.queryByRole('button', { name: messages.highLowercase.message }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('🔄')).toBeInTheDocument();
-    expect(
-      screen.queryByText(messages.swapSuggested.message),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('15 sec')).not.toBeInTheDocument();
-    expect(screen.queryByTitle('0.0021 ETH')).toBeInTheDocument();
-  });
-
-  it('should highlight option is priorityLevel is currently selected', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.high },
-      transactionProps: { userFeeLevel: 'high' },
-    });
-    expect(
-      document.getElementsByClassName('edit-gas-item--selected'),
-    ).toHaveLength(1);
-  });
-
-  it('should renders site gas estimate option for priorityLevel dappSuggested', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.dAppSuggested },
-      transactionProps: { dappSuggestedGasFees: ESTIMATE_MOCK },
-    });
-    expect(
-      screen.queryByRole('button', { name: 'dappSuggested' }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('🌐')).toBeInTheDocument();
-    expect(
-      screen.queryByText(messages.dappSuggestedShortLabel.message),
-    ).toBeInTheDocument();
-    expect(screen.queryByTitle('0.0000315 ETH')).toBeInTheDocument();
-  });
-
-  it('should not renders site gas estimate option for priorityLevel dappSuggested if site does not provided gas estimates', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.dAppSuggested },
-      transactionProps: {},
-    });
-    expect(
-      screen.queryByRole('button', { name: 'dappSuggested' }),
-    ).not.toBeInTheDocument();
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.dAppSuggested },
-      transactionProps: { dappSuggestedGasFees: { gas: '0x59682f10' } },
-    });
-    expect(
-      screen.queryByRole('button', { name: 'dappSuggested' }),
-    ).not.toBeInTheDocument();
-  });
-
-  it('should renders advance gas estimate option for priorityLevel custom', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.custom },
-      transactionProps: { userFeeLevel: 'high' },
-    });
-    expect(
-      screen.queryByRole('button', { name: messages.swapCustom.message }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('⚙️')).toBeInTheDocument();
-    expect(screen.queryByText(messages.advanced.message)).toBeInTheDocument();
-    // below value of custom gas fee estimate is default obtained from state.metamask.advancedGasFee
-    expect(screen.queryByTitle('0.0021 ETH')).toBeInTheDocument();
-  });
-
-  it('should render sub-second time estimate on fast confirmation chains', async () => {
-    const subSecondFeeEstimate = {
-      ...MOCK_FEE_ESTIMATE,
-      high: {
-        ...MOCK_FEE_ESTIMATE.high,
-        minWaitTimeEstimate: 500,
-      },
-    };
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.high },
-      transactionProps: { chainId: CHAIN_IDS.MEGAETH_TESTNET },
-      gasFeeEstimates: subSecondFeeEstimate,
-    });
-    expect(
-      screen.queryByRole('button', { name: messages.highLowercase.message }),
-    ).toBeInTheDocument();
-    expect(screen.queryByText('0.5 sec')).toBeInTheDocument();
-  });
-
-  it('should renders +10% gas estimate option for priorityLevel minimum', async () => {
-    await render({
-      componentProps: { priorityLevel: PriorityLevels.tenPercentIncreased },
-      transactionProps: {
-        userFeeLevel: 'tenPercentIncreased',
-        previousGas: ESTIMATE_MOCK,
-      },
-      contextProps: { editGasMode: EditGasModes.cancel },
-    });
-    expect(
-      screen.queryByRole('button', { name: 'tenPercentIncreased' }),
-    ).toBeInTheDocument();
-    expect(
-      screen.queryByText(messages.tenPercentIncreased.message),
-    ).toBeInTheDocument();
-    expect(screen.queryByTitle('0.00003465 ETH')).toBeInTheDocument();
-  });
-});
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.js
deleted file mode 100644
index 3ba916857d2a..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './edit-gas-item';
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.scss b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.scss
deleted file mode 100644
index 26da77652f7b..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/index.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-.edit-gas-item {
-  border-radius: 24px;
-  background: var(--color-background-default);
-  color: var(--color-text-alternative);
-  cursor: pointer;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-  margin: 12px 0;
-  padding: 4px 12px;
-  height: 32px;
-  width: 100%;
-
-  &:hover:not([disabled]) {
-    background-color: var(--color-background-default-hover);
-  }
-
-  &--selected {
-    background-color: var(--color-primary-muted);
-
-    &:hover:not([disabled]) {
-      background-color: var(--color-primary-muted);
-    }
-  }
-
-  button.edit-gas-item--disabled[disabled] {
-    opacity: 0.25;
-    pointer-events: none;
-  }
-
-  &__name {
-    display: inline-flex;
-    align-items: center;
-    color: var(--color-text-default);
-    font-size: 12px;
-    font-weight: bold;
-    white-space: nowrap;
-    width: 36%;
-
-    &__sufix {
-      font-weight: 400;
-      margin-left: 4px;
-    }
-  }
-
-  &__icon {
-    font-size: 20px;
-    line-height: 1;
-    margin-right: 4px;
-
-    &-custom {
-      font-size: 22px;
-      line-height: 1;
-    }
-  }
-
-  &__maxfee {
-    position: relative;
-  }
-
-  &__time-estimate {
-    display: inline-block;
-    text-align: left;
-    width: 24%;
-  }
-
-  &__fee-estimate {
-    display: inline-block;
-    width: 30%;
-    white-space: nowrap;
-  }
-
-  &__tooltip {
-    display: inline-block;
-    text-align: right;
-    width: 10%;
-
-    .info-tooltip {
-      display: inline-block;
-    }
-  }
-
-  &__time-estimate-low,
-  &__fee-estimate-high {
-    color: var(--color-warning-default);
-  }
-
-  &__time-estimate-medium,
-  &__time-estimate-high {
-    color: var(--color-success-default);
-  }
-}
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js
deleted file mode 100644
index 0a4ae5276b4e..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import BigNumber from 'bignumber.js';
-
-import { GasEstimateTypes } from '../../../../../../shared/constants/gas';
-import {
-  getGasEstimateType,
-  getIsGasEstimatesLoading,
-} from '../../../../../ducks/metamask/metamask';
-import { getGasFeeTimeEstimate } from '../../../../../store/actions';
-
-export const useCustomTimeEstimate = ({
-  gasFeeEstimates,
-  maxFeePerGas,
-  maxPriorityFeePerGas,
-}) => {
-  const gasEstimateType = useSelector(getGasEstimateType);
-  const isGasEstimatesLoading = useSelector(getIsGasEstimatesLoading);
-
-  const [customEstimatedTime, setCustomEstimatedTime] = useState(null);
-
-  const returnNoEstimates =
-    isGasEstimatesLoading ||
-    gasEstimateType !== GasEstimateTypes.feeMarket ||
-    !maxPriorityFeePerGas;
-
-  // If the user has chosen a value lower than the low gas fee estimate,
-  // We'll need to use the useEffect hook below to make a call to calculate
-  // the time to show
-  const isUnknownLow =
-    gasFeeEstimates?.low &&
-    Number(maxPriorityFeePerGas) <
-      Number(gasFeeEstimates.low.suggestedMaxPriorityFeePerGas);
-
-  useEffect(() => {
-    if (
-      isGasEstimatesLoading ||
-      gasEstimateType !== GasEstimateTypes.feeMarket ||
-      !maxPriorityFeePerGas
-    ) {
-      return;
-    }
-    if (isUnknownLow) {
-      // getGasFeeTimeEstimate requires parameters in string format
-      getGasFeeTimeEstimate(
-        new BigNumber(maxPriorityFeePerGas, 10).toString(10),
-        new BigNumber(maxFeePerGas, 10).toString(10),
-      ).then((result) => {
-        setCustomEstimatedTime(result);
-      });
-    }
-  }, [
-    gasEstimateType,
-    isUnknownLow,
-    isGasEstimatesLoading,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    returnNoEstimates,
-  ]);
-
-  if (returnNoEstimates) {
-    return {};
-  }
-
-  let waitTimeEstimate = '';
-
-  if (
-    isUnknownLow &&
-    customEstimatedTime &&
-    customEstimatedTime !== 'unknown' &&
-    customEstimatedTime?.upperTimeBound !== 'unknown'
-  ) {
-    waitTimeEstimate = Number(customEstimatedTime?.upperTimeBound);
-  } else if (
-    Number(maxPriorityFeePerGas) >=
-    Number(gasFeeEstimates?.medium?.suggestedMaxPriorityFeePerGas)
-  ) {
-    waitTimeEstimate = gasFeeEstimates?.high?.minWaitTimeEstimate;
-  } else {
-    waitTimeEstimate = gasFeeEstimates?.low?.maxWaitTimeEstimate;
-  }
-
-  return { waitTimeEstimate };
-};
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useGasItemFeeDetails.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useGasItemFeeDetails.js
deleted file mode 100644
index f1720a2d114a..000000000000
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-item/useGasItemFeeDetails.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import {
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../../../shared/constants/gas';
-import { getMaximumGasTotalInHexWei } from '../../../../../../shared/lib/gas.utils';
-import {
-  addTenPercentAndRound,
-  gasEstimateGreaterThanGasUsedPlusTenPercent,
-} from '../../../../../helpers/utils/gas';
-import { getAdvancedGasFeeValues } from '../../../../../selectors';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import {
-  decGWEIToHexWEI,
-  decimalToHex,
-  hexWEIToDecGWEI,
-} from '../../../../../../shared/lib/conversion.utils';
-import { useCustomTimeEstimate } from './useCustomTimeEstimate';
-
-export const useGasItemFeeDetails = (priorityLevel) => {
-  const {
-    editGasMode,
-    estimateUsed,
-    gasFeeEstimates,
-    gasLimit,
-    maxFeePerGas: maxFeePerGasValue,
-    maxPriorityFeePerGas: maxPriorityFeePerGasValue,
-    transaction,
-  } = useGasFeeContext();
-  const [estimateGreaterThanGasUse, setEstimateGreaterThanGasUse] =
-    useState(false);
-  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
-
-  let maxFeePerGas;
-  let maxPriorityFeePerGas;
-  let minWaitTime;
-
-  const { dappSuggestedGasFees } = transaction;
-
-  if (gasFeeEstimates?.[priorityLevel]) {
-    maxFeePerGas = gasFeeEstimates[priorityLevel].suggestedMaxFeePerGas;
-    maxPriorityFeePerGas =
-      gasFeeEstimates[priorityLevel].suggestedMaxPriorityFeePerGas;
-  } else if (
-    priorityLevel === PriorityLevels.dAppSuggested &&
-    dappSuggestedGasFees
-  ) {
-    maxFeePerGas = hexWEIToDecGWEI(
-      dappSuggestedGasFees.maxFeePerGas || dappSuggestedGasFees.gasPrice,
-    );
-    maxPriorityFeePerGas = hexWEIToDecGWEI(
-      dappSuggestedGasFees.maxPriorityFeePerGas || maxFeePerGas,
-    );
-  } else if (priorityLevel === PriorityLevels.custom) {
-    if (estimateUsed === PriorityLevels.custom) {
-      maxFeePerGas = maxFeePerGasValue;
-      maxPriorityFeePerGas = maxPriorityFeePerGasValue;
-    } else if (advancedGasFeeValues && editGasMode !== EditGasModes.swaps) {
-      maxFeePerGas = advancedGasFeeValues.maxBaseFee;
-      maxPriorityFeePerGas = advancedGasFeeValues.priorityFee;
-    }
-  } else if (
-    priorityLevel === PriorityLevels.tenPercentIncreased &&
-    transaction.previousGas
-  ) {
-    maxFeePerGas = hexWEIToDecGWEI(
-      addTenPercentAndRound(transaction.previousGas?.maxFeePerGas),
-    );
-    maxPriorityFeePerGas = hexWEIToDecGWEI(
-      addTenPercentAndRound(transaction.previousGas?.maxPriorityFeePerGas),
-    );
-  }
-
-  const { waitTimeEstimate } = useCustomTimeEstimate({
-    gasFeeEstimates,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-  });
-
-  if (gasFeeEstimates?.[priorityLevel]) {
-    minWaitTime =
-      priorityLevel === PriorityLevels.high
-        ? gasFeeEstimates?.high.minWaitTimeEstimate
-        : gasFeeEstimates?.low.maxWaitTimeEstimate;
-  } else {
-    minWaitTime = waitTimeEstimate;
-  }
-
-  const hexMaximumTransactionFee = maxFeePerGas
-    ? getMaximumGasTotalInHexWei({
-        gasLimit: decimalToHex(gasLimit),
-        maxFeePerGas: decGWEIToHexWEI(maxFeePerGas),
-      })
-    : null;
-
-  useEffect(() => {
-    // For cancel and speed-up medium / high option is disabled if
-    // gas used in transaction + 10% is greater tham estimate
-    if (
-      (editGasMode === EditGasModes.cancel ||
-        editGasMode === EditGasModes.speedUp) &&
-      (priorityLevel === PriorityLevels.medium ||
-        priorityLevel === PriorityLevels.high)
-    ) {
-      const estimateGreater = !gasEstimateGreaterThanGasUsedPlusTenPercent(
-        transaction.previousGas || transaction.txParams,
-        gasFeeEstimates,
-        priorityLevel,
-      );
-      setEstimateGreaterThanGasUse(estimateGreater);
-    }
-  }, [editGasMode, gasFeeEstimates, priorityLevel, transaction]);
-
-  return {
-    estimateGreaterThanGasUse,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    minWaitTime,
-    hexMaximumTransactionFee,
-  };
-};
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js
index 006e69ed274b..e188cd50ed5b 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js
@@ -19,8 +19,8 @@ const EditGasToolTip = ({
   gasLimit,
   priorityLevel,
   // maxFeePerGas & maxPriorityFeePerGas are derived from conditional logic
-  // related to the source of the estimates. We pass these values from the
-  // the parent component (edit-gas-item) rather than recalculate them
+  // related to the source of the estimates. We pass these values from
+  // the parent component rather than recalculate them
   maxFeePerGas,
   maxPriorityFeePerGas,
   transaction,
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 71a40db9e57d..c6ebb0b70a22 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
@@ -1,25 +1,10 @@
 import React from 'react';
-import { act } from '@testing-library/react';
 import configureStore from '../../../../../store/store';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
 import { mockNetworkState } from '../../../../../../test/stub/networks';
 import { CHAIN_IDS } from '../../../../../../shared/constants/network';
 import EditGasToolTip from './edit-gas-tooltip';
 
-jest.mock('../../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-  getGasFeeTimeEstimate: jest
-    .fn()
-    .mockImplementation(() => Promise.resolve('unknown')),
-}));
-
 const LOW_GAS_OPTION = {
   maxFeePerGas: '2.010203381',
   maxPriorityFeePerGas: '1.20004164',
@@ -35,7 +20,7 @@ const HIGH_GAS_OPTION = {
   maxPriorityFeePerGas: '2',
 };
 
-const render = async (componentProps) => {
+const render = (componentProps) => {
   const mockStore = {
     metamask: {
       ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
@@ -81,24 +66,15 @@ const render = async (componentProps) => {
 
   const store = configureStore(mockStore);
 
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider transaction={{ txParams: { gas: '0x5208' } }}>
-          <EditGasToolTip {...componentProps} t={jest.fn()} gasLimit={21000} />
-        </GasFeeContextProvider>,
-        store,
-      )),
+  return renderWithProvider(
+    <EditGasToolTip {...componentProps} t={jest.fn()} gasLimit={21000} />,
+    store,
   );
-
-  return result;
 };
 
 describe('EditGasToolTip', () => {
-  it('should render correct values for priorityLevel low', async () => {
-    const { queryByText } = await render({
+  it('should render correct values for priorityLevel low', () => {
+    const { queryByText } = render({
       priorityLevel: 'low',
       ...LOW_GAS_OPTION,
     });
@@ -108,8 +84,8 @@ describe('EditGasToolTip', () => {
     expect(queryByText('21000')).toBeInTheDocument();
   });
 
-  it('should render correct values for priorityLevel medium', async () => {
-    const { queryByText } = await render({
+  it('should render correct values for priorityLevel medium', () => {
+    const { queryByText } = render({
       priorityLevel: 'medium',
       ...MEDIUM_GAS_OPTION,
     });
@@ -118,8 +94,8 @@ describe('EditGasToolTip', () => {
     expect(queryByText('21000')).toBeInTheDocument();
   });
 
-  it('should render correct values for priorityLevel high', async () => {
-    const { queryByText } = await render({
+  it('should render correct values for priorityLevel high', () => {
+    const { queryByText } = render({
       priorityLevel: 'high',
       ...HIGH_GAS_OPTION,
     });
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.js b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.js
index cb46926f6299..6ea197ca5fe2 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.js
@@ -8,7 +8,6 @@ import {
 import { isNullish } from '../../../../../helpers/utils/util';
 import { formatGasFeeOrFeeRange } from '../../../../../helpers/utils/gas';
 import { I18nContext } from '../../../../../contexts/i18n';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
 import { useGasFeeEstimates } from '../../../../../hooks/useGasFeeEstimates';
 import { Text } from '../../../../../components/component-library';
 import { useConfirmContext } from '../../../context/confirm';
@@ -17,15 +16,8 @@ import StatusSlider from './status-slider';
 
 const NetworkStatistics = ({ useRedesigned }) => {
   const t = useContext(I18nContext);
-  const { gasFeeEstimates: gasFeeEstimatesContext } = useGasFeeContext();
   const { networkClientId } = useConfirmContext()?.currentConfirmation ?? {};
-  const hasContextEstimates = Boolean(gasFeeEstimatesContext);
-  const { gasFeeEstimates: fallbackEstimates } = useGasFeeEstimates(
-    networkClientId,
-    !hasContextEstimates,
-  );
-  const gasFeeEstimates =
-    gasFeeEstimatesContext ?? fallbackEstimates ?? undefined;
+  const { gasFeeEstimates } = useGasFeeEstimates(networkClientId);
 
   const formattedLatestBaseFee = formatGasFeeOrFeeRange(
     gasFeeEstimates?.estimatedBaseFee,
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.test.js b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.test.js
index 5b6cc7a751a0..131137e29680 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/network-statistics.test.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../../../store/store';
-import { GasFeeContext } from '../../../../../contexts/gasFee';
 import { enLocale as messages } from '../../../../../../test/lib/i18n-helpers';
 import { useGasFeeEstimates } from '../../../../../hooks/useGasFeeEstimates';
 import { useConfirmContext } from '../../../context/confirm';
@@ -18,14 +17,12 @@ jest.mock('../../../context/confirm', () => ({
 const mockUseGasFeeEstimates = jest.mocked(useGasFeeEstimates);
 const mockUseConfirmContext = jest.mocked(useConfirmContext);
 
-const renderComponent = ({ gasFeeContext = {}, state = {} } = {}) => {
-  const store = configureStore(state);
-  return renderWithProvider(
-    <GasFeeContext.Provider value={gasFeeContext}>
-      <NetworkStatistics />
-    </GasFeeContext.Provider>,
-    store,
-  );
+const renderComponent = ({ gasFeeEstimates } = {}) => {
+  mockUseGasFeeEstimates.mockReturnValue({
+    gasFeeEstimates: gasFeeEstimates ?? undefined,
+  });
+  const store = configureStore({});
+  return renderWithProvider(<NetworkStatistics />, store);
 };
 
 describe('NetworkStatistics', () => {
@@ -36,10 +33,8 @@ describe('NetworkStatistics', () => {
 
   it('should render the latest base fee rounded to no decimal places', () => {
     const { getByText } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          estimatedBaseFee: '50.0112',
-        },
+      gasFeeEstimates: {
+        estimatedBaseFee: '50.0112',
       },
     });
     expect(getByText('50 GWEI')).toBeInTheDocument();
@@ -47,10 +42,8 @@ describe('NetworkStatistics', () => {
 
   it('should not render the latest base fee if it is not present', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          estimatedBaseFee: null,
-        },
+      gasFeeEstimates: {
+        estimatedBaseFee: null,
       },
     });
     expect(queryByTestId('formatted-latest-base-fee')).not.toBeInTheDocument();
@@ -58,19 +51,15 @@ describe('NetworkStatistics', () => {
 
   it('should not render the latest base fee if no gas fee estimates are available', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: null,
-      },
+      gasFeeEstimates: null,
     });
     expect(queryByTestId('formatted-latest-base-fee')).not.toBeInTheDocument();
   });
 
   it('should render the latest priority fee range, with the low end of the range rounded to 1 decimal place and the high end rounded to no decimal places', () => {
     const { getByText } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          latestPriorityFeeRange: ['1.100001668', '2.5634234'],
-        },
+      gasFeeEstimates: {
+        latestPriorityFeeRange: ['1.100001668', '2.5634234'],
       },
     });
     expect(getByText('1.1 - 3 GWEI')).toBeInTheDocument();
@@ -78,10 +67,8 @@ describe('NetworkStatistics', () => {
 
   it('should not render the latest priority fee range if it is not present', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          latestPriorityFeeRange: null,
-        },
+      gasFeeEstimates: {
+        latestPriorityFeeRange: null,
       },
     });
     expect(
@@ -91,9 +78,7 @@ describe('NetworkStatistics', () => {
 
   it('should not render the latest priority fee range if no gas fee estimates are available', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: null,
-      },
+      gasFeeEstimates: null,
     });
     expect(
       queryByTestId('formatted-latest-priority-fee-range'),
@@ -102,10 +87,8 @@ describe('NetworkStatistics', () => {
 
   it('should render the network status slider', () => {
     const { getByText } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          networkCongestion: 0.5,
-        },
+      gasFeeEstimates: {
+        networkCongestion: 0.5,
       },
     });
     expect(getByText(messages.stable.message)).toBeInTheDocument();
@@ -113,10 +96,8 @@ describe('NetworkStatistics', () => {
 
   it('should not render the network status slider if the network congestion is not available', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          networkCongestion: null,
-        },
+      gasFeeEstimates: {
+        networkCongestion: null,
       },
     });
     expect(queryByTestId('status-slider-label')).not.toBeInTheDocument();
@@ -124,14 +105,12 @@ describe('NetworkStatistics', () => {
 
   it('should not render the network status slider if no gas fee estimates are available', () => {
     const { queryByTestId } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: null,
-      },
+      gasFeeEstimates: null,
     });
     expect(queryByTestId('status-slider-label')).not.toBeInTheDocument();
   });
 
-  it('uses fallback from useGasFeeEstimates when context has no gasFeeEstimates and confirm context provides networkClientId', () => {
+  it('passes networkClientId from confirm context to useGasFeeEstimates', () => {
     mockUseConfirmContext.mockReturnValue({
       currentConfirmation: { networkClientId: 'mainnet' },
     });
@@ -144,35 +123,11 @@ describe('NetworkStatistics', () => {
     });
 
     const store = configureStore({});
-    const { getByText } = renderWithProvider(
-      <GasFeeContext.Provider value={{}}>
-        <NetworkStatistics />
-      </GasFeeContext.Provider>,
-      store,
-    );
+    const { getByText } = renderWithProvider(<NetworkStatistics />, store);
 
+    expect(mockUseGasFeeEstimates).toHaveBeenCalledWith('mainnet');
     expect(getByText('50 GWEI')).toBeInTheDocument();
     expect(getByText('1 - 3 GWEI')).toBeInTheDocument();
     expect(getByText(messages.stable.message)).toBeInTheDocument();
   });
-
-  it('uses context gasFeeEstimates when present and ignores fallback', () => {
-    mockUseGasFeeEstimates.mockReturnValue({
-      gasFeeEstimates: {
-        estimatedBaseFee: '50',
-        latestPriorityFeeRange: ['1', '3'],
-        networkCongestion: 0.5,
-      },
-    });
-
-    const { getByText } = renderComponent({
-      gasFeeContext: {
-        gasFeeEstimates: {
-          estimatedBaseFee: '99.5',
-        },
-      },
-    });
-
-    expect(getByText('100 GWEI')).toBeInTheDocument();
-  });
 });
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 12ae5c935d3d..2e1076ef8863 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
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { NetworkCongestionThresholds } from '../../../../../../../shared/constants/gas';
-import { useGasFeeContext } from '../../../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { NetworkStabilityTooltip } from '../tooltips';
 
@@ -140,10 +139,8 @@ const determineStatusInfo = (givenNetworkCongestion) => {
   };
 };
 
-const StatusSlider = ({ gasFeeEstimates: gasFeeEstimatesProp }) => {
+const StatusSlider = ({ gasFeeEstimates }) => {
   const t = useI18nContext();
-  const contextEstimates = useGasFeeContext()?.gasFeeEstimates;
-  const gasFeeEstimates = gasFeeEstimatesProp ?? contextEstimates;
   const statusInfo = determineStatusInfo(gasFeeEstimates?.networkCongestion);
 
   return (
diff --git a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js
index 78bab021a8ba..024ac236777a 100644
--- a/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js
+++ b/ui/pages/confirmations/components/edit-gas-fee-popover/network-statistics/status-slider/status-slider.test.js
@@ -1,26 +1,20 @@
 import React from 'react';
 
 import { renderWithProvider } from '../../../../../../../test/lib/render-helpers-navigate';
-import { GasFeeContext } from '../../../../../../contexts/gasFee';
 import configureStore from '../../../../../../store/store';
 import { enLocale as messages } from '../../../../../../../test/lib/i18n-helpers';
 
 import StatusSlider from './status-slider';
 
-const renderComponent = ({ networkCongestion, gasFeeEstimatesProp } = {}) => {
-  const contextValue =
-    networkCongestion === undefined
-      ? {}
-      : { gasFeeEstimates: { networkCongestion } };
-  const component = (
-    <GasFeeContext.Provider value={contextValue}>
-      <StatusSlider gasFeeEstimates={gasFeeEstimatesProp} />
-    </GasFeeContext.Provider>
-  );
+const renderComponent = ({ networkCongestion } = {}) => {
+  const gasFeeEstimates =
+    networkCongestion === undefined ? undefined : { networkCongestion };
 
   const store = configureStore();
-
-  return renderWithProvider(component, store);
+  return renderWithProvider(
+    <StatusSlider gasFeeEstimates={gasFeeEstimates} />,
+    store,
+  );
 };
 
 describe('StatusSlider', () => {
@@ -91,11 +85,4 @@ describe('StatusSlider', () => {
     );
     expect(getByTestId('status-slider-label')).toHaveStyle('color: #6D5C90');
   });
-
-  it('uses gasFeeEstimates prop for networkCongestion when provided (no context)', () => {
-    const { getByText } = renderComponent({
-      gasFeeEstimatesProp: { networkCongestion: 0.9 },
-    });
-    expect(getByText(messages.busy.message)).toBeInTheDocument();
-  });
 });
diff --git a/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.component.js b/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.component.js
deleted file mode 100644
index 1f16dba58464..000000000000
--- a/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.component.js
+++ /dev/null
@@ -1,232 +0,0 @@
-import React, { useCallback, useContext, useState } from 'react';
-import PropTypes from 'prop-types';
-import { useDispatch } from 'react-redux';
-import { useGasFeeInputs } from '../../hooks/useGasFeeInputs';
-import { txParamsAreDappSuggested } from '../../../../../shared/lib/transaction.utils';
-import {
-  EditGasModes,
-  GAS_LIMITS,
-  CUSTOM_GAS_ESTIMATE,
-  GasRecommendations,
-} from '../../../../../shared/constants/gas';
-
-import {
-  Modal,
-  ModalOverlay,
-  Button,
-  ButtonVariant,
-  ButtonSize,
-} from '../../../../components/component-library';
-import { ModalContent } from '../../../../components/component-library/modal-content/deprecated';
-import { ModalHeader } from '../../../../components/component-library/modal-header/deprecated';
-import EditGasDisplay from '../edit-gas-display';
-
-import { I18nContext } from '../../../../contexts/i18n';
-import {
-  createCancelTransaction,
-  createSpeedUpTransaction,
-  hideModal,
-  updateTransactionGasFees,
-  hideLoadingIndication,
-  showLoadingIndication,
-} from '../../../../store/actions';
-import LoadingHeartBeat from '../../../../components/ui/loading-heartbeat';
-import { useIncrementedGasFees } from '../../hooks/useIncrementedGasFees';
-import {
-  decGWEIToHexWEI,
-  decimalToHex,
-  hexToDecimal,
-} from '../../../../../shared/lib/conversion.utils';
-
-export default function EditGasPopover({
-  popoverTitle = '',
-  confirmButtonText = '',
-  editGasDisplayProps = {},
-  transaction,
-  mode,
-  onClose,
-  minimumGasLimit = GAS_LIMITS.SIMPLE,
-}) {
-  const t = useContext(I18nContext);
-  const dispatch = useDispatch();
-
-  const [dappSuggestedGasFeeAcknowledged, setDappSuggestedGasFeeAcknowledged] =
-    useState(false);
-
-  const minimumGasLimitDec = hexToDecimal(minimumGasLimit);
-  const updatedCustomGasSettings = useIncrementedGasFees(transaction);
-
-  let updatedTransaction = transaction;
-  if (mode === EditGasModes.speedUp || mode === EditGasModes.cancel) {
-    updatedTransaction = {
-      ...transaction,
-      userFeeLevel: CUSTOM_GAS_ESTIMATE,
-      txParams: {
-        ...transaction.txParams,
-        ...updatedCustomGasSettings,
-      },
-    };
-  }
-
-  const {
-    estimatedMinimumNative,
-    gasPrice,
-    setGasPrice,
-    gasLimit,
-    setGasLimit,
-    properGasLimit,
-    estimateToUse,
-    hasGasErrors,
-    gasErrors,
-    onManualChange,
-    balanceError,
-  } = useGasFeeInputs(
-    GasRecommendations.medium,
-    updatedTransaction,
-    minimumGasLimit,
-    mode,
-  );
-
-  const txParamsHaveBeenCustomized =
-    estimateToUse === CUSTOM_GAS_ESTIMATE ||
-    txParamsAreDappSuggested(updatedTransaction);
-
-  /**
-   * Temporary placeholder, this should be managed by the parent component but
-   * we will be extracting this component from the hard to maintain modal
-   * component. For now this is just to be able to appropriately close
-   * the modal in testing
-   */
-  const closePopover = useCallback(() => {
-    if (onClose) {
-      onClose();
-    } else {
-      dispatch(hideModal());
-    }
-  }, [onClose, dispatch]);
-
-  const onSubmit = useCallback(async () => {
-    if (!updatedTransaction || !mode) {
-      closePopover();
-    }
-
-    const newGasSettings = {
-      gas: decimalToHex(gasLimit),
-      gasLimit: decimalToHex(gasLimit),
-      estimateUsed: estimateToUse,
-      gasPrice: decGWEIToHexWEI(gasPrice),
-    };
-
-    const cleanTransactionParams = { ...updatedTransaction.txParams };
-
-    const updatedTxMeta = {
-      ...updatedTransaction,
-      userEditedGasLimit: gasLimit !== Number(transaction.originalGasEstimate),
-      userFeeLevel: estimateToUse || CUSTOM_GAS_ESTIMATE,
-      txParams: {
-        ...cleanTransactionParams,
-        ...newGasSettings,
-      },
-    };
-
-    switch (mode) {
-      case EditGasModes.cancel:
-        dispatch(
-          createCancelTransaction(updatedTransaction.id, newGasSettings),
-        );
-        break;
-      case EditGasModes.speedUp:
-        dispatch(
-          createSpeedUpTransaction(updatedTransaction.id, newGasSettings),
-        );
-        break;
-      case EditGasModes.modifyInPlace:
-        newGasSettings.userEditedGasLimit = updatedTxMeta.userEditedGasLimit;
-        newGasSettings.userFeeLevel = updatedTxMeta.userFeeLevel;
-
-        dispatch(showLoadingIndication());
-        await dispatch(
-          updateTransactionGasFees(updatedTxMeta.id, newGasSettings),
-        );
-        dispatch(hideLoadingIndication());
-        break;
-      default:
-        break;
-    }
-
-    closePopover();
-  }, [
-    updatedTransaction,
-    mode,
-    dispatch,
-    closePopover,
-    gasLimit,
-    gasPrice,
-    transaction.originalGasEstimate,
-    estimateToUse,
-  ]);
-
-  let title = t('editGasTitle');
-  if (popoverTitle) {
-    title = popoverTitle;
-  } else if (mode === EditGasModes.speedUp) {
-    title = t('speedUpPopoverTitle');
-  } else if (mode === EditGasModes.cancel) {
-    title = t('cancelPopoverTitle');
-  }
-
-  const footerButtonText = confirmButtonText || t('save');
-  return (
-    <Modal isOpen onClose={closePopover}>
-      <ModalOverlay />
-      <ModalContent autoFocus={false} className="edit-gas-popover">
-        <ModalHeader onClose={closePopover} marginBottom={4}>
-          {title}
-        </ModalHeader>
-        <div className="edit-gas-popover__edit-gas-display">
-          {process.env.IN_TEST ? null : <LoadingHeartBeat />}
-          <EditGasDisplay
-            dappSuggestedGasFeeAcknowledged={dappSuggestedGasFeeAcknowledged}
-            setDappSuggestedGasFeeAcknowledged={
-              setDappSuggestedGasFeeAcknowledged
-            }
-            estimatedMinimumNative={estimatedMinimumNative}
-            gasPrice={gasPrice}
-            setGasPrice={setGasPrice}
-            gasLimit={gasLimit}
-            setGasLimit={setGasLimit}
-            properGasLimit={properGasLimit}
-            mode={mode}
-            transaction={updatedTransaction}
-            onManualChange={onManualChange}
-            minimumGasLimit={minimumGasLimitDec}
-            balanceError={balanceError}
-            txParamsHaveBeenCustomized={txParamsHaveBeenCustomized}
-            gasErrors={gasErrors}
-            {...editGasDisplayProps}
-          />
-        </div>
-        <Button
-          block
-          variant={ButtonVariant.Primary}
-          size={ButtonSize.LG}
-          marginTop={4}
-          onClick={onSubmit}
-          disabled={hasGasErrors || balanceError || !txParamsHaveBeenCustomized}
-        >
-          {footerButtonText}
-        </Button>
-      </ModalContent>
-    </Modal>
-  );
-}
-
-EditGasPopover.propTypes = {
-  popoverTitle: PropTypes.string,
-  editGasDisplayProps: PropTypes.object,
-  confirmButtonText: PropTypes.string,
-  onClose: PropTypes.func,
-  transaction: PropTypes.object,
-  mode: PropTypes.oneOf(Object.values(EditGasModes)),
-  minimumGasLimit: PropTypes.string,
-};
diff --git a/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.stories.js b/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.stories.js
deleted file mode 100644
index 00f0238539ed..000000000000
--- a/ui/pages/confirmations/components/edit-gas-popover/edit-gas-popover.stories.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureStore from '../../../../store/store';
-import testData from '../../../../../.storybook/test-data';
-import {
-  EditGasModes,
-  GasRecommendations,
-} from '../../../../../shared/constants/gas';
-
-import { decGWEIToHexWEI } from '../../../../../shared/lib/conversion.utils';
-import EditGasPopover from '.';
-
-const store = configureStore(testData);
-
-export default {
-  title: 'Confirmations/Components/EditGasPopover',
-  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
-
-  argTypes: {
-    editGasDisplayProps: {
-      control: 'object',
-    },
-    transaction: {
-      control: 'object',
-    },
-    defaultEstimateToUse: { control: 'text' },
-    mode: { control: 'text' },
-    confirmButtonText: { control: 'text' },
-    minimumGasLimit: { control: 'text' },
-    onClose: { action: 'Close Edit Gas Popover' },
-  },
-};
-
-const transaction = {
-  userFeeLevel: GasRecommendations.medium,
-  txParams: {
-    maxFeePerGas: decGWEIToHexWEI('10000'),
-    maxPriorityFeePerGas: '0x5600',
-    gas: `0x5600`,
-    gasPrice: '0x5600',
-  },
-};
-const defaultEstimateToUse = GasRecommendations.high;
-const mode = EditGasModes.swaps;
-const confirmButtonText = 'Submit';
-const minimumGasLimit = '5700';
-
-export const DefaultStory = (args) => {
-  return (
-    <div style={{ width: '600px' }}>
-      <EditGasPopover {...args} />
-    </div>
-  );
-};
-
-DefaultStory.storyName = 'Default';
-DefaultStory.args = {
-  transaction,
-  defaultEstimateToUse,
-  mode,
-  confirmButtonText,
-  minimumGasLimit,
-};
diff --git a/ui/pages/confirmations/components/edit-gas-popover/index.js b/ui/pages/confirmations/components/edit-gas-popover/index.js
deleted file mode 100644
index 98a908824bbb..000000000000
--- a/ui/pages/confirmations/components/edit-gas-popover/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './edit-gas-popover.component';
diff --git a/ui/pages/confirmations/components/edit-gas-popover/index.scss b/ui/pages/confirmations/components/edit-gas-popover/index.scss
deleted file mode 100644
index b6b4e8bdf362..000000000000
--- a/ui/pages/confirmations/components/edit-gas-popover/index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.edit-gas-popover {
-  &__edit-gas-display {
-    position: relative;
-  }
-}
diff --git a/ui/pages/confirmations/components/gas-timing/gas-timing.component.js b/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
index b9acd6c8ae37..9ee14a8f7572 100644
--- a/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
+++ b/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
@@ -8,7 +8,6 @@ import {
   PriorityLevels,
 } from '../../../../../shared/constants/gas';
 import { Box, Text } from '../../../../components/component-library';
-import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { I18nContext } from '../../../../contexts/i18n';
 import {
   getGasEstimateType,
@@ -57,7 +56,6 @@ export default function GasTiming({
   const gasFeeEstimates = chainGasFeeEstimates || gasFeeEstimatesFromRoot;
   const [customEstimatedTime, setCustomEstimatedTime] = useState(null);
   const t = useContext(I18nContext);
-  const estimateUsed = useGasFeeContext()?.estimateUsed;
 
   // If the user has chosen a value lower than the low gas fee estimate,
   // We'll need to use the useEffect hook below to make a call to calculate
@@ -144,7 +142,7 @@ export default function GasTiming({
 
   const { low = {}, medium = {}, high = {} } = gasFeeEstimates;
 
-  const estimateToUse = userFeeLevelOverride ?? estimateUsed ?? 'medium';
+  const estimateToUse = userFeeLevelOverride ?? 'medium';
 
   const isPresetEstimate = PRESET_ESTIMATES.has(estimateToUse);
   const textTKey = estimateToUse === 'low' ? 'gasTimingLow' : estimateToUse;
diff --git a/ui/pages/confirmations/components/gas-timing/gas-timing.component.test.js b/ui/pages/confirmations/components/gas-timing/gas-timing.component.test.js
index 05c0c1653d90..669fcc1f84d3 100644
--- a/ui/pages/confirmations/components/gas-timing/gas-timing.component.test.js
+++ b/ui/pages/confirmations/components/gas-timing/gas-timing.component.test.js
@@ -5,7 +5,6 @@ import { renderWithProvider } from '../../../../../test/lib/render-helpers-navig
 
 import { GasEstimateTypes } from '../../../../../shared/constants/gas';
 import mockState from '../../../../../test/data/mock-state.json';
-import { useGasFeeContext } from '../../../../contexts/gasFee';
 
 import { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
@@ -15,17 +14,10 @@ jest.mock('../../../../store/actions.ts', () => ({
   getGasFeeTimeEstimate: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
 
-jest.mock('../../../../contexts/gasFee.js', () => ({
-  useGasFeeContext: jest.fn().mockImplementation(() => ({
-    estimateUsed: 'medium',
-  })),
-}));
-
 describe('Gas timing', () => {
   afterEach(jest.clearAllMocks);
 
   it('renders nothing when gas is loading', () => {
-    // Fails the networkAndAccountSupports1559 check
     const nullGasState = {
       metamask: {
         gasFeeEstimates: null,
@@ -55,13 +47,10 @@ describe('Gas timing', () => {
   });
 
   it('renders "10% increase" when the estimate is tenPercentIncreased', async () => {
-    useGasFeeContext.mockReturnValue({
-      estimateUsed: 'tenPercentIncreased',
-    });
-
     const mockStore = configureMockStore()(mockState);
     const props = {
       maxPriorityFeePerGas: '1000000',
+      userFeeLevelOverride: 'tenPercentIncreased',
     };
 
     const screen = renderWithProvider(<GasTiming {...props} />, mockStore);
@@ -74,13 +63,10 @@ describe('Gas timing', () => {
   });
 
   it('renders "Site suggested" when the estimate is dappSuggested', async () => {
-    useGasFeeContext.mockReturnValue({
-      estimateUsed: 'dappSuggested',
-    });
-
     const mockStore = configureMockStore()(mockState);
     const props = {
       maxPriorityFeePerGas: '1000000',
+      userFeeLevelOverride: 'dappSuggested',
     };
 
     const screen = renderWithProvider(<GasTiming {...props} />, mockStore);
@@ -90,9 +76,7 @@ describe('Gas timing', () => {
     });
   });
 
-  it('uses userFeeLevelOverride when context has no estimateUsed', async () => {
-    useGasFeeContext.mockReturnValue({});
-
+  it('uses userFeeLevelOverride when passed', async () => {
     const mockStore = configureMockStore()(mockState);
     const screen = renderWithProvider(
       <GasTiming
@@ -110,8 +94,6 @@ describe('Gas timing', () => {
   });
 
   it('uses userFeeLevelOverride for medium when passed', async () => {
-    useGasFeeContext.mockReturnValue({});
-
     const mockStore = configureMockStore()(mockState);
     const screen = renderWithProvider(
       <GasTiming
@@ -126,30 +108,19 @@ describe('Gas timing', () => {
     });
   });
 
-  it('userFeeLevelOverride wins over context when both are provided', async () => {
-    useGasFeeContext.mockReturnValue({ estimateUsed: 'medium' });
-
+  it('defaults to medium when no userFeeLevelOverride is given', async () => {
     const mockStore = configureMockStore()(mockState);
     const screen = renderWithProvider(
-      <GasTiming
-        maxPriorityFeePerGas="1000000"
-        userFeeLevelOverride="tenPercentIncreased"
-      />,
+      <GasTiming maxPriorityFeePerGas="1000000" />,
       mockStore,
     );
 
     await waitFor(() => {
-      expect(
-        screen.queryByText(messages.tenPercentIncreased.message),
-      ).toBeTruthy();
+      expect(screen.queryByText(messages.medium.message)).toBeTruthy();
     });
   });
 
   it('renders "<1 sec" when the chain is fast and estimate time is low', async () => {
-    useGasFeeContext.mockReturnValue({
-      estimateUsed: 'high',
-    });
-
     const fastChainState = {
       ...mockState,
       metamask: {
@@ -170,6 +141,7 @@ describe('Gas timing', () => {
       <GasTiming
         chainId={CHAIN_IDS.MEGAETH_MAINNET}
         maxPriorityFeePerGas="10"
+        userFeeLevelOverride="high"
       />,
       mockStore,
     );
@@ -180,10 +152,6 @@ describe('Gas timing', () => {
   });
 
   it('renders "~0 sec" instead of "<0 sec" when minWaitTimeEstimate is 0', async () => {
-    useGasFeeContext.mockReturnValue({
-      estimateUsed: 'high',
-    });
-
     const zeroTimeState = {
       ...mockState,
       metamask: {
@@ -211,10 +179,6 @@ describe('Gas timing', () => {
   });
 
   it('renders "<1 sec" for Ethereum mainnet', async () => {
-    useGasFeeContext.mockReturnValue({
-      estimateUsed: 'high',
-    });
-
     const ethereumState = {
       ...mockState,
       metamask: {
@@ -232,7 +196,11 @@ describe('Gas timing', () => {
 
     const mockStore = configureMockStore()(ethereumState);
     const screen = renderWithProvider(
-      <GasTiming chainId={CHAIN_IDS.MAINNET} maxPriorityFeePerGas="10" />,
+      <GasTiming
+        chainId={CHAIN_IDS.MAINNET}
+        maxPriorityFeePerGas="10"
+        userFeeLevelOverride="high"
+      />,
       mockStore,
     );
 
diff --git a/ui/pages/confirmations/components/index.scss b/ui/pages/confirmations/components/index.scss
index 6145a7118519..d4bfac3dead6 100644
--- a/ui/pages/confirmations/components/index.scss
+++ b/ui/pages/confirmations/components/index.scss
@@ -1,12 +1,4 @@
 /** Please import your files in alphabetical order **/
-@import 'advanced-gas-controls/index';
-@import 'advanced-gas-fee-popover/index';
-@import 'advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index';
-@import 'advanced-gas-fee-popover/advanced-gas-fee-defaults/index';
-@import 'advanced-gas-fee-popover/advanced-gas-fee-inputs/index';
-@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 'confirmation-warning-modal/index';
 @import 'confirm/dapp-swap-comparison-banner/index';
 @import 'confirm/footer';
@@ -16,13 +8,10 @@
 @import 'confirm/info/shared/gas-fee-token-toast/index';
 @import 'confirm/scroll-to-bottom';
 @import 'confirm/nav/nav.scss';
-@import 'edit-gas-display/index';
 @import 'edit-gas-fee-popover/index';
-@import 'edit-gas-fee-popover/edit-gas-item/index';
 @import 'edit-gas-fee-popover/network-statistics/index';
 @import 'edit-gas-fee-popover/network-statistics/status-slider/index';
 @import 'edit-gas-fee-popover/edit-gas-tooltip/index';
-@import 'edit-gas-popover/index';
 @import 'set-approval-for-all-warning/index';
 @import 'transaction-detail/index';
 @import 'transaction-detail-item/index';
diff --git a/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.test.tsx b/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.test.tsx
index 24bde25e3b48..22c5d732e9a5 100644
--- a/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.test.tsx
+++ b/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { act, render, fireEvent } from '@testing-library/react';
 import {
   ButtonIconSize,
   IconColor,
@@ -93,4 +93,31 @@ describe('InfoPopoverTooltip', () => {
       'Question content',
     );
   });
+
+  it('renders a plain icon with the correct icon name when plainIcon is true', async () => {
+    const { getByTestId, getByRole } = render(
+      <InfoPopoverTooltip
+        data-testid="plain-tooltip"
+        iconName={IconName.Question}
+        iconColor={IconColor.IconAlternative}
+        plainIcon
+        ariaLabel="bonus info"
+      >
+        <span>Plain icon content</span>
+      </InfoPopoverTooltip>,
+    );
+
+    const button = getByRole('button', { name: 'bonus info' });
+    expect(button).toBeInTheDocument();
+
+    const svg = button.querySelector('svg');
+    expect(svg).toBeInTheDocument();
+
+    await act(async () => {
+      fireEvent.click(getByTestId('plain-tooltip-button'));
+    });
+    expect(getByTestId('plain-tooltip')).toHaveTextContent(
+      'Plain icon content',
+    );
+  });
 });
diff --git a/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.tsx b/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.tsx
index 548119feb225..d38cfe0b8174 100644
--- a/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.tsx
+++ b/ui/pages/confirmations/components/info-popover-tooltip/info-popover-tooltip.tsx
@@ -3,17 +3,15 @@ import {
   Box,
   ButtonIcon,
   ButtonIconSize,
+  Icon,
   IconColor,
   IconName,
+  IconSize,
 } from '@metamask/design-system-react';
 import {
-  Icon,
-  IconName as LegacyIconName,
-  IconSize,
   Popover,
   PopoverPosition,
 } from '../../../../components/component-library';
-import { IconColor as LegacyIconColor } from '../../../../helpers/constants/design-system';
 
 const POPOVER_STYLE = {
   zIndex: 3,
@@ -30,7 +28,7 @@ type InfoPopoverTooltipProps = {
   position?: PopoverPosition;
   iconName?: IconName;
   iconSize?: ButtonIconSize;
-  iconColor?: IconColor | LegacyIconColor | string;
+  iconColor?: IconColor | string;
   iconMarginLeft?: number;
   /**
    * When true, renders a plain Icon instead of a ButtonIcon so the trigger
@@ -88,9 +86,9 @@ export function InfoPopoverTooltip({
           }}
         >
           <Icon
-            name={iconName as unknown as LegacyIconName}
+            name={iconName}
             size={IconSize.Sm}
-            color={iconColor as LegacyIconColor}
+            color={iconColor as IconColor}
           />
         </button>
       ) : (
diff --git a/ui/pages/confirmations/components/rows/claimable-bonus-row/claimable-bonus-row.tsx b/ui/pages/confirmations/components/rows/claimable-bonus-row/claimable-bonus-row.tsx
index d17e58a11dfb..a008d4c653f0 100644
--- a/ui/pages/confirmations/components/rows/claimable-bonus-row/claimable-bonus-row.tsx
+++ b/ui/pages/confirmations/components/rows/claimable-bonus-row/claimable-bonus-row.tsx
@@ -1,6 +1,7 @@
 import React, { useContext } from 'react';
 import {
   FontWeight,
+  IconColor,
   IconName,
   Text,
   TextButton,
@@ -9,7 +10,6 @@ import {
   TextVariant,
 } from '@metamask/design-system-react';
 import { PopoverPosition } from '../../../../../components/component-library';
-import { Color } from '../../../../../helpers/constants/design-system';
 import { InfoPopoverTooltip } from '../../info-popover-tooltip';
 import {
   ConfirmInfoRow,
@@ -60,7 +60,7 @@ export function ClaimableBonusRow({
         <InfoPopoverTooltip
           position={PopoverPosition.TopStart}
           iconName={IconName.Question}
-          iconColor={Color.iconAlternative}
+          iconColor={IconColor.IconAlternative}
           iconMarginLeft={1}
           plainIcon
           ariaLabel={t('musdClaimableBonusTooltipAria') as string}
diff --git a/ui/pages/confirmations/components/send/recipient-input/recipient-input.tsx b/ui/pages/confirmations/components/send/recipient-input/recipient-input.tsx
index 59014173f9fa..7e005db20cd9 100644
--- a/ui/pages/confirmations/components/send/recipient-input/recipient-input.tsx
+++ b/ui/pages/confirmations/components/send/recipient-input/recipient-input.tsx
@@ -52,9 +52,12 @@ export const RecipientInput = ({
   const {
     recipientConfusableCharacters,
     recipientError,
+    recipientErrorAllowAcknowledge,
     recipientResolvedLookup,
     toAddressValidated,
   } = recipientValidationResult;
+  const isWarning = Boolean(recipientErrorAllowAcknowledge);
+  const isHardError = Boolean(recipientError) && !isWarning;
   const avatarSeedAddress =
     accountAddressSeedIconMap.get(to?.toLowerCase() as string) ||
     recipientResolvedLookup ||
@@ -149,7 +152,9 @@ export const RecipientInput = ({
         </Box>
       ) : (
         <TextField
-          error={Boolean(recipientError)}
+          error={isHardError}
+          // TODO: @MetaMask/design-system-engineers: This seems to be the only current use case for a TextField warning state; align on whether TextField should support warning styling (or if there’s a preferred DS pattern).
+          className={isWarning ? '!border-warning-default' : undefined}
           endAccessory={
             recipients.length > 0 ? (
               <ButtonIcon
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.stories.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.stories.tsx
index 0d1d5cd6c6d5..1aa4a102e076 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.stories.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.stories.tsx
@@ -13,6 +13,7 @@ import {
 import { NameType } from '@metamask/name-controller';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { mockNetworkState } from '../../../../../test/stub/networks';
+import { ConfirmContextProvider } from '../../context/confirm';
 
 const DUMMY_BALANCE_CHANGE = {
   previousBalance: '0xIGNORED' as Hex,
@@ -89,7 +90,19 @@ function createTransactionMeta(
 const meta: Meta<typeof SimulationDetails> = {
   title: 'Components/App/SimulationDetails',
   component: SimulationDetails,
-  decorators: [(story) => <Provider store={storeMock}>{story()}</Provider>],
+  decorators: [
+    (Story, context) => (
+      <Provider store={storeMock}>
+        <ConfirmContextProvider
+          currentConfirmationOverride={
+            context.args.transaction as TransactionMeta
+          }
+        >
+          <Story />
+        </ConfirmContextProvider>
+      </Provider>
+    ),
+  ],
 };
 
 export default meta;
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 0ad964089baf..36fcb45aca32 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
@@ -397,6 +397,86 @@ describe('SimulationDetails', () => {
     );
   });
 
+  it('renders error instead of static rows when simulation is reverted', () => {
+    (useBalanceChanges as jest.Mock).mockReturnValue({
+      pending: false,
+      value: [],
+    });
+
+    const staticRows: StaticRow[] = [
+      {
+        label: 'Approve',
+        balanceChanges: [
+          {
+            asset: {
+              address: '0x123',
+              chainId: '0x321',
+              standard: TokenStandard.ERC20,
+            },
+            amount: new BigNumber(123),
+            fiatAmount: 456,
+            usdAmount: 789,
+          },
+        ],
+      },
+    ];
+
+    renderSimulationDetails(
+      { error: { code: SimulationErrorCode.Reverted, message: '' } },
+      false,
+      staticRows,
+    );
+
+    expect(
+      screen.getByText(/transaction is likely to fail/u),
+    ).toBeInTheDocument();
+    expect(BalanceChangeList).not.toHaveBeenCalled();
+  });
+
+  it('renders static rows when simulation error is chain not supported', () => {
+    (useBalanceChanges as jest.Mock).mockReturnValue({
+      pending: false,
+      value: [],
+    });
+
+    const staticRows: StaticRow[] = [
+      {
+        label: 'Approve',
+        balanceChanges: [
+          {
+            asset: {
+              address: '0x123',
+              chainId: '0x321',
+              standard: TokenStandard.ERC20,
+            },
+            amount: new BigNumber(123),
+            fiatAmount: 456,
+            usdAmount: 789,
+          },
+        ],
+      },
+    ];
+
+    renderSimulationDetails(
+      {
+        error: {
+          code: SimulationErrorCode.ChainNotSupported,
+          message: 'Chain is not supported',
+        },
+      },
+      false,
+      staticRows,
+    );
+
+    expect(BalanceChangeList).toHaveBeenCalledWith(
+      expect.objectContaining({
+        heading: 'Approve',
+        balanceChanges: staticRows[0].balanceChanges,
+      }),
+      {},
+    );
+  });
+
   it('indicates that simulation details are enforced', () => {
     (useBalanceChanges as jest.Mock).mockReturnValue({
       pending: false,
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 9af716192d4c..2e85620ca0e5 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -467,7 +467,10 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
     return null;
   }
 
-  if (error && !hasStaticData) {
+  if (
+    error &&
+    (error.code === SimulationErrorCode.Reverted || !hasStaticData)
+  ) {
     const inHeaderProp = error.code !== SimulationErrorCode.Reverted && {
       inHeader: <ErrorContent error={error} />,
     };
diff --git a/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.js b/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.js
index 38e5a4b89a0e..f77c7338a327 100644
--- a/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.js
+++ b/ui/pages/confirmations/components/transaction-detail/transaction-detail.component.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
@@ -13,11 +12,10 @@ export default function TransactionDetail({
   disableEditGasFeeButton: _disableEditGasFeeButton = false,
 }) {
   const t = useI18nContext();
-  const { supportsEIP1559 } = useGasFeeContext();
 
   return (
     <div className="transaction-detail">
-      {!supportsEIP1559 && onEdit && (
+      {onEdit && (
         <div className="transaction-detail-edit">
           <button onClick={onEdit}>{t('edit')}</button>
         </div>
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 044f0040164b..23c35b1684af 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
@@ -1,89 +1,41 @@
 import React from 'react';
-import { act, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 
-import { TransactionEnvelopeType } from '@metamask/transaction-controller';
-import { GasEstimateTypes } from '../../../../../shared/constants/gas';
-
-import { GasFeeContextProvider } from '../../../../contexts/gasFee';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers-navigate';
-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 { enLocale as messages } from '../../../../../test/lib/i18n-helpers';
 import TransactionDetail from './transaction-detail.component';
 
-jest.mock('../../../../store/actions', () => ({
-  gasFeeStartPollingByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue('pollingToken'),
-  gasFeeStopPollingByPollingToken: jest.fn(),
-  getNetworkConfigurationByNetworkClientId: jest
-    .fn()
-    .mockResolvedValue({ chainId: '0x5' }),
-  createTransactionEventFragment: jest.fn(),
-}));
-
-const mockSelectedInternalAccount =
-  getSelectedInternalAccountFromMockState(mockState);
-
-const render = async ({ componentProps, contextProps } = {}) => {
+const render = ({ componentProps } = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
-      accounts: {
-        [mockSelectedInternalAccount.address]: {
-          address: mockSelectedInternalAccount.address,
-          balance: '0x1F4',
-        },
-      },
-      gasFeeEstimates:
-        mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-      gasFeeEstimatesByChainId: {
-        ...mockState.metamask.gasFeeEstimatesByChainId,
-        '0x5': {
-          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
-          gasFeeEstimates:
-            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
-        },
-      },
     },
   });
 
-  let result;
-
-  await act(
-    async () =>
-      (result = renderWithProvider(
-        <GasFeeContextProvider {...contextProps}>
-          <TransactionDetail
-            onEdit={() => {
-              console.log('on edit');
-            }}
-            rows={[]}
-            userAcknowledgedGasMissing
-            {...componentProps}
-          />
-        </GasFeeContextProvider>,
-        store,
-      )),
+  return renderWithProvider(
+    <TransactionDetail
+      onEdit={() => {
+        console.log('on edit');
+      }}
+      rows={[]}
+      userAcknowledgedGasMissing
+      {...componentProps}
+    />,
+    store,
   );
-
-  return result;
 };
 
 describe('TransactionDetail', () => {
-  it('should render edit link with text edit for legacy transactions', async () => {
-    await render({
-      contextProps: {
-        transaction: {
-          userFeeLevel: 'low',
-          txParams: { type: TransactionEnvelopeType.legacy },
-        },
-      },
-    });
-    expect(screen.queryByText('🐢')).not.toBeInTheDocument();
+  it('should render edit link when onEdit is provided', () => {
+    render();
     expect(screen.queryByText(messages.edit.message)).toBeInTheDocument();
   });
+
+  it('should not render edit link when onEdit is not provided', () => {
+    render({ componentProps: { onEdit: undefined } });
+    expect(screen.queryByText(messages.edit.message)).not.toBeInTheDocument();
+  });
 });
diff --git a/ui/pages/confirmations/confirm/confirm.tsx b/ui/pages/confirmations/confirm/confirm.tsx
index 2b5613a096eb..47e9863c6be4 100644
--- a/ui/pages/confirmations/confirm/confirm.tsx
+++ b/ui/pages/confirmations/confirm/confirm.tsx
@@ -1,8 +1,6 @@
-import { ReactNodeLike } from 'prop-types';
-import React, { ReactNode } from 'react';
+import React from 'react';
 
 import { Page } from '../../../components/multichain/pages/page';
-import { GasFeeContextProvider } from '../../../contexts/gasFee';
 import { TransactionModalContextProvider } from '../../../contexts/transaction-modal';
 import { BlockaidLoadingIndicator } from '../components/confirm/blockaid-loading-indicator';
 import { ConfirmAlerts } from '../components/confirm/confirm-alerts';
@@ -13,7 +11,7 @@ import { SmartTransactionsBannerAlert } from '../components/smart-transactions-b
 import { PluggableSection } from '../components/confirm/pluggable-section';
 import ScrollToBottom from '../components/confirm/scroll-to-bottom';
 import { Title } from '../components/confirm/title';
-import { ConfirmContextProvider, useConfirmContext } from '../context/confirm';
+import { ConfirmContextProvider } from '../context/confirm';
 import { ConfirmNav } from '../components/confirm/nav/nav';
 import { GasFeeTokenToast } from '../components/confirm/info/shared/gas-fee-token-toast/gas-fee-token-toast';
 import { DappSwapContextProvider } from '../context/dapp-swap';
@@ -22,42 +20,29 @@ import {
   GasFeeModalWrapper,
 } from '../context/gas-fee-modal';
 
-const GasFeeContextProviderWrapper: React.FC<{
-  children: ReactNode;
-}> = ({ children }) => {
-  const { currentConfirmation } = useConfirmContext();
-  return (
-    <GasFeeContextProvider transaction={currentConfirmation}>
-      {children as NonNullable<ReactNodeLike>}
-    </GasFeeContextProvider>
-  );
-};
-
 const Confirm: React.FC<{ confirmationId?: string }> = ({ confirmationId }) => (
   <ConfirmContextProvider confirmationId={confirmationId}>
     <DappSwapContextProvider>
       <GasFeeModalContextProvider>
         <TransactionModalContextProvider>
-          <GasFeeContextProviderWrapper>
-            <ConfirmAlerts>
-              <>
-                <Page className="confirm_wrapper">
-                  <ConfirmNav />
-                  <Header />
-                  <SmartTransactionsBannerAlert marginType="noTop" />
-                  <ScrollToBottom>
-                    <BlockaidLoadingIndicator />
-                    <Title />
-                    <Info />
-                    <PluggableSection />
-                  </ScrollToBottom>
-                  <GasFeeTokenToast />
-                  <Footer />
-                </Page>
-                <GasFeeModalWrapper />
-              </>
-            </ConfirmAlerts>
-          </GasFeeContextProviderWrapper>
+          <ConfirmAlerts>
+            <>
+              <Page className="confirm_wrapper">
+                <ConfirmNav />
+                <Header />
+                <SmartTransactionsBannerAlert marginType="noTop" />
+                <ScrollToBottom>
+                  <BlockaidLoadingIndicator />
+                  <Title />
+                  <Info />
+                  <PluggableSection />
+                </ScrollToBottom>
+                <GasFeeTokenToast />
+                <Footer />
+              </Page>
+              <GasFeeModalWrapper />
+            </>
+          </ConfirmAlerts>
         </TransactionModalContextProvider>
       </GasFeeModalContextProvider>
     </DappSwapContextProvider>
diff --git a/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
index 1d3ec6d2645a..20ced38ff97e 100644
--- a/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
+++ b/ui/pages/confirmations/confirmation/templates/smart-transaction-status-page.js
@@ -2,6 +2,11 @@
 function getValues(pendingApproval, t, actions, _navigate) {
   const { id, requestState } = pendingApproval;
   return {
+    // Skip the full-screen page; the transaction continues in the background
+    // and the toast listener provides status feedback.
+    onLoad: () => {
+      actions.resolvePendingApproval(id, true);
+    },
     content: [
       {
         element: 'SmartTransactionStatusPage',
diff --git a/ui/pages/confirmations/context/confirm/index.tsx b/ui/pages/confirmations/context/confirm/index.tsx
index 5b887535572a..2392ae74b230 100644
--- a/ui/pages/confirmations/context/confirm/index.tsx
+++ b/ui/pages/confirmations/context/confirm/index.tsx
@@ -65,7 +65,7 @@ export const ConfirmContextProvider: React.FC<{
 
     if (shouldNavigateHomeRef.current && !isHardwareWalletErrorModalVisible) {
       shouldNavigateHomeRef.current = false;
-      navigate(`${DEFAULT_ROUTE}?tab=activity`, { replace: true });
+      navigate(DEFAULT_ROUTE, { replace: true });
     }
   }, [
     currentConfirmationOverride,
diff --git a/ui/pages/confirmations/context/gas-fee-modal/index.tsx b/ui/pages/confirmations/context/gas-fee-modal/index.tsx
index 1dc77a5acd8f..e99f78474a78 100644
--- a/ui/pages/confirmations/context/gas-fee-modal/index.tsx
+++ b/ui/pages/confirmations/context/gas-fee-modal/index.tsx
@@ -82,15 +82,6 @@ export const useGasFeeModalContext = () => {
   return context;
 };
 
-/**
- * Optional getter for GasFeeModalContext. Returns undefined when outside
- * GasFeeModalContextProvider (e.g. EditGasFeePopover on transaction list).
- * Used by components that support both legacy useGasFeeContext and the
- * GasFeeModalContextProvider flow (e.g. cancel-speedup).
- */
-export const useGasFeeModalContextOptional = () =>
-  useContext(GasFeeModalContext);
-
 export const GasFeeModalWrapper = () => {
   const {
     isGasFeeModalVisible,
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.test.tsx b/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.test.tsx
index 12e7f6428e4e..cace6337accf 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.test.tsx
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-import { ReactNodeLike } from 'prop-types';
 import { ApprovalType } from '@metamask/controller-utils';
 import { TransactionMeta } from '@metamask/transaction-controller';
 
@@ -12,11 +10,9 @@ import {
   AlertActionKey,
   RowAlertKey,
 } from '../../../../../components/app/confirm/info/row/constants';
-import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
 import { useGasFeeLowAlerts } from './useGasFeeLowAlerts';
 
 const TRANSACTION_ID_MOCK = '123-456';
-const TRANSACTION_ID_MOCK_2 = '456-789';
 
 const CONFIRMATION_MOCK = {
   ...genUnapprovedContractInteractionConfirmation({
@@ -27,10 +23,8 @@ const CONFIRMATION_MOCK = {
 
 function buildState({
   currentConfirmation,
-  transaction,
 }: {
   currentConfirmation?: TransactionMeta;
-  transaction?: TransactionMeta;
 } = {}) {
   let pendingApprovals = {};
   if (currentConfirmation) {
@@ -45,24 +39,17 @@ function buildState({
   return getMockConfirmState({
     metamask: {
       pendingApprovals,
-      transactions: transaction ? [transaction] : [],
+      transactions: currentConfirmation ? [currentConfirmation] : [],
     },
   });
 }
 
 function runHook(stateOptions?: Parameters<typeof buildState>[0]) {
   const state = buildState(stateOptions);
-  const transaction = stateOptions?.transaction;
 
   const response = renderHookWithConfirmContextProvider(
     useGasFeeLowAlerts,
     state,
-    '/',
-    ({ children }: { children: NonNullable<ReactNodeLike> }) => (
-      <GasFeeContextProvider transaction={transaction}>
-        {children}
-      </GasFeeContextProvider>
-    ),
   );
 
   return response.result.current;
@@ -77,19 +64,6 @@ describe('useGasFeeLowAlerts', () => {
     expect(runHook()).toEqual([]);
   });
 
-  it('returns no alerts if confirmation does not match gas fee context transaction', () => {
-    expect(
-      runHook({
-        currentConfirmation: CONFIRMATION_MOCK,
-        transaction: {
-          ...CONFIRMATION_MOCK,
-          id: TRANSACTION_ID_MOCK_2,
-          userFeeLevel: PriorityLevels.low,
-        },
-      }),
-    ).toEqual([]);
-  });
-
   // @ts-expect-error This is missing from the Mocha type definitions
   it.each(
     Object.values(PriorityLevels).filter(
@@ -100,10 +74,8 @@ describe('useGasFeeLowAlerts', () => {
     (userFeeLevel: PriorityLevels) => {
       expect(
         runHook({
-          currentConfirmation: CONFIRMATION_MOCK,
-          transaction: {
+          currentConfirmation: {
             ...CONFIRMATION_MOCK,
-            id: TRANSACTION_ID_MOCK,
             userFeeLevel,
           },
         }),
@@ -113,10 +85,8 @@ describe('useGasFeeLowAlerts', () => {
 
   it('returns alert if transaction has low user fee level', () => {
     const alerts = runHook({
-      currentConfirmation: CONFIRMATION_MOCK,
-      transaction: {
+      currentConfirmation: {
         ...CONFIRMATION_MOCK,
-        id: TRANSACTION_ID_MOCK,
         userFeeLevel: PriorityLevels.low,
       },
     });
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.ts b/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.ts
index 063c84874fc8..5f598b12654c 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useGasFeeLowAlerts.ts
@@ -2,7 +2,6 @@
 
 import { useMemo } from 'react';
 import { TransactionMeta } from '@metamask/transaction-controller';
-import { useGasFeeContext } from '../../../../../contexts/gasFee';
 import { Severity } from '../../../../../helpers/constants/design-system';
 import { PriorityLevels } from '../../../../../../shared/constants/gas';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
@@ -16,15 +15,9 @@ import { useConfirmContext } from '../../../context/confirm';
 export function useGasFeeLowAlerts(): Alert[] {
   const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext();
-  const { id: transactionId } = (currentConfirmation ?? {}) as TransactionMeta;
+  const transaction = currentConfirmation as TransactionMeta | undefined;
 
-  const { estimateUsed, transaction } = useGasFeeContext() as {
-    estimateUsed: PriorityLevels;
-    transaction: TransactionMeta;
-  };
-
-  const isLowEstimate =
-    transactionId === transaction?.id && estimateUsed === PriorityLevels.low;
+  const isLowEstimate = transaction?.userFeeLevel === PriorityLevels.low;
 
   return useMemo(() => {
     if (!isLowEstimate) {
diff --git a/ui/pages/confirmations/hooks/send/useSendActions.test.ts b/ui/pages/confirmations/hooks/send/useSendActions.test.ts
index 0dfb3fbbb4e7..1562c6504795 100644
--- a/ui/pages/confirmations/hooks/send/useSendActions.test.ts
+++ b/ui/pages/confirmations/hooks/send/useSendActions.test.ts
@@ -130,7 +130,7 @@ describe('useSendQueryParams', () => {
 
     await waitFor(() => {
       expect(mockSubmitNonEvmTransaction).toHaveBeenCalled();
-      expect(mockUseNavigate).toHaveBeenCalledWith('/?tab=activity');
+      expect(mockUseNavigate).toHaveBeenCalledWith('/');
     });
   });
 
diff --git a/ui/pages/confirmations/hooks/send/useSendActions.ts b/ui/pages/confirmations/hooks/send/useSendActions.ts
index 744beed00e87..29482abb6dea 100644
--- a/ui/pages/confirmations/hooks/send/useSendActions.ts
+++ b/ui/pages/confirmations/hooks/send/useSendActions.ts
@@ -97,8 +97,8 @@ export const useSendActions = () => {
           return;
         }
 
-        // Success - navigate to activity tab
-        navigate(`${DEFAULT_ROUTE}?tab=activity`);
+        // Success
+        navigate(DEFAULT_ROUTE);
       } catch (error) {
         // Check for user rejection using error code (4001) - this is language-independent
         const errorCode = (error as { code?: number })?.code;
diff --git a/ui/pages/confirmations/hooks/useCancelSpeedupGasState.test.ts b/ui/pages/confirmations/hooks/useCancelSpeedupGasState.test.ts
index 2f46100f675a..028796d8e1e4 100644
--- a/ui/pages/confirmations/hooks/useCancelSpeedupGasState.test.ts
+++ b/ui/pages/confirmations/hooks/useCancelSpeedupGasState.test.ts
@@ -8,6 +8,7 @@ import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
 import { useCancelSpeedupGasState } from './useCancelSpeedupGasState';
 
 import { useTransactionFunctions } from './useTransactionFunctions';
+import { useLegacyCancelSpeedupFlow } from './useLegacyCancelSpeedupFlow';
 
 jest.mock('../../../hooks/useGasFeeEstimates', () => ({
   useGasFeeEstimates: jest.fn(),
@@ -17,6 +18,12 @@ jest.mock('./useTransactionFunctions', () => ({
   useTransactionFunctions: jest.fn(),
 }));
 
+jest.mock('./useLegacyCancelSpeedupFlow', () => ({
+  useLegacyCancelSpeedupFlow: jest.fn(),
+}));
+
+const mockUseLegacyCancelSpeedupFlow = jest.mocked(useLegacyCancelSpeedupFlow);
+
 const mockUseGasFeeEstimates = jest.mocked(useGasFeeEstimates);
 const mockUseTransactionFunctions = jest.mocked(useTransactionFunctions);
 
@@ -37,6 +44,7 @@ jest.mock('../../../selectors', () => ({
 jest.mock('react-redux', () => ({
   useSelector: (selector: (state: unknown) => unknown) =>
     selector?.({}) ?? undefined,
+  useDispatch: () => jest.fn(),
 }));
 
 function createMockTransaction(overrides: Partial<TransactionMeta> = {}) {
@@ -62,6 +70,11 @@ describe('useCancelSpeedupGasState', () => {
   const mockUpdateTransaction = jest.fn();
   const mockUpdateTransactionUsingDAPPSuggestedValues = jest.fn();
 
+  const mockLegacyCancelTransaction = jest.fn();
+  const mockLegacySpeedUpTransaction = jest.fn();
+  const mockLegacyUpdateTenPercent = jest.fn();
+  const mockLegacyUpdateUsingEstimate = jest.fn();
+
   beforeEach(() => {
     jest.clearAllMocks();
     mockSelectNetworkConfigurationByChainId.mockReturnValue(mockNetwork);
@@ -82,6 +95,12 @@ describe('useCancelSpeedupGasState', () => {
         mockUpdateTransactionUsingDAPPSuggestedValues,
       updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
     });
+    mockUseLegacyCancelSpeedupFlow.mockReturnValue({
+      cancelTransaction: mockLegacyCancelTransaction,
+      speedUpTransaction: mockLegacySpeedUpTransaction,
+      updateTransactionToTenPercentIncreasedGasFee: mockLegacyUpdateTenPercent,
+      updateTransactionUsingEstimate: mockLegacyUpdateUsingEstimate,
+    });
   });
 
   it('returns effectiveTransaction, gasFeeEstimates, and transaction action functions', () => {
@@ -167,4 +186,71 @@ describe('useCancelSpeedupGasState', () => {
       }),
     );
   });
+
+  describe('legacy and EIP-1559 flows', () => {
+    it('returns EIP-1559 functions when transaction has maxFeePerGas', () => {
+      const transaction = createMockTransaction();
+
+      const { result } = renderHook(() =>
+        useCancelSpeedupGasState(transaction, EditGasModes.speedUp),
+      );
+
+      expect(result.current.cancelTransaction).toBe(mockCancelTransaction);
+      expect(result.current.speedUpTransaction).toBe(mockSpeedUpTransaction);
+      expect(result.current.updateTransactionToTenPercentIncreasedGasFee).toBe(
+        mockUpdateTransactionToTenPercentIncreasedGasFee,
+      );
+      expect(result.current.updateTransactionUsingEstimate).toBe(
+        mockUpdateTransactionUsingEstimate,
+      );
+    });
+
+    it('returns legacy functions when transaction has no maxFeePerGas (gasPrice only)', () => {
+      const legacyTransaction = createMockTransaction({
+        txParams: {
+          gas: '0x5208',
+          gasLimit: '0x5208',
+          gasPrice: '0x2540be400',
+        } as TransactionMeta['txParams'],
+      });
+
+      const { result } = renderHook(() =>
+        useCancelSpeedupGasState(legacyTransaction, EditGasModes.cancel),
+      );
+
+      expect(result.current.cancelTransaction).toBe(
+        mockLegacyCancelTransaction,
+      );
+      expect(result.current.speedUpTransaction).toBe(
+        mockLegacySpeedUpTransaction,
+      );
+      expect(result.current.updateTransactionToTenPercentIncreasedGasFee).toBe(
+        mockLegacyUpdateTenPercent,
+      );
+      expect(result.current.updateTransactionUsingEstimate).toBe(
+        mockLegacyUpdateUsingEstimate,
+      );
+    });
+
+    it('calls useLegacyCancelSpeedupFlow with effectiveTransaction and gasFeeEstimates', () => {
+      const legacyTransaction = createMockTransaction({
+        txParams: {
+          gas: '0x5208',
+          gasPrice: '0x2540be400',
+        } as TransactionMeta['txParams'],
+      });
+
+      renderHook(() =>
+        useCancelSpeedupGasState(legacyTransaction, EditGasModes.speedUp),
+      );
+
+      expect(mockUseLegacyCancelSpeedupFlow).toHaveBeenCalledWith(
+        expect.objectContaining({
+          transaction: expect.objectContaining({
+            id: legacyTransaction.id,
+          }),
+        }),
+      );
+    });
+  });
 });
diff --git a/ui/pages/confirmations/hooks/useCancelSpeedupGasState.ts b/ui/pages/confirmations/hooks/useCancelSpeedupGasState.ts
index 9d8b1e583bfc..39ab29cb12b3 100644
--- a/ui/pages/confirmations/hooks/useCancelSpeedupGasState.ts
+++ b/ui/pages/confirmations/hooks/useCancelSpeedupGasState.ts
@@ -20,6 +20,7 @@ import {
   hexWEIToDecGWEI,
 } from '../../../../shared/lib/conversion.utils';
 import { useTransactionFunctions } from './useTransactionFunctions';
+import { useLegacyCancelSpeedupFlow } from './useLegacyCancelSpeedupFlow';
 
 export type UseCancelSpeedupGasStateReturn = {
   effectiveTransaction: TransactionMeta;
@@ -39,8 +40,8 @@ export type UseCancelSpeedupGasStateReturn = {
 
 /**
  * Provides effective transaction state and action functions for the cancel/speedup flow.
- * Effective transaction comes from the store (after gas updates) or the prop.
- * Gas updates dispatch to the store so no local retry state is needed.
+ * Routes to the legacy (gasPrice) or EIP-1559 (maxFeePerGas) flow based on
+ * whether the transaction has EIP-1559 gas parameters.
  * @param transaction
  * @param editGasMode
  */
@@ -78,6 +79,9 @@ export function useCancelSpeedupGasState(
 
   const { gasFeeEstimates } = useGasFeeEstimates(networkClientId);
 
+  const isLegacy = !effectiveTransaction?.txParams?.maxFeePerGas;
+
+  // EIP-1559 flow
   const gasLimitNum = Number(
     hexToDecimal(
       effectiveTransaction?.txParams?.gasLimit ??
@@ -91,24 +95,36 @@ export function useCancelSpeedupGasState(
     ? hexWEIToDecGWEI(effectiveTransaction.txParams.maxPriorityFeePerGas)
     : '0';
 
-  const {
-    cancelTransaction,
-    speedUpTransaction,
-    updateTransactionToTenPercentIncreasedGasFee,
-    updateTransactionUsingEstimate,
-  } = useTransactionFunctions({
+  const effectiveGasFeeEstimates =
+    gasFeeEstimates ?? effectiveTransaction.gasFeeEstimates;
+
+  const eip1559Functions = useTransactionFunctions({
     defaultEstimateToUse: GasRecommendations.medium,
     editGasMode,
-    estimatedBaseFee: (gasFeeEstimates as GasFeeEstimates)?.estimatedBaseFee,
-    gasFeeEstimates: gasFeeEstimates ?? undefined,
+    estimatedBaseFee: (effectiveGasFeeEstimates as GasFeeEstimates)
+      ?.estimatedBaseFee,
+    gasFeeEstimates: effectiveGasFeeEstimates,
     gasLimit: gasLimitNum,
     maxPriorityFeePerGas: maxPriorityFeePerGasGwei,
     transaction: effectiveTransaction as TransactionMeta,
   });
 
+  // Legacy flow
+  const legacyFunctions = useLegacyCancelSpeedupFlow({
+    transaction: effectiveTransaction as TransactionMeta,
+    gasFeeEstimates: effectiveGasFeeEstimates,
+  });
+
+  const {
+    cancelTransaction,
+    speedUpTransaction,
+    updateTransactionToTenPercentIncreasedGasFee,
+    updateTransactionUsingEstimate,
+  } = isLegacy ? legacyFunctions : eip1559Functions;
+
   return {
     effectiveTransaction: effectiveTransaction as TransactionMeta,
-    gasFeeEstimates: gasFeeEstimates ?? null,
+    gasFeeEstimates: effectiveGasFeeEstimates ?? null,
     cancelTransaction,
     speedUpTransaction,
     updateTransactionToTenPercentIncreasedGasFee,
diff --git a/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.test.ts b/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.test.ts
index 95035308dfc5..1b95d0f977cc 100644
--- a/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.test.ts
+++ b/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.test.ts
@@ -59,6 +59,50 @@ describe('useCancelSpeedupInitialGas', () => {
     mockDispatch.mockClear();
   });
 
+  describe('isInitialGasReady', () => {
+    it('returns true when effectiveTransaction.previousGas is set', () => {
+      const effectiveTransaction = createMockTransaction({
+        previousGas: {
+          maxFeePerGas: '0x1',
+          maxPriorityFeePerGas: '0x1',
+          gasLimit: '0x5208',
+        },
+      });
+
+      const { result } = renderHook(() =>
+        useCancelSpeedupInitialGas({
+          effectiveTransaction,
+          gasFeeEstimates: {},
+          updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
+          updateTransactionToTenPercentIncreasedGasFee:
+            mockUpdateTransactionToTenPercentIncreasedGasFee,
+          appIsLoading: false,
+          currentModal: CANCEL_SPEEDUP_MODAL,
+        }),
+      );
+
+      expect(result.current.isInitialGasReady).toBe(true);
+    });
+
+    it('returns false when effectiveTransaction.previousGas is not set', () => {
+      const effectiveTransaction = createMockTransaction();
+
+      const { result } = renderHook(() =>
+        useCancelSpeedupInitialGas({
+          effectiveTransaction,
+          gasFeeEstimates: mockGasFeeEstimatesWithMedium,
+          updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
+          updateTransactionToTenPercentIncreasedGasFee:
+            mockUpdateTransactionToTenPercentIncreasedGasFee,
+          appIsLoading: false,
+          currentModal: CANCEL_SPEEDUP_MODAL,
+        }),
+      );
+
+      expect(result.current.isInitialGasReady).toBe(false);
+    });
+  });
+
   describe('when initial gas rule is skipped', () => {
     it('does not call updates when effectiveTransaction.previousGas is set', () => {
       const effectiveTransaction = createMockTransaction({
@@ -281,4 +325,87 @@ describe('useCancelSpeedupInitialGas', () => {
       );
     });
   });
+
+  describe('legacy transactions', () => {
+    function createLegacyTransaction(overrides: Partial<TransactionMeta> = {}) {
+      return {
+        id: 'legacy-tx-1',
+        txParams: {
+          gas: '0x5208',
+          gasLimit: '0x5208',
+          gasPrice: '0x2540be400',
+        },
+        ...overrides,
+      } as TransactionMeta;
+    }
+
+    it('dispatches updatePreviousGasParams with gasPrice and gasLimit for legacy tx', () => {
+      const effectiveTransaction = createLegacyTransaction();
+
+      renderHook(() =>
+        useCancelSpeedupInitialGas({
+          effectiveTransaction,
+          gasFeeEstimates: mockGasFeeEstimatesWithMedium,
+          updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
+          updateTransactionToTenPercentIncreasedGasFee:
+            mockUpdateTransactionToTenPercentIncreasedGasFee,
+          appIsLoading: false,
+          currentModal: CANCEL_SPEEDUP_MODAL,
+        }),
+      );
+
+      expect(mockDispatch).toHaveBeenCalled();
+      expect(mockUpdatePreviousGasParams).toHaveBeenCalledTimes(1);
+      expect(mockUpdatePreviousGasParams).toHaveBeenCalledWith('legacy-tx-1', {
+        gasPrice: '0x2540be400',
+        gasLimit: '0x5208',
+      });
+    });
+
+    it('does not store previousGas again on re-render for the same legacy transaction', () => {
+      const effectiveTransaction = createLegacyTransaction();
+
+      const { rerender } = renderHook(
+        ({ gasFeeEstimates }) =>
+          useCancelSpeedupInitialGas({
+            effectiveTransaction,
+            gasFeeEstimates,
+            updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
+            updateTransactionToTenPercentIncreasedGasFee:
+              mockUpdateTransactionToTenPercentIncreasedGasFee,
+            appIsLoading: false,
+            currentModal: CANCEL_SPEEDUP_MODAL,
+          }),
+        {
+          initialProps: { gasFeeEstimates: mockGasFeeEstimatesWithMedium },
+        },
+      );
+
+      expect(mockUpdatePreviousGasParams).toHaveBeenCalledTimes(1);
+
+      rerender({ gasFeeEstimates: { ...mockGasFeeEstimatesWithMedium } });
+
+      expect(mockUpdatePreviousGasParams).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not dispatch previousGas when legacy tx has no gasPrice', () => {
+      const effectiveTransaction = createLegacyTransaction({
+        txParams: { gas: '0x5208' } as TransactionMeta['txParams'],
+      });
+
+      renderHook(() =>
+        useCancelSpeedupInitialGas({
+          effectiveTransaction,
+          gasFeeEstimates: mockGasFeeEstimatesWithMedium,
+          updateTransactionUsingEstimate: mockUpdateTransactionUsingEstimate,
+          updateTransactionToTenPercentIncreasedGasFee:
+            mockUpdateTransactionToTenPercentIncreasedGasFee,
+          appIsLoading: false,
+          currentModal: CANCEL_SPEEDUP_MODAL,
+        }),
+      );
+
+      expect(mockUpdatePreviousGasParams).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.ts b/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.ts
index 2de80a4114e6..936b14d36ff3 100644
--- a/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.ts
+++ b/ui/pages/confirmations/hooks/useCancelSpeedupInitialGas.ts
@@ -48,7 +48,7 @@ export function useCancelSpeedupInitialGas({
   updateTransactionToTenPercentIncreasedGasFee,
   appIsLoading,
   currentModal,
-}: UseCancelSpeedupInitialGasParams): void {
+}: UseCancelSpeedupInitialGasParams): { isInitialGasReady: boolean } {
   const appliedInitialGasForTransactionIdRef = useRef<string | null>(null);
   const storedPreviousGasForTransactionIdRef = useRef<string | null>(null);
   const dispatch = useDispatch();
@@ -69,18 +69,32 @@ export function useCancelSpeedupInitialGas({
       txParams?.maxPriorityFeePerGas &&
       (txParams?.gasLimit || txParams?.gas);
 
+    const hasLegacyGas =
+      !hasEIP1559Gas &&
+      txParams?.gasPrice &&
+      (txParams?.gasLimit || txParams?.gas);
+
     if (
-      hasEIP1559Gas &&
       storedPreviousGasForTransactionIdRef.current !== effectiveTransaction.id
     ) {
-      dispatch(
-        updatePreviousGasParams(effectiveTransaction.id, {
-          maxFeePerGas: txParams.maxFeePerGas,
-          maxPriorityFeePerGas: txParams.maxPriorityFeePerGas,
-          gasLimit: txParams.gasLimit ?? txParams.gas,
-        }),
-      );
-      storedPreviousGasForTransactionIdRef.current = effectiveTransaction.id;
+      if (hasEIP1559Gas) {
+        dispatch(
+          updatePreviousGasParams(effectiveTransaction.id, {
+            maxFeePerGas: txParams.maxFeePerGas,
+            maxPriorityFeePerGas: txParams.maxPriorityFeePerGas,
+            gasLimit: txParams.gasLimit ?? txParams.gas,
+          }),
+        );
+        storedPreviousGasForTransactionIdRef.current = effectiveTransaction.id;
+      } else if (hasLegacyGas) {
+        dispatch(
+          updatePreviousGasParams(effectiveTransaction.id, {
+            gasPrice: txParams.gasPrice,
+            gasLimit: txParams.gasLimit ?? txParams.gas,
+          }),
+        );
+        storedPreviousGasForTransactionIdRef.current = effectiveTransaction.id;
+      }
     }
 
     if (
@@ -104,6 +118,7 @@ export function useCancelSpeedupInitialGas({
     }
     appliedInitialGasForTransactionIdRef.current = effectiveTransaction.id;
   }, [
+    dispatch,
     effectiveTransaction.id,
     effectiveTransaction.previousGas,
     effectiveTransaction.txParams,
@@ -113,4 +128,8 @@ export function useCancelSpeedupInitialGas({
     updateTransactionUsingEstimate,
     updateTransactionToTenPercentIncreasedGasFee,
   ]);
+
+  return {
+    isInitialGasReady: Boolean(effectiveTransaction.previousGas),
+  };
 }
diff --git a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
index cb906722abf7..dbf5120ecc7d 100644
--- a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.test.ts
@@ -3,43 +3,26 @@ import {
   getMockConfirmState,
 } from '../../../../test/data/confirmations/helper';
 import { renderHookWithConfirmContextProvider } from '../../../../test/lib/confirmations/render-helpers';
-import {
-  getInternalAccountByAddress,
-  getIsMultichainAccountsState2Enabled,
-} from '../../../selectors';
 import useConfirmationRecipientInfo from './useConfirmationRecipientInfo';
 
 const SenderAddress = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 
-jest.mock('../../../selectors', () => {
-  const originalModule = jest.requireActual('../../../selectors');
-  return {
-    ...originalModule,
-    getIsMultichainAccountsState2Enabled: jest.fn(),
-  };
-});
-
 describe('useConfirmationRecipientInfo', () => {
-  describe('when the current confirmation is a signature', () => {
-    it('returns the account name of the from address as the recipient name', () => {
-      const mockState = getMockTypedSignConfirmState();
-      const { result } = renderHookWithConfirmContextProvider(
-        () => useConfirmationRecipientInfo(),
-        mockState,
-      );
+  it('returns the account group name as the sender name', () => {
+    const mockState = getMockTypedSignConfirmState();
 
-      const expectedAccount = getInternalAccountByAddress(
-        mockState,
-        SenderAddress,
-      );
+    const { result } = renderHookWithConfirmContextProvider(
+      () => useConfirmationRecipientInfo(),
+      mockState,
+    );
 
-      expect(result.current.senderAddress).toBe(SenderAddress);
-      expect(result.current.senderName).toBe(expectedAccount?.metadata.name);
-      expect(result.current.walletName).toBe('Wallet 1');
-    });
+    expect(result.current.senderAddress).toBe(SenderAddress);
+    expect(result.current.senderName).toBe('Account 1');
+    expect(result.current.walletName).toBe('Wallet 1');
+    expect(result.current.hasMoreThanOneWallet).toBe(true);
   });
 
-  it('returns empty strings if there if current confirmation is not defined', () => {
+  it('returns empty strings if current confirmation is not defined', () => {
     const { result } = renderHookWithConfirmContextProvider(
       () => useConfirmationRecipientInfo(),
       getMockConfirmState(),
@@ -48,22 +31,4 @@ describe('useConfirmationRecipientInfo', () => {
     expect(result.current.senderAddress).toBe('');
     expect(result.current.senderName).toBe('');
   });
-
-  describe('when isMultichainAccountsState2Enabled is enabled', () => {
-    it('returns the metadata.name as the recipient name from the account group', () => {
-      (getIsMultichainAccountsState2Enabled as jest.Mock).mockReturnValue(true);
-      const mockState = getMockTypedSignConfirmState();
-
-      const { result } = renderHookWithConfirmContextProvider(
-        () => useConfirmationRecipientInfo(),
-        mockState,
-      );
-
-      expect(result.current.senderAddress).toBe(SenderAddress);
-      expect(result.current.senderName).toBe('Account 1'); // Resolved from AccountGroup.metadata.name
-      expect(result.current.walletName).toBe('Wallet 1');
-      expect(result.current.isBIP44).toBe(true);
-      expect(result.current.hasMoreThanOneWallet).toBe(true);
-    });
-  });
 });
diff --git a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
index c5513d6e98d6..ab1cdf2e4c43 100644
--- a/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationRecipientInfo.ts
@@ -1,13 +1,8 @@
 import { useSelector } from 'react-redux';
-import { getIsMultichainAccountsState2Enabled } from '../../../selectors';
 import { getConfirmationSender } from '../components/confirm/utils';
 import { useConfirmContext } from '../context/confirm';
 import { MultichainAccountsState } from '../../../selectors/multichain-accounts/account-tree.types';
-import {
-  selectAccountGroupNameByInternalAccount,
-  selectInternalAccountNameByAddress,
-} from '../selectors/accounts';
-import { RootState } from '../selectors/preferences';
+import { selectAccountGroupNameByInternalAccount } from '../selectors/accounts';
 import {
   getWalletIdAndNameByAccountAddress,
   getWalletsWithAccounts,
@@ -15,9 +10,6 @@ import {
 
 function useConfirmationRecipientInfo() {
   const { currentConfirmation } = useConfirmContext();
-  const isMultichainAccountsState2Enabled = useSelector(
-    getIsMultichainAccountsState2Enabled,
-  );
 
   const { from } = getConfirmationSender(currentConfirmation);
   const senderAddress = from ?? '';
@@ -26,27 +18,18 @@ function useConfirmationRecipientInfo() {
     selectAccountGroupNameByInternalAccount(state, senderAddress),
   );
 
-  const internalAccountName = useSelector((state: RootState) =>
-    selectInternalAccountNameByAddress(state, senderAddress),
-  );
-
-  const walletInfo = useSelector((state: RootState) =>
+  const walletInfo = useSelector((state: MultichainAccountsState) =>
     getWalletIdAndNameByAccountAddress(state, senderAddress),
   );
 
   const walletsWithAccounts = useSelector(getWalletsWithAccounts);
 
-  const senderName = isMultichainAccountsState2Enabled
-    ? accountGroupName
-    : internalAccountName;
-
   const hasMoreThanOneWallet = Object.keys(walletsWithAccounts).length > 1;
 
   return {
     hasMoreThanOneWallet,
-    isBIP44: isMultichainAccountsState2Enabled,
     senderAddress,
-    senderName: senderName ?? '',
+    senderName: accountGroupName ?? '',
     walletName: walletInfo?.name ?? '',
   };
 }
diff --git a/ui/pages/confirmations/hooks/useGasEstimates.js b/ui/pages/confirmations/hooks/useGasEstimates.js
deleted file mode 100644
index 18c74c00500c..000000000000
--- a/ui/pages/confirmations/hooks/useGasEstimates.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import { useSelector } from 'react-redux';
-
-import {
-  EditGasModes,
-  GasEstimateTypes,
-} from '../../../../shared/constants/gas';
-import {
-  getMaximumGasTotalInHexWei,
-  getMinimumGasTotalInHexWei,
-} from '../../../../shared/lib/gas.utils';
-
-import { PRIMARY } from '../../../helpers/constants/common';
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-
-import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
-import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
-import {
-  decGWEIToHexWEI,
-  decimalToHex,
-} from '../../../../shared/lib/conversion.utils';
-
-/**
- * @typedef {object} GasEstimatesReturnType
- * @property {string} [estimatedMinimumNative] - the maximum amount estimated to be paid if the
- *  current network transaction volume increases. Expressed in the network's native currency.
- * @property {HexWeiString} [maximumCostInHexWei] - the maximum amount this transaction will cost.
- * @property {HexWeiString} [minimumCostInHexWei] - the minimum amount this transaction will cost.
- */
-
-/**
- * @param options
- * @param options.editGasMode
- * @param options.gasEstimateType
- * @param options.gasFeeEstimates
- * @param options.gasLimit
- * @param options.gasPrice
- * @param options.maxFeePerGas
- * @param options.maxPriorityFeePerGas
- * @param options.minimumGasLimit
- * @param options.transaction
- * @returns {GasEstimatesReturnType} The gas estimates.
- */
-export function useGasEstimates({
-  editGasMode,
-  gasEstimateType,
-  gasFeeEstimates,
-  gasLimit,
-  gasPrice,
-  maxFeePerGas,
-  maxPriorityFeePerGas,
-  minimumGasLimit,
-  transaction,
-}) {
-  const supportsEIP1559 =
-    useSelector((state) =>
-      checkNetworkAndAccountSupports1559(state, transaction?.networkClientId),
-    ) && !isLegacyTransaction(transaction?.txParams);
-
-  const {
-    currency: primaryCurrency,
-    numberOfDecimals: primaryNumberOfDecimals,
-  } = useUserPreferencedCurrency(PRIMARY);
-
-  // We have two helper methods that take an object that can have either
-  // gasPrice OR the EIP-1559 fields on it, plus gasLimit. This object is
-  // conditionally set to the appropriate fields to compute the minimum
-  // and maximum cost of a transaction given the current estimates or selected
-  // gas fees.
-  let gasSettings = {
-    gasLimit: decimalToHex(gasLimit),
-    gasLimitNoBuffer: transaction?.gasLimitNoBuffer,
-  };
-  if (supportsEIP1559) {
-    gasSettings = {
-      ...gasSettings,
-      maxFeePerGas: decGWEIToHexWEI(maxFeePerGas || gasPrice || '0'),
-      maxPriorityFeePerGas: decGWEIToHexWEI(
-        maxPriorityFeePerGas || maxFeePerGas || gasPrice || '0',
-      ),
-      baseFeePerGas: decGWEIToHexWEI(gasFeeEstimates?.estimatedBaseFee ?? '0'),
-    };
-  } else {
-    gasSettings = {
-      ...gasSettings,
-      gasPrice:
-        gasEstimateType === GasEstimateTypes.none
-          ? '0x0'
-          : decGWEIToHexWEI(gasPrice),
-    };
-  }
-
-  // The maximum amount this transaction will cost
-  const maximumCostInHexWei = getMaximumGasTotalInHexWei(gasSettings);
-
-  if (editGasMode === EditGasModes.swaps) {
-    gasSettings = { ...gasSettings, gasLimit: minimumGasLimit };
-  }
-
-  // The minimum amount this transaction will cost
-  const minimumCostInHexWei = getMinimumGasTotalInHexWei(gasSettings);
-
-  const [estimatedMinimumNative] = useCurrencyDisplay(
-    minimumCostInHexWei,
-    {
-      numberOfDecimals: primaryNumberOfDecimals,
-      currency: primaryCurrency,
-    },
-    transaction?.chainId,
-  );
-
-  return {
-    estimatedMinimumNative,
-    maximumCostInHexWei,
-    minimumCostInHexWei,
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useGasEstimates.test.js b/ui/pages/confirmations/hooks/useGasEstimates.test.js
deleted file mode 100644
index 73155a0f3828..000000000000
--- a/ui/pages/confirmations/hooks/useGasEstimates.test.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import { renderHook } from '@testing-library/react-hooks';
-import {
-  getMaximumGasTotalInHexWei,
-  getMinimumGasTotalInHexWei,
-} from '../../../../shared/lib/gas.utils';
-import {
-  decGWEIToHexWEI,
-  decimalToHex,
-} from '../../../../shared/lib/conversion.utils';
-
-import {
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  configureEIP1559,
-  configureLegacy,
-} from './test-utils';
-import { useGasEstimates } from './useGasEstimates';
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-  };
-});
-
-const useGasEstimatesHook = (props) =>
-  useGasEstimates({
-    transaction: {
-      gasLimitNoBuffer: '0x5208',
-      txParams: { type: '0x2', value: '100' },
-    },
-    gasLimit: '21000',
-    gasPrice: '10',
-    maxPriorityFeePerGas: '10',
-    maxFeePerGas: '100',
-    minimumCostInHexWei: '0x5208',
-    minimumGasLimit: '0x5208',
-    supportsEIP1559: true,
-    ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
-    ...props,
-  });
-
-describe('useGasEstimates', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('EIP-1559 scenario', () => {
-    beforeEach(() => {
-      configureEIP1559();
-    });
-
-    it('uses new EIP-1559 gas fields to calculate minimum values', () => {
-      const gasLimit = '21000';
-      const maxFeePerGas = '100';
-      const maxPriorityFeePerGas = '10';
-      const { estimatedBaseFee } =
-        FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates;
-      const { result } = renderHook(() =>
-        useGasEstimatesHook({ gasLimit, maxFeePerGas, maxPriorityFeePerGas }),
-      );
-      const minimumHexValue = getMinimumGasTotalInHexWei({
-        baseFeePerGas: decGWEIToHexWEI(estimatedBaseFee),
-        gasLimitNoBuffer: decimalToHex(gasLimit),
-        maxFeePerGas: decGWEIToHexWEI(maxFeePerGas),
-        maxPriorityFeePerGas: decGWEIToHexWEI(maxPriorityFeePerGas),
-      });
-
-      expect(result.current.minimumCostInHexWei).toBe(minimumHexValue);
-    });
-
-    it('uses new EIP-1559 gas fields to calculate maximum values', () => {
-      const gasLimit = '21000';
-      const maxFeePerGas = '100';
-      const { result } = renderHook(() =>
-        useGasEstimatesHook({ gasLimit, maxFeePerGas }),
-      );
-      const maximumHexValue = getMaximumGasTotalInHexWei({
-        gasLimit: decimalToHex(gasLimit),
-        maxFeePerGas: decGWEIToHexWEI(maxFeePerGas),
-      });
-      expect(result.current.maximumCostInHexWei).toBe(maximumHexValue);
-    });
-  });
-
-  describe('legacy scenario', () => {
-    beforeEach(() => {
-      configureLegacy();
-    });
-
-    it('uses legacy gas fields to calculate minimum values', () => {
-      const gasLimit = '21000';
-      const gasPrice = '10';
-      const { result } = renderHook(() =>
-        useGasEstimatesHook({
-          gasLimit,
-          gasPrice,
-          supportsEIP1559: false,
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        }),
-      );
-      const minimumHexValue = getMinimumGasTotalInHexWei({
-        gasLimitNoBuffer: decimalToHex(gasLimit),
-        gasPrice: decGWEIToHexWEI(gasPrice),
-      });
-
-      expect(result.current.minimumCostInHexWei).toBe(minimumHexValue);
-    });
-
-    it('uses legacy gas fields to calculate maximum values', () => {
-      const gasLimit = '21000';
-      const gasPrice = '10';
-      const { result } = renderHook(() =>
-        useGasEstimatesHook({
-          gasLimit,
-          gasPrice,
-          supportsEIP1559: false,
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        }),
-      );
-      const maximumHexValue = getMaximumGasTotalInHexWei({
-        gasLimit: decimalToHex(gasLimit),
-        gasPrice: decGWEIToHexWEI(gasPrice),
-      });
-      expect(result.current.maximumCostInHexWei).toBe(maximumHexValue);
-    });
-
-    it('estimatedBaseFee is undefined', () => {
-      const { result } = renderHook(() =>
-        useGasEstimatesHook({ supportsEIP1559: false }),
-      );
-      expect(result.current.estimatedBaseFee).toBeUndefined();
-    });
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useGasFeeErrors.js b/ui/pages/confirmations/hooks/useGasFeeErrors.js
deleted file mode 100644
index 54cf1213a5b7..000000000000
--- a/ui/pages/confirmations/hooks/useGasFeeErrors.js
+++ /dev/null
@@ -1,291 +0,0 @@
-import { useMemo } from 'react';
-import { shallowEqual, useSelector } from 'react-redux';
-import { TransactionType } from '@metamask/transaction-controller';
-import { GasEstimateTypes, GAS_LIMITS } from '../../../../shared/constants/gas';
-import {
-  checkNetworkAndAccountSupports1559,
-  getTargetAccount,
-} from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-import { bnGreaterThan, bnLessThan } from '../../../helpers/utils/util';
-import { GAS_FORM_ERRORS } from '../../../helpers/constants/gas';
-import { Numeric } from '../../../../shared/lib/Numeric';
-import { PENDING_STATUS_HASH } from '../../../helpers/constants/transactions';
-
-const HIGH_FEE_WARNING_MULTIPLIER = 1.5;
-
-const validateGasLimit = (gasLimit, minimumGasLimit) => {
-  const gasLimitTooLow = new Numeric(gasLimit, 10).lessThan(
-    new Numeric(minimumGasLimit || GAS_LIMITS.SIMPLE, 16),
-  );
-
-  if (gasLimitTooLow) {
-    return GAS_FORM_ERRORS.GAS_LIMIT_OUT_OF_BOUNDS;
-  }
-  return undefined;
-};
-
-const validateMaxPriorityFee = (maxPriorityFeePerGas, supportsEIP1559) => {
-  if (!supportsEIP1559) {
-    return undefined;
-  }
-  if (bnLessThan(maxPriorityFeePerGas, 0)) {
-    return GAS_FORM_ERRORS.MAX_PRIORITY_FEE_BELOW_MINIMUM;
-  }
-  return undefined;
-};
-
-const validateMaxFee = (
-  maxFeePerGas,
-  maxPriorityFeeError,
-  maxPriorityFeePerGas,
-  supportsEIP1559,
-) => {
-  if (maxPriorityFeeError || !supportsEIP1559) {
-    return undefined;
-  }
-  if (bnGreaterThan(maxPriorityFeePerGas, maxFeePerGas)) {
-    return GAS_FORM_ERRORS.MAX_FEE_IMBALANCE;
-  }
-  return undefined;
-};
-
-const validateGasPrice = (
-  isFeeMarketGasEstimate,
-  gasPrice,
-  supportsEIP1559,
-  transaction,
-) => {
-  if (supportsEIP1559 && isFeeMarketGasEstimate) {
-    return undefined;
-  }
-  if (
-    (!supportsEIP1559 || transaction?.txParams?.gasPrice) &&
-    bnLessThan(gasPrice || 0, 0)
-  ) {
-    return GAS_FORM_ERRORS.GAS_PRICE_TOO_LOW;
-  }
-  return undefined;
-};
-
-const getMaxPriorityFeeWarning = (
-  gasFeeEstimates,
-  isFeeMarketGasEstimate,
-  isGasEstimatesLoading,
-  maxPriorityFeePerGas,
-  supportsEIP1559,
-) => {
-  if (!supportsEIP1559 || !isFeeMarketGasEstimate || isGasEstimatesLoading) {
-    return undefined;
-  }
-  if (
-    bnLessThan(
-      maxPriorityFeePerGas,
-      gasFeeEstimates?.low?.suggestedMaxPriorityFeePerGas,
-    )
-  ) {
-    return GAS_FORM_ERRORS.MAX_PRIORITY_FEE_TOO_LOW;
-  }
-  if (
-    gasFeeEstimates?.high &&
-    bnGreaterThan(
-      maxPriorityFeePerGas,
-      gasFeeEstimates.high.suggestedMaxPriorityFeePerGas *
-        HIGH_FEE_WARNING_MULTIPLIER,
-    )
-  ) {
-    return GAS_FORM_ERRORS.MAX_PRIORITY_FEE_HIGH_WARNING;
-  }
-  return undefined;
-};
-
-const getMaxFeeWarning = (
-  gasFeeEstimates,
-  isGasEstimatesLoading,
-  isFeeMarketGasEstimate,
-  maxFeeError,
-  maxPriorityFeeError,
-  maxFeePerGas,
-  supportsEIP1559,
-) => {
-  if (
-    maxPriorityFeeError ||
-    maxFeeError ||
-    !isFeeMarketGasEstimate ||
-    !supportsEIP1559 ||
-    isGasEstimatesLoading
-  ) {
-    return undefined;
-  }
-  if (bnLessThan(maxFeePerGas, gasFeeEstimates?.low?.suggestedMaxFeePerGas)) {
-    return GAS_FORM_ERRORS.MAX_FEE_TOO_LOW;
-  }
-  if (
-    gasFeeEstimates?.high &&
-    bnGreaterThan(
-      maxFeePerGas,
-      gasFeeEstimates.high.suggestedMaxFeePerGas * HIGH_FEE_WARNING_MULTIPLIER,
-    )
-  ) {
-    return GAS_FORM_ERRORS.MAX_FEE_HIGH_WARNING;
-  }
-  return undefined;
-};
-
-const hasBalanceError = (minimumCostInHexWei, transaction, ethBalance) => {
-  if (minimumCostInHexWei === undefined || ethBalance === undefined) {
-    return false;
-  }
-  const minimumTxCostInHexWei = new Numeric(minimumCostInHexWei, 16).add(
-    new Numeric(transaction?.txParams?.value || '0x0', 16),
-  );
-  const ethBalanceInHexWei = new Numeric(ethBalance, 16);
-
-  return minimumTxCostInHexWei.greaterThan(ethBalanceInHexWei);
-};
-
-/**
- * @typedef {object} GasFeeErrorsReturnType
- * @property {object} [gasErrors] - combined map of errors and warnings.
- * @property {boolean} [hasGasErrors] - true if there are errors that can block submission.
- * @property {boolean} [balanceError] - true if user balance is less than transaction value.
- * @property {boolean} [hasSimulationError] - true if simulation error exists.
- */
-
-/**
- * @param options
- * @param options.gasEstimateType
- * @param options.gasFeeEstimates
- * @param options.isGasEstimatesLoading
- * @param options.gasLimit
- * @param options.gasPrice
- * @param options.maxPriorityFeePerGas
- * @param options.maxFeePerGas
- * @param options.minimumCostInHexWei
- * @param options.minimumGasLimit
- * @param options.transaction
- * @returns {GasFeeErrorsReturnType}
- */
-export function useGasFeeErrors({
-  gasEstimateType,
-  gasFeeEstimates,
-  isGasEstimatesLoading,
-  gasLimit,
-  gasPrice,
-  maxPriorityFeePerGas,
-  maxFeePerGas,
-  minimumCostInHexWei,
-  minimumGasLimit,
-  transaction,
-}) {
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-
-  const isFeeMarketGasEstimate = gasEstimateType === GasEstimateTypes.feeMarket;
-
-  // Get all errors
-  const gasLimitError = validateGasLimit(gasLimit, minimumGasLimit);
-
-  const maxPriorityFeeError = validateMaxPriorityFee(
-    maxPriorityFeePerGas,
-    supportsEIP1559,
-  );
-
-  const maxFeeError = validateMaxFee(
-    maxFeePerGas,
-    maxPriorityFeeError,
-    maxPriorityFeePerGas,
-    supportsEIP1559,
-  );
-
-  const gasPriceError = validateGasPrice(
-    isFeeMarketGasEstimate,
-    gasPrice,
-    supportsEIP1559,
-    transaction,
-  );
-
-  // Get all warnings
-  const maxPriorityFeeWarning = getMaxPriorityFeeWarning(
-    gasFeeEstimates,
-    isFeeMarketGasEstimate,
-    isGasEstimatesLoading,
-    maxPriorityFeePerGas,
-    supportsEIP1559,
-  );
-
-  const maxFeeWarning = getMaxFeeWarning(
-    gasFeeEstimates,
-    isGasEstimatesLoading,
-    isFeeMarketGasEstimate,
-    maxFeeError,
-    maxPriorityFeeError,
-    maxFeePerGas,
-    supportsEIP1559,
-  );
-
-  // Separating errors from warnings so we can know which value problems
-  // are blocking or simply useful information for the users
-
-  const gasErrors = useMemo(() => {
-    const errors = {};
-    if (gasLimitError) {
-      errors.gasLimit = gasLimitError;
-    }
-    if (maxPriorityFeeError) {
-      errors.maxPriorityFee = maxPriorityFeeError;
-    }
-    if (maxFeeError) {
-      errors.maxFee = maxFeeError;
-    }
-    if (gasPriceError) {
-      errors.gasPrice = gasPriceError;
-    }
-    return errors;
-  }, [gasLimitError, maxPriorityFeeError, maxFeeError, gasPriceError]);
-
-  const gasWarnings = useMemo(() => {
-    const warnings = {};
-    if (maxPriorityFeeWarning) {
-      warnings.maxPriorityFee = maxPriorityFeeWarning;
-    }
-    if (maxFeeWarning) {
-      warnings.maxFee = maxFeeWarning;
-    }
-    return warnings;
-  }, [maxPriorityFeeWarning, maxFeeWarning]);
-
-  // Determine if we have any errors which should block submission
-  const hasGasErrors = Boolean(Object.keys(gasErrors).length);
-
-  // Combine the warnings and errors into one object for easier use within the UI.
-  // This object should have no effect on whether or not the user can submit the form
-  const errorsAndWarnings = useMemo(
-    () => ({
-      ...gasWarnings,
-      ...gasErrors,
-    }),
-    [gasErrors, gasWarnings],
-  );
-
-  const account = useSelector(
-    (state) => getTargetAccount(state, transaction?.txParams?.from),
-    shallowEqual,
-  );
-
-  // Balance check is only relevant for outgoing + pending transactions
-  const balanceError =
-    account !== undefined &&
-    transaction?.type !== TransactionType.incoming &&
-    transaction?.status in PENDING_STATUS_HASH
-      ? hasBalanceError(minimumCostInHexWei, transaction, account.balance)
-      : false;
-
-  return {
-    gasErrors: errorsAndWarnings,
-    hasGasErrors,
-    balanceError,
-    hasSimulationError: Boolean(transaction?.simulationFails),
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useGasFeeErrors.test.js b/ui/pages/confirmations/hooks/useGasFeeErrors.test.js
deleted file mode 100644
index f7c30f26ca3f..000000000000
--- a/ui/pages/confirmations/hooks/useGasFeeErrors.test.js
+++ /dev/null
@@ -1,321 +0,0 @@
-import { renderHook } from '@testing-library/react-hooks';
-
-import {
-  TransactionStatus,
-  TransactionType,
-} from '@metamask/transaction-controller';
-import { GAS_FORM_ERRORS } from '../../../helpers/constants/gas';
-
-import { useGasFeeErrors } from './useGasFeeErrors';
-
-import {
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  configureEIP1559,
-  configureLegacy,
-} from './test-utils';
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-  };
-});
-
-const mockTransaction = {
-  status: TransactionStatus.unapproved,
-  type: TransactionType.simpleSend,
-  txParams: {
-    from: '0x000000000000000000000000000000000000dead',
-    type: '0x2',
-    value: '100',
-  },
-};
-
-const renderUseGasFeeErrorsHook = (props) => {
-  return renderHook(() =>
-    useGasFeeErrors({
-      transaction: mockTransaction,
-      gasLimit: '21000',
-      gasPrice: '10',
-      maxPriorityFeePerGas: '10',
-      maxFeePerGas: '100',
-      minimumCostInHexWei: '0x5208',
-      minimumGasLimit: '0x5208',
-      ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      ...props,
-    }),
-  );
-};
-
-describe('useGasFeeErrors', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('gasLimit validation', () => {
-    beforeEach(() => {
-      configureLegacy();
-    });
-    it('does not returns gasLimitError if gasLimit is not below minimum', () => {
-      const { result } = renderUseGasFeeErrorsHook(
-        LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      );
-      expect(result.current.gasErrors.gasLimit).toBeUndefined();
-      expect(result.current.hasGasErrors).toBe(false);
-    });
-    it('returns gasLimitError if gasLimit is below minimum', () => {
-      const { result } = renderUseGasFeeErrorsHook({
-        gasLimit: '100',
-        ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      });
-      expect(result.current.gasErrors.gasLimit).toBe(
-        GAS_FORM_ERRORS.GAS_LIMIT_OUT_OF_BOUNDS,
-      );
-      expect(result.current.hasGasErrors).toBe(true);
-    });
-  });
-
-  describe('maxPriorityFee validation', () => {
-    describe('EIP1559 compliant estimates', () => {
-      beforeEach(() => {
-        configureEIP1559();
-      });
-      it('does not return maxPriorityFeeError if maxPriorityFee is not 0', () => {
-        const { result } = renderUseGasFeeErrorsHook();
-        expect(result.current.gasErrors.maxPriorityFee).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-      it('does not return maxPriorityFeeError if maxPriorityFee is 0', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxPriorityFeePerGas: '0',
-        });
-        expect(result.current.gasErrors.maxPriorityFee).not.toBe(
-          GAS_FORM_ERRORS.MAX_PRIORITY_FEE_BELOW_MINIMUM,
-        );
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-    describe('Legacy estimates', () => {
-      beforeEach(() => {
-        configureLegacy();
-      });
-      it('does not return maxPriorityFeeError if maxPriorityFee is 0', () => {
-        const { result } = renderUseGasFeeErrorsHook(
-          LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        );
-        expect(result.current.gasErrors.maxPriorityFee).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-  });
-
-  describe('maxFee validation', () => {
-    describe('EIP1559 compliant estimates', () => {
-      beforeEach(() => {
-        configureEIP1559();
-      });
-      it('does not return maxFeeError if maxFee is greater than maxPriorityFee', () => {
-        const { result } = renderUseGasFeeErrorsHook();
-        expect(result.current.gasErrors.maxFee).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-      it('return maxFeeError if maxFee is less than maxPriorityFee', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '1',
-          maxPriorityFeePerGas: '10',
-        });
-        expect(result.current.gasErrors.maxFee).toBe(
-          GAS_FORM_ERRORS.MAX_FEE_IMBALANCE,
-        );
-        expect(result.current.hasGasErrors).toBe(true);
-      });
-      it('does not return MAX_FEE_IMBALANCE error if maxPriorityFeePerGas is 0', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '1',
-          maxPriorityFeePerGas: '0',
-        });
-        expect(result.current.gasErrors.maxFee).not.toBe(
-          GAS_FORM_ERRORS.MAX_FEE_IMBALANCE,
-        );
-      });
-    });
-    describe('Legacy estimates', () => {
-      beforeEach(() => {
-        configureLegacy();
-      });
-      it('does not return maxFeeError if maxFee is less than maxPriorityFee', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '1',
-          maxPriorityFeePerGas: '10',
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        });
-        expect(result.current.gasErrors.maxFee).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-  });
-
-  describe('gasPrice validation', () => {
-    describe('EIP1559 compliant estimates', () => {
-      beforeEach(() => {
-        configureEIP1559();
-      });
-      it('does not return gasPriceError if gasPrice is 0', () => {
-        const { result } = renderUseGasFeeErrorsHook({ gasPrice: '0' });
-        expect(result.current.gasErrors.gasPrice).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-    describe('Legacy estimates', () => {
-      beforeEach(() => {
-        configureLegacy();
-      });
-      it('does not return gasPriceError if gasPrice is 0', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          gasPrice: '0',
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        });
-        expect(result.current.gasErrors.gasPrice).not.toBe(
-          GAS_FORM_ERRORS.GAS_PRICE_TOO_LOW,
-        );
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-      it('does not return gasPriceError if gasPrice is > 0', () => {
-        const { result } = renderUseGasFeeErrorsHook(
-          LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        );
-        expect(result.current.gasErrors.gasPrice).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-  });
-
-  describe('maxPriorityFee gasErrors (derived from warnings)', () => {
-    describe('EIP1559 compliant estimates', () => {
-      beforeEach(() => {
-        configureEIP1559();
-      });
-      it('does not return maxPriorityFeeWarning if maxPriorityFee is > suggestedMaxPriorityFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook();
-        expect(result.current.gasErrors.maxPriorityFee).toBeUndefined();
-      });
-      it('return maxPriorityFeeWarning if maxPriorityFee is < suggestedMaxPriorityFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxPriorityFeePerGas: '1',
-        });
-        expect(result.current.gasErrors.maxPriorityFee).toBe(
-          GAS_FORM_ERRORS.MAX_PRIORITY_FEE_TOO_LOW,
-        );
-      });
-      it('return maxPriorityFeeWarning if maxPriorityFee is > gasFeeEstimates.high.suggestedMaxPriorityFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxPriorityFeePerGas: '100',
-        });
-        expect(result.current.gasErrors.maxPriorityFee).toBe(
-          GAS_FORM_ERRORS.MAX_PRIORITY_FEE_HIGH_WARNING,
-        );
-      });
-    });
-    describe('Legacy estimates', () => {
-      beforeEach(() => {
-        configureLegacy();
-      });
-      it('does not return maxPriorityFee error if maxPriorityFee is < gasFeeEstimates.low.suggestedMaxPriorityFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxPriorityFeePerGas: '1',
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        });
-        expect(result.current.gasErrors.maxPriorityFee).toBeUndefined();
-        expect(result.current.hasGasErrors).toBe(false);
-      });
-    });
-  });
-
-  describe('maxFee gasErrors', () => {
-    describe('EIP1559 compliant estimates', () => {
-      beforeEach(() => {
-        configureEIP1559();
-      });
-      it('does not return maxFeeWarning if maxFee is > suggestedMaxFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook();
-        expect(result.current.gasErrors.maxFee).toBeUndefined();
-      });
-      it('return maxFeeWarning if maxFee is < suggestedMaxFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '20',
-        });
-        expect(result.current.gasErrors.maxFee).toBe(
-          GAS_FORM_ERRORS.MAX_FEE_TOO_LOW,
-        );
-      });
-      it('return maxFeeWarning if gasFeeEstimates are high and maxFee is > suggestedMaxFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '1000',
-        });
-        expect(result.current.gasErrors.maxFee).toBe(
-          GAS_FORM_ERRORS.MAX_FEE_HIGH_WARNING,
-        );
-      });
-    });
-    describe('Legacy estimates', () => {
-      beforeEach(() => {
-        configureLegacy();
-      });
-      it('does not return maxFeeWarning if maxFee is < suggestedMaxFeePerGas', () => {
-        const { result } = renderUseGasFeeErrorsHook({
-          maxFeePerGas: '1',
-          ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-        });
-        expect(result.current.gasErrors.maxFee).toBeUndefined();
-      });
-    });
-  });
-
-  describe('Balance Error', () => {
-    it('is false if balance is greater than transaction value', () => {
-      configureEIP1559();
-      const { result } = renderUseGasFeeErrorsHook();
-      expect(result.current.balanceError).toBe(false);
-    });
-    it('is true if balance is less than transaction value', () => {
-      configureLegacy();
-      const { result } = renderUseGasFeeErrorsHook({
-        transaction: {
-          ...mockTransaction,
-          txParams: {
-            ...mockTransaction.txParams,
-            value: '0x440aa47cc2556',
-          },
-        },
-        ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      });
-      expect(result.current.balanceError).toBe(true);
-    });
-  });
-
-  describe('Simulation Error', () => {
-    it('is false if transaction has falsy values for simulationFails', () => {
-      configureEIP1559();
-      const { result } = renderUseGasFeeErrorsHook();
-      expect(result.current.hasSimulationError).toBe(false);
-    });
-    it('is true if transaction.simulationFails is true', () => {
-      configureEIP1559();
-      const { result } = renderUseGasFeeErrorsHook({
-        transaction: { simulationFails: true },
-      });
-      expect(result.current.hasSimulationError).toBe(true);
-    });
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useGasFeeInputs.js b/ui/pages/confirmations/hooks/useGasFeeInputs.js
deleted file mode 100644
index c10a105f2fc4..000000000000
--- a/ui/pages/confirmations/hooks/useGasFeeInputs.js
+++ /dev/null
@@ -1,340 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import {
-  CUSTOM_GAS_ESTIMATE,
-  GasRecommendations,
-  EditGasModes,
-  PriorityLevels,
-} from '../../../../shared/constants/gas';
-import { GAS_FORM_ERRORS } from '../../../helpers/constants/gas';
-import {
-  checkNetworkAndAccountSupports1559,
-  getAdvancedInlineGasShown,
-  selectNetworkConfigurationByChainId,
-} from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
-
-import { editGasModeIsSpeedUpOrCancel } from '../../../helpers/utils/gas';
-import { hexToDecimal } from '../../../../shared/lib/conversion.utils';
-import { useGasFeeErrors } from './useGasFeeErrors';
-import { useGasPriceInput } from './useGasPriceInput';
-import { useMaxFeePerGasInput } from './useMaxFeePerGasInput';
-import { useMaxPriorityFeePerGasInput } from './useMaxPriorityFeePerGasInput';
-import { useGasEstimates } from './useGasEstimates';
-import { useTransactionFunctions } from './useTransactionFunctions';
-
-/**
- * In EIP_1559_V2 implementation as used by useGasfeeInputContext() the use of this hook is evolved.
- * It is no longer used to keep transient state of advance gas fee inputs.
- * Transient state of inputs is maintained locally in /ui/components/app/advance-gas-fee-popover component.
- *
- * This hook is used now as source of shared data about transaction, it shares details of gas fee in transaction,
- * estimate used, is EIP-1559 supported and other details. It also  have methods to update transaction.
- *
- * Transaction is used as single source of truth and as transaction is updated the fields shared by hook are
- * also updated using useEffect hook.
- *
- * It will be useful to plan a task to create a new hook of this shared information from this hook.
- * Methods like setEstimateToUse, onManualChange are deprecated in context of EIP_1559_V2 implementation.
- */
-
-/**
- * @typedef {object} GasFeeInputReturnType
- * @property {object} [transaction] - .
- * @property {DecGweiString} [maxFeePerGas] - the maxFeePerGas input value.
- * @property {DecGweiString} [maxPriorityFeePerGas] - the maxPriorityFeePerGas
- *  input value.
- * @property {DecGweiString} [gasPrice] - the gasPrice input value.
- * @property {(DecGweiString) => void} setGasPrice - state setter method to
- *  update the gasPrice.
- * @property {DecGweiString} gasLimit - the gasLimit input value.
- * @property {(DecGweiString) => void} setGasLimit - state setter method to
- *  update the gasLimit.
- * @property {DecGweiString} [properGasLimit] - proper gas limit.
- * @property {string} [editGasMode] - one of CANCEL, SPEED-UP, MODIFY_IN_PLACE, SWAPS.
- * @property {EstimateLevel} [estimateToUse] - the estimate level currently
- *  selected. This will be null if the user has ejected from using the estimates.
- * @property {boolean} [isGasEstimatesLoading] - true if gas estimate is loading.
- * @property {DecGweiString} [maximumCostInHexWei] - maximum cost of transaction in HexWei.
- * @property {DecGweiString} [minimumCostInHexWei] - minimum cost of transaction in HexWei.
- * @property {string} [estimateUsed] - estimate used in the transaction.
- * @property {boolean} [isNetworkBusy] - true if network is busy.
- * @property {() => void} [onManualChange] - function to call when transaction is manually changed.
- * @property {boolean} [balanceError] - true if user balance is less than transaction value.
- * @property {object} [gasErrors] - object of gas errors.
- * @property {boolean} [hasGasErrors] - true if there are gas errors.
- * @property {boolean} [hasSimulationError] - true if simulation error exists.
- * @property {number} [minimumGasLimitDec] - minimum gas limit in decimals.
- * @property {boolean} [supportsEIP1559] - true if EIP1559 is cupported.
- * @property {() => void} cancelTransaction - cancel the transaction.
- * @property {() => void} speedUpTransaction - speed up the transaction.
- * @property {(string, number, number, number, string) => void} updateTransaction - update the transaction.
- * @property {(boolean) => void} updateTransactionToTenPercentIncreasedGasFee - update the cancel / speed transaction to
- * gas fee which is equal to current gas fee +10 percent.
- * @property {(string) => void} updateTransactionUsingDAPPSuggestedValues - update the transaction to DAPP suggested gas value.
- * @property {(string) => void} updateTransactionUsingEstimate - update the transaction using the estimate passed.
- */
-
-/**
- * Uses gasFeeEstimates and state to keep track of user gas fee inputs.
- * Will update the gas fee state when estimates update if the user has not yet
- * modified the fields.
- *
- * @param {GasRecommendations} [defaultEstimateToUse] - which estimate
- *  level to default the 'estimateToUse' state variable to.
- * @param {object} [_transaction]
- * @param {string} [minimumGasLimit]
- * @param {EditGasModes[keyof EditGasModes]} editGasMode
- * @returns {GasFeeInputReturnType & import(
- *  '../../../hooks/useGasFeeEstimates'
- * ).GasEstimates} gas fee input state and the GasFeeEstimates object
- */
-
-export function useGasFeeInputs(
-  defaultEstimateToUse = GasRecommendations.medium,
-  _transaction,
-  minimumGasLimit = '0x5208',
-  editGasMode = EditGasModes.modifyInPlace,
-) {
-  const initialRetryTxMeta = {
-    txParams: _transaction?.txParams,
-    id: _transaction?.id,
-    userFeeLevel: _transaction?.userFeeLevel,
-    originalGasEstimate: _transaction?.originalGasEstimate,
-    userEditedGasLimit: _transaction?.userEditedGasLimit,
-    chainId: _transaction?.chainId,
-  };
-
-  if (_transaction?.previousGas) {
-    initialRetryTxMeta.previousGas = _transaction?.previousGas;
-  }
-
-  const [retryTxMeta, setRetryTxMeta] = useState(initialRetryTxMeta);
-
-  const transaction = editGasModeIsSpeedUpOrCancel(editGasMode)
-    ? retryTxMeta
-    : _transaction;
-
-  const network = useSelector((state) =>
-    selectNetworkConfigurationByChainId(state, transaction?.chainId),
-  );
-
-  const networkClientId =
-    network?.rpcEndpoints?.[network?.defaultRpcEndpointIndex]?.networkClientId;
-
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-
-  // We need the gas estimates from the GasFeeController in the background.
-  // Calling this hooks initiates polling for new gas estimates and returns the
-  // current estimate.
-  const {
-    gasEstimateType,
-    gasFeeEstimates,
-    isGasEstimatesLoading,
-    isNetworkBusy,
-  } = useGasFeeEstimates(networkClientId);
-
-  const userPrefersAdvancedGas = useSelector(getAdvancedInlineGasShown);
-
-  const [estimateToUse, setInternalEstimateToUse] = useState(() => {
-    if (
-      userPrefersAdvancedGas &&
-      transaction?.txParams?.maxPriorityFeePerGas &&
-      transaction?.txParams?.maxFeePerGas
-    ) {
-      return null;
-    }
-    if (transaction) {
-      return transaction?.userFeeLevel || null;
-    }
-    return defaultEstimateToUse;
-  });
-
-  const [estimateUsed, setEstimateUsed] = useState(() => {
-    if (estimateToUse) {
-      return estimateToUse;
-    }
-    return PriorityLevels.custom;
-  });
-
-  const [gasLimit, setGasLimit] = useState(() =>
-    Number(
-      hexToDecimal(
-        transaction?.txParams?.gasLimit ?? transaction?.txParams?.gas ?? '0x0',
-      ),
-    ),
-  );
-
-  const properGasLimit = Number(hexToDecimal(transaction?.originalGasEstimate));
-
-  /**
-   * In EIP-1559 V2 designs change to gas estimate is always updated to transaction
-   * Thus callback setEstimateToUse can be deprecate in favor of this useEffect
-   * so that transaction is source of truth whenever possible.
-   */
-  useEffect(() => {
-    if (supportsEIP1559) {
-      if (transaction?.userFeeLevel) {
-        setInternalEstimateToUse(transaction?.userFeeLevel);
-        setEstimateUsed(transaction?.userFeeLevel);
-      }
-
-      setGasLimit(
-        Number(
-          hexToDecimal(
-            transaction?.txParams?.gasLimit ??
-              transaction?.txParams?.gas ??
-              '0x0',
-          ),
-        ),
-      );
-    }
-  }, [
-    setEstimateUsed,
-    setGasLimit,
-    setInternalEstimateToUse,
-    supportsEIP1559,
-    transaction,
-  ]);
-
-  const { gasPrice, setGasPrice, setGasPriceHasBeenManuallySet } =
-    useGasPriceInput({
-      estimateToUse,
-      gasEstimateType,
-      gasFeeEstimates,
-      transaction,
-    });
-
-  const { maxFeePerGas, setMaxFeePerGas } = useMaxFeePerGasInput({
-    estimateToUse,
-    gasEstimateType,
-    gasFeeEstimates,
-    transaction,
-  });
-
-  const { maxPriorityFeePerGas, setMaxPriorityFeePerGas } =
-    useMaxPriorityFeePerGasInput({
-      estimateToUse,
-      gasEstimateType,
-      gasFeeEstimates,
-      transaction,
-    });
-
-  const { estimatedMinimumNative, maximumCostInHexWei, minimumCostInHexWei } =
-    useGasEstimates({
-      editGasMode,
-      gasEstimateType,
-      gasFeeEstimates,
-      gasLimit,
-      gasPrice,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      minimumGasLimit,
-      transaction,
-    });
-
-  const { balanceError, gasErrors, hasGasErrors, hasSimulationError } =
-    useGasFeeErrors({
-      gasEstimateType,
-      gasFeeEstimates,
-      isGasEstimatesLoading,
-      gasLimit,
-      gasPrice,
-      maxPriorityFeePerGas,
-      maxFeePerGas,
-      minimumCostInHexWei,
-      minimumGasLimit,
-      transaction,
-    });
-
-  const handleGasLimitOutOfBoundError = useCallback(() => {
-    if (gasErrors.gasLimit === GAS_FORM_ERRORS.GAS_LIMIT_OUT_OF_BOUNDS) {
-      const transactionGasLimitDec = hexToDecimal(transaction?.txParams?.gas);
-      const minimumGasLimitDec = hexToDecimal(minimumGasLimit);
-      setGasLimit(
-        transactionGasLimitDec > minimumGasLimitDec
-          ? transactionGasLimitDec
-          : minimumGasLimitDec,
-      );
-    }
-  }, [minimumGasLimit, gasErrors.gasLimit, transaction]);
-
-  const {
-    cancelTransaction,
-    speedUpTransaction,
-    updateTransaction,
-    updateTransactionToTenPercentIncreasedGasFee,
-    updateTransactionUsingDAPPSuggestedValues,
-    updateTransactionUsingEstimate,
-  } = useTransactionFunctions({
-    defaultEstimateToUse,
-    editGasMode,
-    gasFeeEstimates,
-    gasLimit,
-    maxPriorityFeePerGas,
-    minimumGasLimit,
-    transaction,
-    setRetryTxMeta,
-  });
-
-  const onManualChange = useCallback(() => {
-    setInternalEstimateToUse(CUSTOM_GAS_ESTIMATE);
-    handleGasLimitOutOfBoundError();
-    // Restore existing values
-    setGasPrice(gasPrice);
-    setGasLimit(gasLimit);
-    setMaxFeePerGas(maxFeePerGas);
-    setMaxPriorityFeePerGas(maxPriorityFeePerGas);
-    setGasPriceHasBeenManuallySet(true);
-    setEstimateUsed('custom');
-  }, [
-    setInternalEstimateToUse,
-    handleGasLimitOutOfBoundError,
-    setGasPrice,
-    gasPrice,
-    setGasLimit,
-    gasLimit,
-    setMaxFeePerGas,
-    maxFeePerGas,
-    setMaxPriorityFeePerGas,
-    maxPriorityFeePerGas,
-    setGasPriceHasBeenManuallySet,
-  ]);
-
-  return {
-    transaction,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    gasPrice,
-    setGasPrice,
-    gasLimit,
-    setGasLimit,
-    properGasLimit,
-    editGasMode,
-    estimateToUse,
-    estimatedMinimumNative,
-    maximumCostInHexWei,
-    minimumCostInHexWei,
-    estimateUsed,
-    gasFeeEstimates,
-    isNetworkBusy,
-    onManualChange,
-    // error and warnings
-    balanceError,
-    gasErrors,
-    hasGasErrors,
-    hasSimulationError,
-    minimumGasLimitDec: hexToDecimal(minimumGasLimit),
-    supportsEIP1559,
-    cancelTransaction,
-    speedUpTransaction,
-    updateTransaction,
-    updateTransactionToTenPercentIncreasedGasFee,
-    updateTransactionUsingDAPPSuggestedValues,
-    updateTransactionUsingEstimate,
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useGasFeeInputs.test.js b/ui/pages/confirmations/hooks/useGasFeeInputs.test.js
deleted file mode 100644
index 46a11707245f..000000000000
--- a/ui/pages/confirmations/hooks/useGasFeeInputs.test.js
+++ /dev/null
@@ -1,213 +0,0 @@
-import { act, renderHook } from '@testing-library/react-hooks';
-import { useSelector } from 'react-redux';
-import {
-  TransactionEnvelopeType,
-  TransactionStatus,
-  TransactionType,
-} from '@metamask/transaction-controller';
-import {
-  GasRecommendations,
-  EditGasModes,
-} from '../../../../shared/constants/gas';
-
-import { ETH, PRIMARY } from '../../../helpers/constants/common';
-
-import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
-import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
-import { useGasFeeInputs } from './useGasFeeInputs';
-
-import {
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  HIGH_FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  configureEIP1559,
-  configureLegacy,
-  generateUseSelectorRouter,
-} from './test-utils';
-
-jest.mock('../../../hooks/useUserPreferencedCurrency', () => ({
-  useUserPreferencedCurrency: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-    useDispatch: () => jest.fn(),
-  };
-});
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-const mockTransaction = {
-  status: TransactionStatus.unapproved,
-  type: TransactionType.simpleSend,
-  networkClientId: '2',
-  txParams: {
-    from: '0x000000000000000000000000000000000000dead',
-    type: '0x2',
-    value: '100',
-  },
-};
-
-describe('useGasFeeInputs', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    useUserPreferencedCurrency.mockImplementation((type) => {
-      if (type === PRIMARY) {
-        return { currency: ETH, numberOfDecimals: 6 };
-      }
-      return { currency: 'USD', numberOfDecimals: 2 };
-    });
-  });
-
-  describe('when using gasPrice API for estimation', () => {
-    beforeEach(() => {
-      configureLegacy();
-    });
-    it('passes through the raw estimate values from useGasFeeEstimates', () => {
-      const { result } = renderHook(() => useGasFeeInputs());
-      expect(result.current.gasFeeEstimates).toMatchObject(
-        LEGACY_GAS_ESTIMATE_RETURN_VALUE.gasFeeEstimates,
-      );
-    });
-
-    it('returns gasPrice appropriately, and "0" for EIP1559 fields', () => {
-      const { result } = renderHook(() => useGasFeeInputs());
-      expect(result.current.gasPrice).toBe(
-        LEGACY_GAS_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium,
-      );
-      expect(result.current.maxFeePerGas).toBe('0');
-      expect(result.current.maxPriorityFeePerGas).toBe('0');
-    });
-
-    it('updates values when user modifies gasPrice', () => {
-      useSelector.mockImplementation(
-        generateUseSelectorRouter({
-          checkNetworkAndAccountSupports1559Response: false,
-        }),
-      );
-
-      const { result } = renderHook(() => useGasFeeInputs());
-      expect(result.current.gasPrice).toBe(
-        LEGACY_GAS_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium,
-      );
-      act(() => {
-        result.current.setGasPrice('30');
-      });
-      expect(result.current.gasPrice).toBe('30');
-    });
-  });
-
-  describe('when transaction is type-0', () => {
-    beforeEach(() => {
-      configureEIP1559();
-    });
-
-    it('returns gasPrice appropriately, and "0" for EIP1559 fields', () => {
-      const { result } = renderHook(() =>
-        useGasFeeInputs(GasRecommendations.medium, {
-          txParams: {
-            value: '3782DACE9D90000',
-            gasLimit: '0x5028',
-            gasPrice: '0x5028',
-            type: TransactionEnvelopeType.legacy,
-          },
-        }),
-      );
-      expect(result.current.gasPrice).toBe(0.00002052);
-      expect(result.current.maxFeePerGas).toBe('0');
-      expect(result.current.maxPriorityFeePerGas).toBe('0');
-      expect(result.current.hasBlockingGasErrors).toBeUndefined();
-    });
-  });
-
-  describe('when using EIP 1559 API for estimation', () => {
-    beforeEach(() => {
-      configureEIP1559();
-    });
-    it('passes through the raw estimate values from useGasFeeEstimates', () => {
-      const { result } = renderHook(() => useGasFeeInputs());
-      expect(result.current.gasFeeEstimates).toMatchObject(
-        FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates,
-      );
-    });
-
-    it('returns EIP-1559 fields appropriately, and "0" for gasPrice fields', () => {
-      const { result } = renderHook(() => useGasFeeInputs());
-      expect(result.current.gasPrice).toBe('0');
-      expect(result.current.maxFeePerGas).toBe(
-        FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium
-          .suggestedMaxFeePerGas,
-      );
-      expect(result.current.maxPriorityFeePerGas).toBe(
-        FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium
-          .suggestedMaxPriorityFeePerGas,
-      );
-    });
-  });
-
-  describe('when balance is sufficient for minimum transaction cost', () => {
-    beforeEach(() => {
-      configureEIP1559();
-    });
-
-    it('should return false', () => {
-      const { result } = renderHook(() =>
-        useGasFeeInputs(undefined, mockTransaction),
-      );
-      expect(result.current.balanceError).toBe(false);
-    });
-  });
-
-  describe('when balance is insufficient for minimum transaction cost', () => {
-    beforeEach(() => {
-      configureEIP1559();
-      useGasFeeEstimates.mockImplementation(
-        () => HIGH_FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      );
-    });
-
-    it('should return true', () => {
-      const { result } = renderHook(() =>
-        useGasFeeInputs(null, {
-          ...mockTransaction,
-          userFeeLevel: GasRecommendations.medium,
-          txParams: {
-            ...mockTransaction.txParams,
-            gas: '0x5208',
-          },
-          gasLimitNoBuffer: '0x5208',
-        }),
-      );
-      expect(result.current.balanceError).toBe(true);
-    });
-
-    it('should call useGasFeeEstimates with correct networkClientId', () => {
-      renderHook(() => useGasFeeInputs(null, mockTransaction));
-      expect(useGasFeeEstimates).not.toHaveBeenCalledWith('2');
-    });
-  });
-
-  describe('editGasMode', () => {
-    beforeEach(() => {
-      useGasFeeEstimates.mockImplementation(
-        () => HIGH_FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      );
-    });
-    it('should return editGasMode passed', () => {
-      const { result } = renderHook(() =>
-        useGasFeeInputs(undefined, undefined, undefined, EditGasModes.swaps),
-      );
-      expect(result.current.editGasMode).toBe(EditGasModes.swaps);
-    });
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useGasPriceInput.js b/ui/pages/confirmations/hooks/useGasPriceInput.js
deleted file mode 100644
index 88deef1059ac..000000000000
--- a/ui/pages/confirmations/hooks/useGasPriceInput.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useState } from 'react';
-import { isEqual } from 'lodash';
-
-import {
-  GasEstimateTypes,
-  CUSTOM_GAS_ESTIMATE,
-} from '../../../../shared/constants/gas';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-
-import { hexWEIToDecGWEI } from '../../../../shared/lib/conversion.utils';
-import { feeParamsAreCustom } from './utils';
-
-function getGasPriceEstimate(gasFeeEstimates, gasEstimateType, estimateToUse) {
-  if (gasEstimateType === GasEstimateTypes.legacy) {
-    return gasFeeEstimates?.[estimateToUse] ?? '0';
-  } else if (gasEstimateType === GasEstimateTypes.ethGasPrice) {
-    return gasFeeEstimates?.gasPrice ?? '0';
-  }
-  return '0';
-}
-
-/**
- * @typedef {object} GasPriceInputsReturnType
- * @property {DecGweiString} [gasPrice] - the gasPrice input value.
- * @property {(DecGweiString) => void} setGasPrice - state setter method to update the gasPrice.
- * @property {(boolean) => true} setGasPriceHasBeenManuallySet - state setter method to update gasPriceHasBeenManuallySet
- * field gasPriceHasBeenManuallySet is used in gasPrice calculations.
- */
-
-/**
- * @param options
- * @param options.estimateToUse
- * @param options.gasEstimateType
- * @param options.gasFeeEstimates
- * @param options.transaction
- * @returns {GasPriceInputsReturnType}
- */
-export function useGasPriceInput({
-  estimateToUse,
-  gasEstimateType,
-  gasFeeEstimates,
-  transaction,
-}) {
-  const [gasPriceHasBeenManuallySet, setGasPriceHasBeenManuallySet] = useState(
-    transaction?.userFeeLevel === CUSTOM_GAS_ESTIMATE,
-  );
-
-  const [gasPrice, setGasPrice] = useState(() => {
-    const { gasPrice: txGasPrice } = transaction?.txParams || {};
-    return txGasPrice && feeParamsAreCustom(transaction)
-      ? Number(hexWEIToDecGWEI(txGasPrice))
-      : null;
-  });
-
-  const [initialGasPriceEstimates] = useState(gasFeeEstimates);
-  const gasPriceEstimatesHaveNotChanged = isEqual(
-    initialGasPriceEstimates,
-    gasFeeEstimates,
-  );
-
-  const gasPriceToUse =
-    gasPrice !== null &&
-    (gasPriceHasBeenManuallySet ||
-      gasPriceEstimatesHaveNotChanged ||
-      isLegacyTransaction(transaction?.txParams))
-      ? gasPrice
-      : getGasPriceEstimate(gasFeeEstimates, gasEstimateType, estimateToUse);
-
-  return {
-    gasPrice: gasPriceToUse,
-    setGasPrice,
-    setGasPriceHasBeenManuallySet,
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useGasPriceInput.test.js b/ui/pages/confirmations/hooks/useGasPriceInput.test.js
deleted file mode 100644
index 40c72fb3a453..000000000000
--- a/ui/pages/confirmations/hooks/useGasPriceInput.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import { act, renderHook } from '@testing-library/react-hooks';
-
-import {
-  GasRecommendations,
-  CUSTOM_GAS_ESTIMATE,
-} from '../../../../shared/constants/gas';
-import {
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  configure,
-} from './test-utils';
-import { useGasPriceInput } from './useGasPriceInput';
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-  };
-});
-
-describe('useGasPriceInput', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    configure();
-  });
-
-  it('returns gasPrice values from transaction if transaction.userFeeLevel is custom', () => {
-    const { result } = renderHook(() =>
-      useGasPriceInput({
-        transaction: {
-          userFeeLevel: CUSTOM_GAS_ESTIMATE,
-          txParams: { gasPrice: '0x5028' },
-        },
-      }),
-    );
-    expect(result.current.gasPrice).toBe(0.00002052);
-  });
-
-  it('does not return gasPrice values from transaction if transaction.userFeeLevel is not custom', () => {
-    configure();
-    const { result } = renderHook(() =>
-      useGasPriceInput({
-        estimateToUse: GasRecommendations.high,
-        transaction: {
-          userFeeLevel: GasRecommendations.high,
-          txParams: { gasPrice: '0x5028' },
-        },
-        ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      }),
-    );
-    expect(result.current.gasPrice).toBe('30');
-  });
-
-  it('if no gasPrice is provided returns default estimate for legacy transaction', () => {
-    const { result } = renderHook(() =>
-      useGasPriceInput({
-        estimateToUse: GasRecommendations.medium,
-        ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      }),
-    );
-    expect(result.current.gasPrice).toBe('20');
-  });
-
-  it('for legacy transaction if estimateToUse is high and no gasPrice is provided returns high estimate value', () => {
-    const { result } = renderHook(() =>
-      useGasPriceInput({
-        estimateToUse: GasRecommendations.high,
-        ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-      }),
-    );
-    expect(result.current.gasPrice).toBe('30');
-  });
-
-  it('returns 0 if gasPrice is not present in transaction and estimates are also not legacy', () => {
-    const { result } = renderHook(() =>
-      useGasPriceInput({
-        estimateToUse: GasRecommendations.medium,
-        ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      }),
-    );
-    expect(result.current.gasPrice).toBe('0');
-  });
-
-  it('returns gasPrice set by user if gasPriceHasBeenManuallySet is true', () => {
-    const { result } = renderHook(() =>
-      useGasPriceInput({ estimateToUse: GasRecommendations.medium }),
-    );
-    act(() => {
-      result.current.setGasPriceHasBeenManuallySet(true);
-      result.current.setGasPrice(100);
-    });
-    expect(result.current.gasPrice).toBe(100);
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useIsBIP44.test.ts b/ui/pages/confirmations/hooks/useIsBIP44.test.ts
deleted file mode 100644
index da2f19ca0e3c..000000000000
--- a/ui/pages/confirmations/hooks/useIsBIP44.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useSelector } from 'react-redux';
-import { getIsMultichainAccountsState2Enabled } from '../../../selectors';
-import { useIsBIP44 } from './useIsBIP44';
-
-jest.mock('react-redux', () => ({
-  useSelector: jest.fn(),
-}));
-
-jest.mock('../../../selectors', () => ({
-  getIsMultichainAccountsState2Enabled: jest.fn(),
-}));
-
-const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
-const mockGetIsMultichainAccountsState2Enabled =
-  getIsMultichainAccountsState2Enabled as jest.MockedFunction<
-    typeof getIsMultichainAccountsState2Enabled
-  >;
-
-describe('useIsBIP44', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns true when multichain accounts state2 is enabled', () => {
-    mockUseSelector.mockReturnValue(true);
-
-    const result = useIsBIP44();
-
-    expect(result).toBe(true);
-    expect(mockUseSelector).toHaveBeenCalledWith(
-      mockGetIsMultichainAccountsState2Enabled,
-    );
-  });
-
-  it('returns false when multichain accounts state2 is disabled', () => {
-    mockUseSelector.mockReturnValue(false);
-
-    const result = useIsBIP44();
-
-    expect(result).toBe(false);
-    expect(mockUseSelector).toHaveBeenCalledWith(
-      mockGetIsMultichainAccountsState2Enabled,
-    );
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useIsBIP44.ts b/ui/pages/confirmations/hooks/useIsBIP44.ts
deleted file mode 100644
index fa0e018af766..000000000000
--- a/ui/pages/confirmations/hooks/useIsBIP44.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useSelector } from 'react-redux';
-import { getIsMultichainAccountsState2Enabled } from '../../../selectors';
-
-export const useIsBIP44 = () => {
-  return useSelector(getIsMultichainAccountsState2Enabled);
-};
diff --git a/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.test.ts b/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.test.ts
new file mode 100644
index 000000000000..ea0be7101dac
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.test.ts
@@ -0,0 +1,343 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import {
+  TransactionMeta,
+  CANCEL_RATE,
+  SPEED_UP_RATE,
+} from '@metamask/transaction-controller';
+import { PriorityLevels } from '../../../../shared/constants/gas';
+import { useLegacyCancelSpeedupFlow } from './useLegacyCancelSpeedupFlow';
+
+type MockCallArgs = Record<string, string>;
+
+const mockDispatch = jest.fn((action) => action);
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: () => mockDispatch,
+}));
+
+const mockCreateCancelTransaction = jest.fn<
+  { type: string },
+  [string, MockCallArgs]
+>(() => ({ type: 'CANCEL_TX' }));
+const mockCreateSpeedUpTransaction = jest.fn<
+  { type: string },
+  [string, MockCallArgs]
+>(() => ({ type: 'SPEEDUP_TX' }));
+const mockUpdateTransactionGasFees = jest.fn<
+  { type: string },
+  [string, MockCallArgs]
+>(() => ({ type: 'UPDATE_GAS_FEES' }));
+
+jest.mock('../../../store/actions', () => ({
+  createCancelTransaction: (txId: string, customGasSettings: MockCallArgs) =>
+    mockCreateCancelTransaction(txId, customGasSettings),
+  createSpeedUpTransaction: (txId: string, customGasSettings: MockCallArgs) =>
+    mockCreateSpeedUpTransaction(txId, customGasSettings),
+  updateTransactionGasFees: (txId: string, txGasFees: MockCallArgs) =>
+    mockUpdateTransactionGasFees(txId, txGasFees),
+}));
+
+function createLegacyTx(
+  overrides: Partial<TransactionMeta> = {},
+): TransactionMeta {
+  return {
+    id: 'legacy-tx-1',
+    chainId: '0x1',
+    txParams: {
+      gas: '0x5208',
+      gasPrice: '0x2540be400',
+    },
+    ...overrides,
+  } as TransactionMeta;
+}
+
+describe('useLegacyCancelSpeedupFlow', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('cancelTransaction', () => {
+    it('dispatches createCancelTransaction with current gasPrice when no previousGas', () => {
+      const tx = createLegacyTx();
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.cancelTransaction();
+      });
+
+      expect(mockCreateCancelTransaction).toHaveBeenCalledWith('legacy-tx-1', {
+        gasPrice: '0x2540be400',
+        gas: '0x5208',
+      });
+      expect(mockDispatch).toHaveBeenCalled();
+    });
+
+    it('uses higher of current or previousGas × CANCEL_RATE', () => {
+      const tx = createLegacyTx({
+        txParams: {
+          gas: '0x5208',
+          gasPrice: '0x1',
+        } as TransactionMeta['txParams'],
+        previousGas: {
+          gasPrice: '0x2540be400',
+          gasLimit: '0x5208',
+        } as unknown as TransactionMeta['previousGas'],
+      });
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.cancelTransaction();
+      });
+
+      const callArgs = mockCreateCancelTransaction.mock.calls[0];
+      const gasPrice = Number(callArgs[1].gasPrice);
+      const minExpected = Number('0x2540be400') * CANCEL_RATE;
+      expect(gasPrice).toBeGreaterThanOrEqual(minExpected);
+    });
+  });
+
+  describe('speedUpTransaction', () => {
+    it('dispatches createSpeedUpTransaction with current gasPrice when no previousGas', () => {
+      const tx = createLegacyTx();
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.speedUpTransaction();
+      });
+
+      expect(mockCreateSpeedUpTransaction).toHaveBeenCalledWith('legacy-tx-1', {
+        gasPrice: '0x2540be400',
+        gas: '0x5208',
+      });
+    });
+
+    it('uses higher of current or previousGas × SPEED_UP_RATE', () => {
+      const tx = createLegacyTx({
+        txParams: {
+          gas: '0x5208',
+          gasPrice: '0x1',
+        } as TransactionMeta['txParams'],
+        previousGas: {
+          gasPrice: '0x2540be400',
+          gasLimit: '0x5208',
+        } as unknown as TransactionMeta['previousGas'],
+      });
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.speedUpTransaction();
+      });
+
+      const callArgs = mockCreateSpeedUpTransaction.mock.calls[0];
+      const gasPrice = Number(callArgs[1].gasPrice);
+      const minExpected = Number('0x2540be400') * SPEED_UP_RATE;
+      expect(gasPrice).toBeGreaterThanOrEqual(minExpected);
+    });
+
+    it('uses gasLimit from txParams when gas is not present', () => {
+      const tx = createLegacyTx({
+        txParams: {
+          gasLimit: '0xABCD',
+          gasPrice: '0x5',
+        } as TransactionMeta['txParams'],
+      });
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.speedUpTransaction();
+      });
+
+      expect(mockCreateSpeedUpTransaction.mock.calls[0][1].gas).toBe('0xABCD');
+    });
+  });
+
+  describe('updateTransactionToTenPercentIncreasedGasFee', () => {
+    it('dispatches updateTransactionGasFees with bumped gasPrice from txParams', () => {
+      const tx = createLegacyTx();
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.updateTransactionToTenPercentIncreasedGasFee();
+      });
+
+      expect(mockUpdateTransactionGasFees).toHaveBeenCalledWith(
+        'legacy-tx-1',
+        expect.objectContaining({
+          userFeeLevel: PriorityLevels.tenPercentIncreased,
+        }),
+      );
+      const callArgs = mockUpdateTransactionGasFees.mock.calls[0][1];
+      const bumpedPrice = Number(callArgs.gasPrice);
+      const originalPrice = Number('0x2540be400');
+      expect(bumpedPrice).toBeGreaterThanOrEqual(originalPrice * 1.1);
+    });
+
+    it('uses previousGas when available', () => {
+      const tx = createLegacyTx({
+        previousGas: {
+          gasPrice: '0x2540be400',
+          gas: '0x7530',
+        } as unknown as TransactionMeta['previousGas'],
+      });
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.updateTransactionToTenPercentIncreasedGasFee();
+      });
+
+      expect(mockUpdateTransactionGasFees).toHaveBeenCalledWith(
+        'legacy-tx-1',
+        expect.objectContaining({
+          gas: '0x7530',
+          gasLimit: '0x7530',
+        }),
+      );
+    });
+
+    it('does nothing when gasPrice is missing from both previousGas and txParams', () => {
+      const tx = createLegacyTx({
+        txParams: { gas: '0x5208' } as TransactionMeta['txParams'],
+      });
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.updateTransactionToTenPercentIncreasedGasFee();
+      });
+
+      expect(mockUpdateTransactionGasFees).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('updateTransactionUsingEstimate', () => {
+    it('dispatches with gasPrice from EthGasPriceEstimate (single gasPrice field)', () => {
+      const tx = createLegacyTx();
+      const estimates = { gasPrice: '10' };
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({
+          transaction: tx,
+          gasFeeEstimates: estimates,
+        }),
+      );
+
+      act(() => {
+        result.current.updateTransactionUsingEstimate('medium');
+      });
+
+      expect(mockUpdateTransactionGasFees).toHaveBeenCalledWith(
+        'legacy-tx-1',
+        expect.objectContaining({
+          userFeeLevel: 'medium',
+        }),
+      );
+      expect(
+        mockUpdateTransactionGasFees.mock.calls[0][1].gasPrice,
+      ).toBeDefined();
+    });
+
+    it('dispatches with gasPrice from legacy per-level estimate (string value)', () => {
+      const tx = createLegacyTx();
+      const estimates = { low: '5', medium: '10', high: '20' };
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({
+          transaction: tx,
+          gasFeeEstimates: estimates,
+        }),
+      );
+
+      act(() => {
+        result.current.updateTransactionUsingEstimate('medium');
+      });
+
+      expect(mockUpdateTransactionGasFees).toHaveBeenCalledWith(
+        'legacy-tx-1',
+        expect.objectContaining({
+          userFeeLevel: 'medium',
+        }),
+      );
+    });
+
+    it('falls back to suggestedMaxFeePerGas from fee-market-style estimates', () => {
+      const tx = createLegacyTx();
+      const estimates = {
+        medium: { suggestedMaxFeePerGas: '50' },
+      };
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({
+          transaction: tx,
+          gasFeeEstimates: estimates as unknown as Record<string, never>,
+        }),
+      );
+
+      act(() => {
+        result.current.updateTransactionUsingEstimate('medium');
+      });
+
+      expect(mockUpdateTransactionGasFees).toHaveBeenCalledWith(
+        'legacy-tx-1',
+        expect.objectContaining({
+          userFeeLevel: 'medium',
+        }),
+      );
+    });
+
+    it('does nothing when gasFeeEstimates is undefined', () => {
+      const tx = createLegacyTx();
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({ transaction: tx }),
+      );
+
+      act(() => {
+        result.current.updateTransactionUsingEstimate('medium');
+      });
+
+      expect(mockUpdateTransactionGasFees).not.toHaveBeenCalled();
+    });
+
+    it('does nothing when estimate level has no usable gasPrice', () => {
+      const tx = createLegacyTx();
+      const estimates = { medium: { someOtherField: 'value' } };
+
+      const { result } = renderHook(() =>
+        useLegacyCancelSpeedupFlow({
+          transaction: tx,
+          gasFeeEstimates: estimates as unknown as Record<string, never>,
+        }),
+      );
+
+      act(() => {
+        result.current.updateTransactionUsingEstimate('medium');
+      });
+
+      expect(mockUpdateTransactionGasFees).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.ts b/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.ts
new file mode 100644
index 000000000000..05bedff4af2f
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useLegacyCancelSpeedupFlow.ts
@@ -0,0 +1,203 @@
+import { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  TransactionMeta,
+  CANCEL_RATE,
+  SPEED_UP_RATE,
+} from '@metamask/transaction-controller';
+import {
+  EthGasPriceEstimate,
+  GasFeeEstimates,
+  LegacyGasPriceEstimate,
+} from '@metamask/gas-fee-controller';
+import { BigNumber } from 'bignumber.js';
+import { addHexPrefix } from 'ethereumjs-util';
+import { Hex } from '@metamask/utils';
+import { PriorityLevels } from '../../../../shared/constants/gas';
+import { Numeric } from '../../../../shared/lib/Numeric';
+import { addTenPercentAndRound } from '../../../helpers/utils/gas';
+import {
+  createCancelTransaction,
+  createSpeedUpTransaction,
+  updateTransactionGasFees,
+} from '../../../store/actions';
+import { decGWEIToHexWEI } from '../../../../shared/lib/conversion.utils';
+
+type GasFeeEstimatesUnion =
+  | EthGasPriceEstimate
+  | GasFeeEstimates
+  | LegacyGasPriceEstimate
+  | Record<string, never>;
+
+type UseLegacyCancelSpeedupFlowParams = {
+  transaction: TransactionMeta;
+  gasFeeEstimates?: GasFeeEstimatesUnion;
+};
+
+type UseLegacyCancelSpeedupFlowReturn = {
+  cancelTransaction: () => void;
+  speedUpTransaction: () => void;
+  updateTransactionToTenPercentIncreasedGasFee: (
+    initTransaction?: boolean,
+  ) => void;
+  updateTransactionUsingEstimate: (gasFeeEstimateToUse: string) => void;
+};
+
+/**
+ * Returns the higher of currentGasPrice or (previousGasPrice * rate),
+ * ensuring replacement transactions are not underpriced.
+ * @param currentGasPrice
+ * @param previousGasPrice
+ * @param rate
+ */
+function getReplacementGasPrice(
+  currentGasPrice: string | undefined,
+  previousGasPrice: string | undefined,
+  rate: number,
+): Hex {
+  if (!previousGasPrice) {
+    return (currentGasPrice ?? '0x0') as Hex;
+  }
+
+  const minGasPrice = new Numeric(previousGasPrice, 16)
+    .times(new Numeric(rate, 10))
+    .round(0)
+    .toPrefixedHexString();
+
+  const hexForBN = (v: string | undefined) =>
+    v === null || v === undefined
+      ? new BigNumber(0)
+      : new BigNumber(addHexPrefix(String(v)));
+
+  return (
+    hexForBN(currentGasPrice).gte(new BigNumber(minGasPrice))
+      ? currentGasPrice
+      : minGasPrice
+  ) as Hex;
+}
+
+/**
+ * Self-contained hook for legacy (gasPrice-based) cancel/speedup transactions. Calls
+ * updateTransactionGasFees and createCancelTransaction/createSpeedUpTransaction directly,
+ * with no dependency on useTransactionFunctions.
+ * @param options
+ * @param options.transaction
+ * @param options.gasFeeEstimates
+ */
+export function useLegacyCancelSpeedupFlow({
+  transaction,
+  gasFeeEstimates,
+}: UseLegacyCancelSpeedupFlowParams): UseLegacyCancelSpeedupFlowReturn {
+  const dispatch = useDispatch();
+
+  const cancelTransaction = useCallback(() => {
+    const gasPrice = getReplacementGasPrice(
+      transaction.txParams?.gasPrice as string | undefined,
+      (transaction.previousGas as Record<string, string> | undefined)?.gasPrice,
+      CANCEL_RATE,
+    );
+    const gasLimit =
+      transaction.txParams?.gas ?? transaction.txParams?.gasLimit;
+    dispatch(
+      createCancelTransaction(transaction.id, {
+        gasPrice,
+        gas: gasLimit as string,
+      }),
+    );
+  }, [dispatch, transaction]);
+
+  const speedUpTransaction = useCallback(() => {
+    const gasPrice = getReplacementGasPrice(
+      transaction.txParams?.gasPrice as string | undefined,
+      (transaction.previousGas as Record<string, string> | undefined)?.gasPrice,
+      SPEED_UP_RATE,
+    );
+    const gasLimit =
+      transaction.txParams?.gas ?? transaction.txParams?.gasLimit;
+    dispatch(
+      createSpeedUpTransaction(transaction.id, {
+        gasPrice,
+        gas: gasLimit as string,
+      }),
+    );
+  }, [dispatch, transaction]);
+
+  const updateTransactionToTenPercentIncreasedGasFee = useCallback(
+    (_initTransaction = false) => {
+      const source = transaction.previousGas ?? transaction.txParams;
+      const currentGasPrice = (source as Record<string, string>)?.gasPrice;
+      if (!currentGasPrice) {
+        return;
+      }
+
+      const bumpedGasPrice = addTenPercentAndRound(currentGasPrice);
+      const gasLimit =
+        (source as Record<string, string>)?.gas ??
+        (source as Record<string, string>)?.gasLimit ??
+        transaction.txParams?.gas ??
+        transaction.txParams?.gasLimit;
+
+      dispatch(
+        updateTransactionGasFees(transaction.id, {
+          gasPrice: bumpedGasPrice,
+          gas: gasLimit,
+          gasLimit,
+          userFeeLevel: PriorityLevels.tenPercentIncreased,
+        }),
+      );
+    },
+    [dispatch, transaction],
+  );
+
+  const updateTransactionUsingEstimate = useCallback(
+    (gasFeeEstimateToUse: string) => {
+      if (!gasFeeEstimates) {
+        return;
+      }
+
+      const estimates = gasFeeEstimates as Record<string, unknown>;
+      let estimateGasPrice: string | undefined;
+
+      // GasFeeEstimateType.GasPrice -- single gasPrice field
+      if ('gasPrice' in estimates && typeof estimates.gasPrice === 'string') {
+        estimateGasPrice = estimates.gasPrice;
+      }
+
+      // GasFeeEstimateType.Legacy -- gasPrice per level (low/medium/high are hex strings)
+      const levelEstimate = estimates[gasFeeEstimateToUse];
+      if (typeof levelEstimate === 'string') {
+        estimateGasPrice = levelEstimate;
+      }
+
+      // FeeMarket estimates with suggestedMaxFeePerGas (fallback)
+      if (
+        !estimateGasPrice &&
+        levelEstimate &&
+        typeof levelEstimate === 'object' &&
+        'suggestedMaxFeePerGas' in (levelEstimate as Record<string, unknown>)
+      ) {
+        estimateGasPrice = (levelEstimate as Record<string, string>)
+          .suggestedMaxFeePerGas;
+      }
+
+      if (!estimateGasPrice) {
+        return;
+      }
+
+      dispatch(
+        updateTransactionGasFees(transaction.id, {
+          gasPrice: decGWEIToHexWEI(estimateGasPrice) as string,
+          userFeeLevel: gasFeeEstimateToUse,
+        }),
+      );
+    },
+    [dispatch, gasFeeEstimates, transaction.id],
+  );
+
+  return {
+    cancelTransaction,
+    speedUpTransaction,
+    updateTransactionToTenPercentIncreasedGasFee,
+    updateTransactionUsingEstimate,
+  };
+}
diff --git a/ui/pages/confirmations/hooks/useMaxFeePerGasInput.js b/ui/pages/confirmations/hooks/useMaxFeePerGasInput.js
deleted file mode 100644
index 024895717125..000000000000
--- a/ui/pages/confirmations/hooks/useMaxFeePerGasInput.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-
-import { hexWEIToDecGWEI } from '../../../../shared/lib/conversion.utils';
-import { feeParamsAreCustom, getGasFeeEstimate } from './utils';
-
-const getMaxFeePerGasFromTransaction = (transaction, gasFeeEstimates) => {
-  if (gasFeeEstimates?.[transaction?.userFeeLevel]) {
-    return gasFeeEstimates[transaction.userFeeLevel].suggestedMaxFeePerGas;
-  }
-  const { maxFeePerGas, gasPrice } = transaction?.txParams || {};
-  return Number(hexWEIToDecGWEI(maxFeePerGas || gasPrice));
-};
-
-/**
- * @typedef {object} MaxFeePerGasInputReturnType
- * @property {(DecGweiString) => void} setMaxFeePerGas - state setter method to update the maxFeePerGas.
- * @property {string} [maxFeePerGas] - getter method for maxFeePerGas.
- */
-
-/**
- * @param options
- * @param options.estimateToUse
- * @param options.gasEstimateType
- * @param options.gasFeeEstimates
- * @param options.transaction
- * @returns {MaxFeePerGasInputReturnType}
- */
-export function useMaxFeePerGasInput({
-  estimateToUse,
-  gasEstimateType,
-  gasFeeEstimates,
-  transaction,
-}) {
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-
-  const initialMaxFeePerGas = supportsEIP1559
-    ? getMaxFeePerGasFromTransaction(transaction, gasFeeEstimates)
-    : 0;
-
-  // This hook keeps track of a few pieces of transitional state. It is
-  // transitional because it is only used to modify a transaction in the
-  // metamask (background) state tree.
-  const [maxFeePerGas, setMaxFeePerGas] = useState(() => {
-    if (initialMaxFeePerGas && feeParamsAreCustom(transaction)) {
-      return initialMaxFeePerGas;
-    }
-    return null;
-  });
-
-  useEffect(() => {
-    if (supportsEIP1559 && initialMaxFeePerGas) {
-      setMaxFeePerGas(initialMaxFeePerGas);
-    }
-  }, [initialMaxFeePerGas, setMaxFeePerGas, supportsEIP1559]);
-
-  // We specify whether to use the estimate value by checking if the state
-  // value has been set. The state value is only set by user input and is wiped
-  // when the user selects an estimate. Default here is '0' to avoid bignumber
-  // errors in later calculations for nullish values.
-  const maxFeePerGasToUse =
-    maxFeePerGas ??
-    getGasFeeEstimate(
-      'suggestedMaxFeePerGas',
-      gasFeeEstimates,
-      gasEstimateType,
-      estimateToUse,
-      initialMaxFeePerGas || 0,
-    );
-
-  return {
-    maxFeePerGas: maxFeePerGasToUse,
-    setMaxFeePerGas,
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useMaxFeePerGasInput.test.js b/ui/pages/confirmations/hooks/useMaxFeePerGasInput.test.js
deleted file mode 100644
index aae470e9e4cc..000000000000
--- a/ui/pages/confirmations/hooks/useMaxFeePerGasInput.test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { act, renderHook } from '@testing-library/react-hooks';
-
-import {
-  GasRecommendations,
-  CUSTOM_GAS_ESTIMATE,
-} from '../../../../shared/constants/gas';
-
-import {
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  configureEIP1559,
-  configureLegacy,
-} from './test-utils';
-import { useMaxFeePerGasInput } from './useMaxFeePerGasInput';
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-  };
-});
-
-const renderUseMaxFeePerGasInputHook = (props) =>
-  renderHook(() =>
-    useMaxFeePerGasInput({
-      gasLimit: '21000',
-      estimateToUse: GasRecommendations.medium,
-      transaction: {
-        userFeeLevel: CUSTOM_GAS_ESTIMATE,
-        txParams: { maxFeePerGas: '0x5028' },
-      },
-      ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      ...props,
-    }),
-  );
-
-describe('useMaxFeePerGasInput', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    configureEIP1559();
-  });
-
-  it('returns maxFeePerGas values from transaction if transaction.userFeeLevel is custom', () => {
-    const { result } = renderUseMaxFeePerGasInputHook();
-    expect(result.current.maxFeePerGas).toBe(0.00002052);
-  });
-
-  it('returns gasPrice values from transaction if transaction.userFeeLevel is custom and maxFeePerGas is not provided', () => {
-    const { result } = renderUseMaxFeePerGasInputHook({
-      transaction: {
-        userFeeLevel: CUSTOM_GAS_ESTIMATE,
-        txParams: { gasPrice: '0x5028' },
-      },
-    });
-    expect(result.current.maxFeePerGas).toBe(0.00002052);
-  });
-
-  it('does not returns maxFeePerGas values from transaction if transaction.userFeeLevel is not custom', () => {
-    const { result } = renderUseMaxFeePerGasInputHook({
-      estimateToUse: GasRecommendations.high,
-      transaction: {
-        userFeeLevel: GasRecommendations.high,
-        txParams: { maxFeePerGas: '0x5028' },
-      },
-    });
-    expect(result.current.maxFeePerGas).toBe(
-      FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.high
-        .suggestedMaxFeePerGas,
-    );
-  });
-
-  it('returns 0 if EIP1559 is not supported and legacy gas estimates have been provided', () => {
-    configureLegacy();
-    const { result } = renderUseMaxFeePerGasInputHook({
-      ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-    });
-    expect(result.current.maxFeePerGas).toBe('0');
-  });
-
-  it('returns maxFeePerGas set by user if setMaxFeePerGas is called', () => {
-    const { result } = renderUseMaxFeePerGasInputHook();
-    act(() => {
-      result.current.setMaxFeePerGas(100);
-    });
-    expect(result.current.maxFeePerGas).toBe(100);
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.js b/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.js
deleted file mode 100644
index f79bf1cdf054..000000000000
--- a/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useSelector } from 'react-redux';
-import { useEffect, useState } from 'react';
-
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
-import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
-
-import { hexWEIToDecGWEI } from '../../../../shared/lib/conversion.utils';
-import { feeParamsAreCustom, getGasFeeEstimate } from './utils';
-
-const isNullOrUndefined = (value) => value === null || value === undefined;
-
-const getMaxPriorityFeePerGasFromTransaction = (
-  transaction,
-  gasFeeEstimates,
-) => {
-  if (gasFeeEstimates?.[transaction?.userFeeLevel]) {
-    return gasFeeEstimates[transaction.userFeeLevel]
-      .suggestedMaxPriorityFeePerGas;
-  }
-  const { maxPriorityFeePerGas, maxFeePerGas, gasPrice } =
-    transaction?.txParams || {};
-  const feeInHexWei = maxPriorityFeePerGas || maxFeePerGas || gasPrice;
-  return feeInHexWei ? Number(hexWEIToDecGWEI(feeInHexWei)) : null;
-};
-
-/**
- * @typedef {object} MaxPriorityFeePerGasInputReturnType
- * @property {DecGweiString} [maxPriorityFeePerGas] - the maxPriorityFeePerGas
- *  input value.
- * @property {(DecGweiString) => void} setMaxPriorityFeePerGas - state setter
- *  method to update the maxPriorityFeePerGas.
- */
-
-/**
- * @param options
- * @param options.estimateToUse
- * @param options.gasEstimateType
- * @param options.gasFeeEstimates
- * @param options.transaction
- * @returns {MaxPriorityFeePerGasInputReturnType}
- */
-export function useMaxPriorityFeePerGasInput({
-  estimateToUse,
-  gasEstimateType,
-  gasFeeEstimates,
-  transaction,
-}) {
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-
-  const initialMaxPriorityFeePerGas = supportsEIP1559
-    ? getMaxPriorityFeePerGasFromTransaction(transaction, gasFeeEstimates)
-    : null;
-
-  const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState(() => {
-    if (
-      !isNullOrUndefined(initialMaxPriorityFeePerGas) &&
-      feeParamsAreCustom(transaction)
-    ) {
-      return initialMaxPriorityFeePerGas;
-    }
-    return null;
-  });
-
-  useEffect(() => {
-    if (supportsEIP1559 && !isNullOrUndefined(initialMaxPriorityFeePerGas)) {
-      setMaxPriorityFeePerGas(initialMaxPriorityFeePerGas);
-    }
-  }, [initialMaxPriorityFeePerGas, setMaxPriorityFeePerGas, supportsEIP1559]);
-
-  const maxPriorityFeePerGasToUse =
-    maxPriorityFeePerGas ??
-    getGasFeeEstimate(
-      'suggestedMaxPriorityFeePerGas',
-      gasFeeEstimates,
-      gasEstimateType,
-      estimateToUse,
-      initialMaxPriorityFeePerGas || 0,
-    );
-
-  return {
-    maxPriorityFeePerGas: maxPriorityFeePerGasToUse,
-    setMaxPriorityFeePerGas,
-  };
-}
diff --git a/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.test.js b/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.test.js
deleted file mode 100644
index bae0df2ff1fd..000000000000
--- a/ui/pages/confirmations/hooks/useMaxPriorityFeePerGasInput.test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import { act, renderHook } from '@testing-library/react-hooks';
-
-import {
-  GasRecommendations,
-  CUSTOM_GAS_ESTIMATE,
-} from '../../../../shared/constants/gas';
-import {
-  FEE_MARKET_ESTIMATE_RETURN_VALUE,
-  LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-  configureEIP1559,
-  configureLegacy,
-} from './test-utils';
-import { useMaxPriorityFeePerGasInput } from './useMaxPriorityFeePerGasInput';
-
-jest.mock('../../../hooks/useGasFeeEstimates', () => ({
-  useGasFeeEstimates: jest.fn(),
-}));
-
-jest.mock('../../../hooks/useMultichainSelector', () => ({
-  useMultichainSelector: jest.fn(),
-}));
-
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-  };
-});
-
-const renderUseMaxPriorityFeePerGasInputHook = (props) => {
-  return renderHook(() =>
-    useMaxPriorityFeePerGasInput({
-      gasLimit: '21000',
-      estimateToUse: GasRecommendations.medium,
-      transaction: {
-        userFeeLevel: CUSTOM_GAS_ESTIMATE,
-        txParams: { maxPriorityFeePerGas: '0x5028' },
-      },
-      ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
-      ...props,
-    }),
-  );
-};
-
-describe('useMaxPriorityFeePerGasInput', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    configureEIP1559();
-  });
-
-  it('returns maxPriorityFeePerGas values from transaction if transaction.userFeeLevel is custom', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook();
-    expect(result.current.maxPriorityFeePerGas).toBe(0.00002052);
-  });
-
-  it('returns maxFeePerGas values from transaction if transaction.userFeeLevel is custom and maxPriorityFeePerGas is not provided', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      transaction: {
-        userFeeLevel: CUSTOM_GAS_ESTIMATE,
-        txParams: { maxFeePerGas: '0x5028' },
-      },
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe(0.00002052);
-  });
-
-  it('does not returns maxPriorityFeePerGas values from transaction if transaction.userFeeLevel is not custom', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      estimateToUse: GasRecommendations.high,
-      transaction: {
-        userFeeLevel: GasRecommendations.high,
-        txParams: { maxPriorityFeePerGas: '0x5028' },
-      },
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe(
-      FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.high
-        .suggestedMaxPriorityFeePerGas,
-    );
-  });
-
-  it('if no maxPriorityFeePerGas is provided by user or in transaction it returns value from fee market estimate', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      transaction: {
-        txParams: {},
-      },
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe(
-      FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium
-        .suggestedMaxPriorityFeePerGas,
-    );
-  });
-
-  it('returns 0 if EIP1559 is not supported and gas estimates are legacy', () => {
-    configureLegacy();
-    const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe('0');
-  });
-
-  it('returns maxPriorityFeePerGas set by user if setMaxPriorityFeePerGas is called', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook();
-    act(() => {
-      result.current.setMaxPriorityFeePerGas(100);
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe(100);
-  });
-
-  it('returns maxPriorityFeePerGas from transaction if it is 0', () => {
-    const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      transaction: {
-        txParams: {
-          maxPriorityFeePerGas: '0x0',
-        },
-      },
-    });
-    expect(result.current.maxPriorityFeePerGas).toBe(0);
-  });
-});
diff --git a/ui/pages/confirmations/hooks/useTransactionEventFragment.js b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
index de8a3c1514e3..3da891b87562 100644
--- a/ui/pages/confirmations/hooks/useTransactionEventFragment.js
+++ b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 
-import { useGasFeeContext } from '../../../contexts/gasFee';
 import { upsertTransactionUIMetricsFragment } from '../../../store/actions';
+import { useConfirmContext } from '../context/confirm';
 
 export const useTransactionEventFragment = () => {
-  const { transaction } = useGasFeeContext();
-  const gasTransactionId = transaction?.id;
+  const { currentConfirmation } = useConfirmContext();
+  const gasTransactionId = currentConfirmation?.id;
 
   const updateTransactionEventFragment = useCallback(
     async (params, _transactionId) => {
diff --git a/ui/pages/confirmations/hooks/useTransactionFunction.test.js b/ui/pages/confirmations/hooks/useTransactionFunction.test.js
index abfb513d4b21..6bd01a0bc74c 100644
--- a/ui/pages/confirmations/hooks/useTransactionFunction.test.js
+++ b/ui/pages/confirmations/hooks/useTransactionFunction.test.js
@@ -11,15 +11,9 @@ import mockState from '../../../../test/data/mock-state.json';
 import * as Actions from '../../../store/actions';
 import configureStore from '../../../store/store';
 
-import { useGasEstimates } from './useGasEstimates';
 import { FEE_MARKET_ESTIMATE_RETURN_VALUE } from './test-utils';
 import { useTransactionFunctions } from './useTransactionFunctions';
 
-jest.mock('./useGasEstimates', () => ({
-  useGasEstimates: jest.fn(),
-}));
-useGasEstimates.mockImplementation(() => FEE_MARKET_ESTIMATE_RETURN_VALUE);
-
 jest.mock('../../../selectors', () => ({
   checkNetworkAndAccountSupports1559: () => true,
   getCurrentChainId: jest.fn().mockReturnValue('0x1'),
diff --git a/ui/pages/confirmations/selectors/accounts.test.ts b/ui/pages/confirmations/selectors/accounts.test.ts
index 26f54b87235b..cd9eadfff8fd 100644
--- a/ui/pages/confirmations/selectors/accounts.test.ts
+++ b/ui/pages/confirmations/selectors/accounts.test.ts
@@ -1,22 +1,12 @@
 import { MultichainNetworkConfigurationsByChainIdState } from '../../../../shared/lib/selectors/networks';
-import mockState from '../../../../test/data/mock-state.json';
-import { getAccountByAddress } from '../../../helpers/utils/util';
 import { getAccountGroupsByAddress } from '../../../selectors/multichain-accounts/account-tree';
 import { MultichainAccountsState } from '../../../selectors/multichain-accounts/account-tree.types';
-import {
-  selectAccountGroupNameByInternalAccount,
-  selectInternalAccountNameByAddress,
-} from './accounts';
-import { RootState } from './preferences';
+import { selectAccountGroupNameByInternalAccount } from './accounts';
 
 jest.mock('../../../selectors/multichain-accounts/account-tree', () => ({
   getAccountGroupsByAddress: jest.fn(),
 }));
 
-jest.mock('../../../helpers/utils/util', () => ({
-  getAccountByAddress: jest.fn(),
-}));
-
 describe('selectAccountGroupNameByInternalAccount', () => {
   const mockAccountGroupState = {} as unknown as MultichainAccountsState &
     MultichainNetworkConfigurationsByChainIdState;
@@ -77,47 +67,3 @@ describe('selectAccountGroupNameByInternalAccount', () => {
     expect(result).toBeNull();
   });
 });
-
-describe('selectInternalAccountNameByAddress', () => {
-  it('returns the internal account name for a matching address', () => {
-    (getAccountByAddress as jest.Mock).mockReturnValue({
-      metadata: { name: 'Account 1' },
-    });
-
-    const result = selectInternalAccountNameByAddress(
-      mockState as RootState,
-      '0x123',
-    );
-
-    expect(getAccountByAddress).toHaveBeenCalledWith(
-      expect.any(Array),
-      '0x123',
-    );
-    expect(result).toBe('Account 1');
-  });
-
-  it('returns null when no account matches the address', () => {
-    (getAccountByAddress as jest.Mock).mockReturnValue(undefined);
-
-    const result = selectInternalAccountNameByAddress(
-      mockState as RootState,
-      '0x000',
-    );
-
-    expect(getAccountByAddress).toHaveBeenCalledWith(
-      expect.any(Array),
-      '0x000',
-    );
-    expect(result).toBeNull();
-  });
-
-  it('returns null when address is undefined', () => {
-    const result = selectInternalAccountNameByAddress(
-      mockState as RootState,
-      undefined,
-    );
-
-    expect(getAccountByAddress).toHaveBeenCalled();
-    expect(result).toBeNull();
-  });
-});
diff --git a/ui/pages/confirmations/selectors/accounts.ts b/ui/pages/confirmations/selectors/accounts.ts
index c63f7ae3ed42..ea8a49f4743a 100644
--- a/ui/pages/confirmations/selectors/accounts.ts
+++ b/ui/pages/confirmations/selectors/accounts.ts
@@ -1,13 +1,10 @@
 import { InternalAccount } from '@metamask/keyring-internal-api';
 import { createDeepEqualSelector } from '../../../../shared/lib/selectors/util';
-import { getAccountByAddress } from '../../../helpers/utils/util';
 import { getAccountGroupsByAddress } from '../../../selectors/multichain-accounts/account-tree';
 import {
   AccountGroupWithInternalAccounts,
   MultichainAccountsState,
 } from '../../../selectors/multichain-accounts/account-tree.types';
-import { accountsWithSendEtherInfoSelector } from '../../../selectors';
-import { RootState } from './preferences';
 
 export const selectAccountGroupNameByInternalAccount = createDeepEqualSelector(
   [
@@ -36,21 +33,3 @@ export const selectAccountGroupNameByInternalAccount = createDeepEqualSelector(
     return group?.metadata?.name ?? null;
   },
 );
-
-export const selectInternalAccountNameByAddress = createDeepEqualSelector(
-  [
-    (state: RootState, address: string | undefined) => ({
-      accounts: accountsWithSendEtherInfoSelector(state),
-      address,
-    }),
-  ],
-  ({ accounts, address }): string | null => {
-    if (!address || !accounts?.length) {
-      return null;
-    }
-
-    const fromAccount = getAccountByAddress(accounts, address);
-
-    return fromAccount?.metadata?.name ?? null;
-  },
-);
diff --git a/ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.container.js b/ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.container.js
index baacc6e3d63b..4c8c9cc16fdf 100644
--- a/ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.container.js
+++ b/ui/pages/confirmations/send-utils/send-content/add-recipient/domain-input.container.js
@@ -5,14 +5,8 @@ import {
   initializeDomainSlice,
   resetDomainResolution,
 } from '../../../../../ducks/domains';
-import { getUseBlockie } from '../../../../../selectors';
 import DomainInput from './domain-input.component';
 
-// Trigger onChange when chainId changes using MapStateToProps
-function mapStateToProps(state) {
-  return { useBlockie: getUseBlockie(state) };
-}
-
 function mapDispatchToProps(dispatch) {
   return {
     lookupDomainName: debounce(
@@ -27,4 +21,4 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(DomainInput);
+export default connect(null, mapDispatchToProps)(DomainInput);
diff --git a/ui/pages/create-account/connect-hardware/__snapshots__/index.test.tsx.snap b/ui/pages/create-account/connect-hardware/__snapshots__/index.test.tsx.snap
index 925c4098b6e9..3a0449c5bc42 100644
--- a/ui/pages/create-account/connect-hardware/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/create-account/connect-hardware/__snapshots__/index.test.tsx.snap
@@ -1,37 +1,51 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConnectHardwareForm matchs snapshot 1`] = `
+exports[`ConnectHardwareForm initial render render matches snapshot 1`] = `
 <div>
   <div
-    class="mm-box new-external-account-form mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+    class="flex flex-col items-center justify-center new-external-account-form"
   >
     <div
-      class="mm-box hw-connect__header mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center"
+      class="flex flex-col items-center hw-connect__header"
     >
       <div
-        class="mm-box hw-connect__header__title-wrapper mm-box--margin-top-6 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="flex flex-row items-center justify-center mt-4 hw-connect__header__title-wrapper"
       >
-        <h3
-          class="mm-box mm-text mm-text--heading-md mm-text--font-weight-bold mm-box--margin-left-auto mm-box--color-text-default"
+        <div
+          class="ml-auto"
         >
-          Connect a hardware wallet
-        </h3>
+          <h3
+            class="text-default text-s-heading-md leading-s-heading-md tracking-s-heading-md md:text-l-heading-md md:leading-l-heading-md md:tracking-l-heading-md font-bold font-default"
+          >
+            Connect a hardware wallet
+          </h3>
+        </div>
         <button
           aria-label="Close"
-          class="mm-box mm-button-icon mm-button-icon--size-sm 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"
+          class="inline-flex items-center justify-center p-0 h-6 w-6 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default ml-auto"
           data-testid="hardware-connect-close-btn"
         >
-          <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');"
-          />
+          <svg
+            class="inline-block w-5 h-5 text-inherit"
+            fill="currentColor"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M6.4 19 5 17.6l5.6-5.6L5 6.4 6.4 5l5.6 5.6L17.6 5 19 6.4 13.4 12l5.6 5.6-1.4 1.4-5.6-5.6z"
+            />
+          </svg>
         </button>
       </div>
-      <h5
-        class="mm-box mm-text hw-connect__header__msg mm-text--body-md mm-box--margin-top-5 mm-box--margin-bottom-3 mm-box--color-text-default"
+      <div
+        class="mt-5 mb-3"
       >
-        Select a hardware wallet you would like to use with MetaMask.
-      </h5>
+        <h5
+          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default hw-connect__header__msg"
+        >
+          Select a hardware wallet you would like to use with MetaMask.
+        </h5>
+      </div>
     </div>
     <div
       class="hw-connect__btn-wrapper"
@@ -39,6 +53,7 @@ exports[`ConnectHardwareForm matchs snapshot 1`] = `
       <button
         class="hw-connect__btn"
         data-testid="connect-ledger-btn"
+        type="button"
       >
         <svg
           aria-label="Ledger"
@@ -56,6 +71,7 @@ exports[`ConnectHardwareForm matchs snapshot 1`] = `
       <button
         class="hw-connect__btn"
         data-testid="connect-trezor-btn"
+        type="button"
       >
         <svg
           aria-label="Trezor"
@@ -90,12 +106,12 @@ exports[`ConnectHardwareForm matchs snapshot 1`] = `
       </button>
     </div>
     <div
-      class="hw-connect__btn-wrapper"
-      style="margin: 10px 0px 0px 0px;"
+      class="mt-2 hw-connect__btn-wrapper"
     >
       <button
         class="hw-connect__btn"
         data-testid="connect-lattice-btn"
+        type="button"
       >
         <svg
           aria-label="Lattice"
@@ -115,6 +131,7 @@ exports[`ConnectHardwareForm matchs snapshot 1`] = `
       <button
         class="hw-connect__btn"
         data-testid="connect-qr-btn"
+        type="button"
       >
         <svg
           aria-label="QRCode"
@@ -134,16 +151,26 @@ exports[`ConnectHardwareForm matchs snapshot 1`] = `
       </button>
     </div>
     <button
-      class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--disabled hw-connect__connect-btn mm-button-primary mm-button-primary--disabled mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-inverse mm-box--background-color-icon-default mm-box--rounded-xl"
+      class="inline-flex items-center justify-center rounded-xl px-4 font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default text-primary-inverse hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default hw-connect__connect-btn"
+      data-testid="connect-hardware-continue-btn"
       disabled=""
+      role="button"
     >
-      Continue
+      <span
+        class="text-inherit text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+      >
+        Continue
+      </span>
     </button>
-    <h6
-      class="mm-box mm-text new-external-account-form footer mm-text--body-sm mm-text--text-align-center mm-box--margin-top-4 mm-box--color-text-alternative"
+    <div
+      class="mt-4 new-external-account-form footer"
     >
-      Hardware wallet integrations use API calls to external servers, which can see your IP address and the smart contract addresses you interact with.
-    </h6>
+      <h6
+        class="text-alternative text-s-body-sm leading-s-body-sm tracking-s-body-sm md:text-l-body-sm md:leading-l-body-sm md:tracking-l-body-sm font-regular font-default text-center"
+      >
+        Hardware wallet integrations use API calls to external servers, which can see your IP address and the smart contract addresses you interact with.
+      </h6>
+    </div>
   </div>
 </div>
 `;
diff --git a/ui/pages/create-account/connect-hardware/account-list.js b/ui/pages/create-account/connect-hardware/account-list.js
deleted file mode 100644
index bad4eec6c6f0..000000000000
--- a/ui/pages/create-account/connect-hardware/account-list.js
+++ /dev/null
@@ -1,301 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { getAccountLink } from '@metamask/etherscan-link';
-
-import {
-  Button,
-  ButtonVariant,
-  ButtonSize,
-} from '../../../components/component-library';
-import Checkbox from '../../../components/ui/check-box';
-import Dropdown from '../../../components/ui/dropdown';
-
-import { getURLHostName } from '../../../helpers/utils/util';
-
-import { HardwareDeviceNames } from '../../../../shared/constants/hardware-wallets';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../shared/constants/metametrics';
-import { capitalizeStr } from './utils';
-
-class AccountList extends Component {
-  state = {
-    pathValue: null,
-  };
-
-  componentDidMount() {
-    const { device } = this.props;
-    const { trackEvent } = this.context;
-
-    trackEvent({
-      event: MetaMetricsEventName.ConnectHardwareWalletAccountSelectorViewed,
-      properties: {
-        device_type: capitalizeStr(device),
-      },
-    });
-  }
-
-  goToNextPage = () => {
-    // If we have < 5 accounts, it's restricted by BIP-44
-    if (this.props.accounts.length === 5) {
-      this.props.getPage(this.props.device, 1, this.props.selectedPath, false);
-    } else {
-      this.props.onAccountRestriction();
-    }
-  };
-
-  goToPreviousPage = () => {
-    this.props.getPage(this.props.device, -1, this.props.selectedPath, false);
-  };
-
-  setPath(pathValue) {
-    this.setState({ pathValue });
-  }
-
-  isFirstPage() {
-    return this.props.accounts[0]?.index === 0;
-  }
-
-  renderHdPathSelector() {
-    const { device, selectedPath, hdPaths, onPathChange } = this.props;
-    const { pathValue } = this.state;
-
-    return (
-      <div>
-        <h3 className="hw-connect__hdPath__title">
-          {this.context.t('selectHdPath')}
-        </h3>
-        <p className="hw-connect__msg">{this.context.t('selectPathHelp')}</p>
-        <div className="hw-connect__hdPath">
-          <Dropdown
-            className="hw-connect__hdPath__select"
-            options={hdPaths[device]}
-            selectedOption={pathValue || selectedPath}
-            onChange={(value) => {
-              this.setPath(value);
-              onPathChange(value);
-            }}
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderHeader() {
-    const { device } = this.props;
-    const shouldShowHDPaths = [
-      HardwareDeviceNames.ledger,
-      HardwareDeviceNames.lattice,
-      HardwareDeviceNames.trezor,
-      HardwareDeviceNames.oneKey,
-    ].includes(device);
-    return (
-      <div className="hw-connect">
-        <h3 className="hw-connect__unlock-title">
-          {this.context.t('selectAnAccount')}
-        </h3>
-        {shouldShowHDPaths ? this.renderHdPathSelector() : null}
-        <h3 className="hw-connect__hdPath__title">
-          {this.context.t('selectAnAccount')}
-        </h3>
-      </div>
-    );
-  }
-
-  renderAccounts() {
-    const { accounts, connectedAccounts, rpcPrefs, chainId } = this.props;
-
-    return (
-      <div className="hw-account-list">
-        {accounts.map((account, idx) => {
-          const accountAlreadyConnected = connectedAccounts.includes(
-            account.address.toLowerCase(),
-          );
-          const value = account.index;
-          const checked =
-            this.props.selectedAccounts.includes(account.index) ||
-            accountAlreadyConnected;
-          const accountLink = getAccountLink(
-            account.address,
-            chainId,
-            rpcPrefs,
-          );
-          const blockExplorerDomain = getURLHostName(accountLink);
-
-          return (
-            <div
-              className="hw-account-list__item"
-              key={account.address}
-              data-testid="hw-account-list__item"
-              title={
-                accountAlreadyConnected
-                  ? this.context.t('selectAnAccountAlreadyConnected')
-                  : ''
-              }
-            >
-              <div className="hw-account-list__item__checkbox">
-                <Checkbox
-                  id={`address-${idx}`}
-                  checked={checked}
-                  disabled={accountAlreadyConnected}
-                  onClick={() => {
-                    this.props.onAccountChange(value);
-                  }}
-                />
-                <label
-                  className="hw-account-list__item__label"
-                  htmlFor={`address-${idx}`}
-                >
-                  <span className="hw-account-list__item__index">
-                    {account.index + 1}
-                  </span>
-                  {`${account.address.slice(0, 4)}...${account.address.slice(
-                    -4,
-                  )}`}
-                  <span className="hw-account-list__item__balance">{`${account.balance}`}</span>
-                </label>
-              </div>
-              <a
-                className="hw-account-list__item__link"
-                onClick={() => {
-                  this.context.trackEvent({
-                    category: MetaMetricsEventCategory.Accounts,
-                    event: 'Clicked Block Explorer Link',
-                    properties: {
-                      actions: 'Hardware Connect',
-                      link_type: 'Account Tracker',
-                      block_explorer_domain: blockExplorerDomain,
-                    },
-                  });
-                  global.platform.openTab({
-                    url: accountLink,
-                  });
-                }}
-                target="_blank"
-                rel="noopener noreferrer"
-                title={this.context.t('genericExplorerView', [
-                  blockExplorerDomain,
-                ])}
-              >
-                <i
-                  className="fa fa-share-square"
-                  style={{ color: 'var(--color-icon-default)' }}
-                />
-              </a>
-            </div>
-          );
-        })}
-      </div>
-    );
-  }
-
-  renderPagination() {
-    return (
-      <div className="hw-list-pagination">
-        <button
-          className="hw-list-pagination__button"
-          disabled={this.isFirstPage()}
-          onClick={this.goToPreviousPage}
-          data-testid="hw-list-pagination__prev-button"
-        >
-          {`< ${this.context.t('prev')}`}
-        </button>
-        <button
-          className="hw-list-pagination__button"
-          onClick={this.goToNextPage}
-        >
-          {`${this.context.t('next')} >`}
-        </button>
-      </div>
-    );
-  }
-
-  renderButtons() {
-    const disabled = this.props.selectedAccounts.length === 0;
-    const buttonProps = {};
-    if (disabled) {
-      buttonProps.disabled = true;
-    }
-
-    return (
-      <div className="new-external-account-form__buttons">
-        <Button
-          variant={ButtonVariant.Secondary}
-          size={ButtonSize.Lg}
-          block
-          onClick={this.props.onCancel.bind(this)}
-        >
-          {this.context.t('cancel')}
-        </Button>
-        <Button
-          variant={ButtonVariant.Primary}
-          size={ButtonSize.Lg}
-          block
-          className="new-external-account-form__button unlock"
-          disabled={disabled}
-          onClick={this.props.onUnlockAccounts.bind(
-            this,
-            this.props.device,
-            this.props.selectedPath,
-          )}
-        >
-          {this.context.t('unlock')}
-        </Button>
-      </div>
-    );
-  }
-
-  renderForgetDevice() {
-    return (
-      <div className="hw-forget-device-container">
-        <a
-          onClick={this.props.onForgetDevice.bind(
-            this,
-            this.props.device,
-            this.props.selectedPath,
-          )}
-        >
-          {this.context.t('forgetDevice')}
-        </a>
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <div className="new-external-account-form account-list">
-        {this.renderHeader()}
-        {this.renderAccounts()}
-        {this.renderPagination()}
-        {this.renderButtons()}
-        {this.renderForgetDevice()}
-      </div>
-    );
-  }
-}
-
-AccountList.propTypes = {
-  onPathChange: PropTypes.func.isRequired,
-  selectedPath: PropTypes.string.isRequired,
-  device: PropTypes.string.isRequired,
-  accounts: PropTypes.array.isRequired,
-  connectedAccounts: PropTypes.array.isRequired,
-  onAccountChange: PropTypes.func.isRequired,
-  onForgetDevice: PropTypes.func.isRequired,
-  getPage: PropTypes.func.isRequired,
-  chainId: PropTypes.string,
-  rpcPrefs: PropTypes.object,
-  selectedAccounts: PropTypes.array.isRequired,
-  onUnlockAccounts: PropTypes.func,
-  onCancel: PropTypes.func,
-  onAccountRestriction: PropTypes.func,
-  hdPaths: PropTypes.object.isRequired,
-};
-
-AccountList.contextTypes = {
-  t: PropTypes.func,
-  trackEvent: PropTypes.func,
-};
-
-export default AccountList;
diff --git a/ui/pages/create-account/connect-hardware/account-list.stories.js b/ui/pages/create-account/connect-hardware/account-list.stories.js
deleted file mode 100644
index 9452a51eadbd..000000000000
--- a/ui/pages/create-account/connect-hardware/account-list.stories.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import AccountList from './account-list';
-
-const mockTrackEvent = (event, properties) => {
-  console.log('Mock track event:', { event, properties });
-  return Promise.resolve();
-};
-
-class TrackEventProvider extends Component {
-  getChildContext() {
-    return {
-      trackEvent: mockTrackEvent,
-    };
-  }
-
-  render() {
-    return this.props.children;
-  }
-}
-
-TrackEventProvider.childContextTypes = {
-  trackEvent: PropTypes.func,
-};
-
-TrackEventProvider.propTypes = {
-  children: PropTypes.node,
-};
-
-export default {
-  title: 'Pages/CreateAccount/ConnectHardware/AccountList',
-  component: AccountList,
-  decorators: [(story) => <TrackEventProvider>{story()}</TrackEventProvider>],
-
-  argTypes: {
-    onPathChange: {
-      action: 'onPathChange',
-    },
-    selectedPath: 'selectedPath',
-    device: 'device',
-    accounts: {
-      control: 'array',
-    },
-    connectedAccounts: {
-      control: 'array',
-    },
-    onAccountChange: {
-      action: 'onAccountChange',
-    },
-    onForgetDevice: {
-      action: 'onForgetDevice',
-    },
-    getPage: {
-      action: 'getPage',
-    },
-    chainId: {
-      control: 'text',
-    },
-    rpcPrefs: {
-      control: 'object',
-    },
-    selectedAccounts: {
-      control: 'array',
-    },
-    onUnlockAccounts: {
-      action: 'onUnlockAccounts',
-    },
-    onCancel: {
-      action: 'onCancel',
-    },
-    onAccountRestriction: {
-      action: 'onAccountRestriction',
-    },
-    hdPaths: {
-      control: 'array',
-    },
-  },
-  args: {
-    selectedPath: 'selectedPath',
-    device: 'device',
-    accounts: [
-      {
-        name: 'This is a Really Long Account Name',
-        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-        index: 0,
-        balance: '0x176e5b6f173ebe66',
-      },
-    ],
-    connectedAccounts: [
-      {
-        name: 'This is a Really Long Account Name',
-        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-        index: 0,
-        balance: '0x176e5b6f173ebe66',
-      },
-    ],
-    chainId: 'chainId',
-    rpcPrefs: {},
-    selectedAccounts: [
-      {
-        name: 'This is a Really Long Account Name',
-        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-        index: 0,
-        balance: '0x176e5b6f173ebe66',
-      },
-    ],
-    hdPaths: [
-      { name: 'Ledger Live', value: `m/44'/60'/0'/0/0` },
-      { name: 'Legacy (MEW / MyCrypto)', value: `m/44'/60'/0'` },
-      {
-        name: `BIP44 Standard (e.g. MetaMask, Trezor)`,
-        value: `m/44'/60'/0'/0`,
-      },
-    ],
-  },
-};
-
-export const DefaultStory = (args) => <AccountList {...args} />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/create-account/connect-hardware/account-list.stories.tsx b/ui/pages/create-account/connect-hardware/account-list.stories.tsx
new file mode 100644
index 000000000000..3036b6bee7b2
--- /dev/null
+++ b/ui/pages/create-account/connect-hardware/account-list.stories.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import type { Meta, StoryFn } from '@storybook/react';
+import AccountList from './account-list';
+
+export default {
+  title: 'Pages/CreateAccount/ConnectHardware/AccountList',
+  component: AccountList,
+
+  argTypes: {
+    onPathChange: {
+      action: 'onPathChange',
+    },
+    selectedPath: { control: 'text' },
+    device: { control: 'text' },
+    accounts: {
+      control: 'object',
+    },
+    connectedAccounts: {
+      control: 'object',
+    },
+    onAccountChange: {
+      action: 'onAccountChange',
+    },
+    onForgetDevice: {
+      action: 'onForgetDevice',
+    },
+    getPage: {
+      action: 'getPage',
+    },
+    chainId: {
+      control: 'text',
+    },
+    rpcPrefs: {
+      control: 'object',
+    },
+    selectedAccounts: {
+      control: 'object',
+    },
+    onUnlockAccounts: {
+      action: 'onUnlockAccounts',
+    },
+    onCancel: {
+      action: 'onCancel',
+    },
+    onAccountRestriction: {
+      action: 'onAccountRestriction',
+    },
+    hdPaths: {
+      control: 'object',
+    },
+  },
+  args: {
+    selectedPath: `m/44'/60'/0'/0`,
+    device: 'trezor',
+    accounts: [
+      {
+        name: 'This is a Really Long Account Name',
+        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+        index: 0,
+        balance: '0x176e5b6f173ebe66',
+      },
+    ],
+    connectedAccounts: [
+      '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+    ],
+    chainId: '0x1',
+    rpcPrefs: {},
+    selectedAccounts: [],
+    hdPaths: {
+      ledger: [
+        { name: 'Ledger Live', value: `m/44'/60'/0'/0/0` },
+        { name: 'Legacy (MEW / MyCrypto)', value: `m/44'/60'/0'` },
+        {
+          name: `BIP44 Standard (e.g. MetaMask, Trezor)`,
+          value: `m/44'/60'/0'/0`,
+        },
+      ],
+      trezor: [
+        { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: `m/44'/60'/0'/0` },
+        { name: `Legacy (Ledger / MEW / MyCrypto)`, value: `m/44'/60'/0'` },
+        { name: `Trezor Testnets`, value: `m/44'/1'/0'/0` },
+      ],
+      lattice: [],
+      oneKey: [],
+    },
+  },
+} as Meta<typeof AccountList>;
+
+export const DefaultStory: StoryFn<typeof AccountList> = (args) => (
+  <AccountList {...args} />
+);
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/create-account/connect-hardware/account-list.test.js b/ui/pages/create-account/connect-hardware/account-list.test.tsx
similarity index 77%
rename from ui/pages/create-account/connect-hardware/account-list.test.js
rename to ui/pages/create-account/connect-hardware/account-list.test.tsx
index 614a0b60927d..d27afdd19b0f 100644
--- a/ui/pages/create-account/connect-hardware/account-list.test.js
+++ b/ui/pages/create-account/connect-hardware/account-list.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { fireEvent, screen } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
@@ -49,7 +49,7 @@ const render = () => {
       '0x27d17...a5B52E',
       '0x5E2003....98f417b',
     ].map((a) => a.toLowerCase()),
-    selectedAccounts: [],
+    selectedAccounts: [] as number[],
     chainId: '0x1',
     rpcPrefs: {},
     hdPaths: {
@@ -66,7 +66,10 @@ const render = () => {
     onCancel: jest.fn(),
     onAccountRestriction: jest.fn(),
   };
-  return renderWithProvider(<AccountList {...props} />, store);
+  return {
+    ...renderWithProvider(<AccountList {...props} />, store),
+    props,
+  };
 };
 
 describe('AccountList', () => {
@@ -98,4 +101,23 @@ describe('AccountList', () => {
       screen.getByTestId('hw-list-pagination__prev-button'),
     ).toBeDisabled();
   });
+
+  it('calls onAccountChange when an unconnected account checkbox is clicked', () => {
+    const { props } = render();
+
+    fireEvent.click(screen.getByRole('checkbox', { name: /0x1B.*F917/iu }));
+
+    expect(props.onAccountChange).toHaveBeenCalledWith(4);
+  });
+
+  it('disables checkboxes for already connected accounts', () => {
+    render();
+
+    expect(
+      screen.getByRole('checkbox', { name: /0x5E.*417b/iu }),
+    ).toBeDisabled();
+    expect(
+      screen.getByRole('checkbox', { name: /0x27.*B52E/iu }),
+    ).toBeDisabled();
+  });
 });
diff --git a/ui/pages/create-account/connect-hardware/account-list.tsx b/ui/pages/create-account/connect-hardware/account-list.tsx
new file mode 100644
index 000000000000..c2135b26c0b6
--- /dev/null
+++ b/ui/pages/create-account/connect-hardware/account-list.tsx
@@ -0,0 +1,330 @@
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
+import { getAccountLink } from '@metamask/etherscan-link';
+import { upperFirst } from 'lodash';
+
+import {
+  Box,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  ButtonIcon,
+  ButtonIconSize,
+  BoxAlignItems,
+  BoxFlexDirection,
+  Checkbox,
+  IconName,
+  Text,
+  TextButton,
+  TextVariant,
+} from '@metamask/design-system-react';
+import Dropdown from '../../../components/ui/dropdown';
+
+import { getURLHostName } from '../../../helpers/utils/util';
+
+import { HardwareDeviceNames } from '../../../../shared/constants/hardware-wallets';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+type HardwareAccount = {
+  address: string;
+  balance: string;
+  index: number;
+};
+
+type AccountListProps = {
+  onPathChange: (path: string) => void;
+  selectedPath: string;
+  device: string;
+  accounts: HardwareAccount[];
+  connectedAccounts: string[];
+  onAccountChange: (index: number) => void;
+  onForgetDevice: (device: string, hdPath: string) => void;
+  getPage: (
+    device: string,
+    page: number,
+    hdPath: string,
+    loadHid?: boolean,
+  ) => void;
+  chainId: string;
+  rpcPrefs: Record<string, string>;
+  selectedAccounts: number[];
+  onUnlockAccounts: (device: string, hdPath: string) => void;
+  onCancel: () => void;
+  onAccountRestriction: () => void;
+  hdPaths: Record<string, { name: string; value: string }[]>;
+};
+
+const AccountList = ({
+  onPathChange,
+  selectedPath,
+  device,
+  accounts,
+  connectedAccounts,
+  onAccountChange,
+  onForgetDevice,
+  getPage,
+  chainId,
+  rpcPrefs,
+  selectedAccounts,
+  onUnlockAccounts,
+  onCancel,
+  onAccountRestriction,
+  hdPaths,
+}: AccountListProps) => {
+  const t = useI18nContext();
+  const { trackEvent } = useContext(MetaMetricsContext);
+  const [pathValue, setPathValue] = useState<string | null>(null);
+  const trackEventRef = useRef(trackEvent);
+  const initialDeviceRef = useRef(device);
+
+  useEffect(() => {
+    trackEventRef.current = trackEvent;
+  }, [trackEvent]);
+
+  useEffect(() => {
+    trackEventRef.current({
+      event: MetaMetricsEventName.ConnectHardwareWalletAccountSelectorViewed,
+      properties: {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        device_type: upperFirst(initialDeviceRef.current),
+      },
+    });
+  }, []);
+
+  const goToNextPage = useCallback(() => {
+    // If we have < 5 accounts, it's restricted by BIP-44
+    if (accounts.length === 5) {
+      getPage(device, 1, selectedPath, false);
+    } else {
+      onAccountRestriction();
+    }
+  }, [accounts.length, device, getPage, onAccountRestriction, selectedPath]);
+
+  const goToPreviousPage = useCallback(() => {
+    getPage(device, -1, selectedPath, false);
+  }, [device, getPage, selectedPath]);
+
+  const isFirstPage = accounts[0]?.index === 0;
+
+  const shouldShowHDPaths = [
+    HardwareDeviceNames.ledger,
+    HardwareDeviceNames.lattice,
+    HardwareDeviceNames.trezor,
+    HardwareDeviceNames.oneKey,
+  ].includes(device as HardwareDeviceNames);
+
+  const renderHdPathSelector = () => (
+    <Box>
+      <Text
+        asChild
+        variant={TextVariant.HeadingSm}
+        className="hw-connect__hdPath__title"
+      >
+        <h3>{t('selectHdPath')}</h3>
+      </Text>
+      <Text asChild variant={TextVariant.BodyMd} className="hw-connect__msg">
+        <p>{t('selectPathHelp')}</p>
+      </Text>
+      <Box className="hw-connect__hdPath">
+        <Dropdown
+          className="hw-connect__hdPath__select"
+          options={hdPaths[device]}
+          selectedOption={pathValue || selectedPath}
+          onChange={(value: string) => {
+            setPathValue(value);
+            onPathChange(value);
+          }}
+        />
+      </Box>
+    </Box>
+  );
+
+  const renderHeader = () => (
+    <Box className="hw-connect">
+      <Text
+        asChild
+        variant={TextVariant.HeadingSm}
+        className="hw-connect__unlock-title"
+      >
+        <h3>{t('selectAnAccount')}</h3>
+      </Text>
+      {shouldShowHDPaths ? renderHdPathSelector() : null}
+      <Text
+        asChild
+        variant={TextVariant.HeadingSm}
+        className="hw-connect__hdPath__title"
+      >
+        <h3>{t('selectAnAccount')}</h3>
+      </Text>
+    </Box>
+  );
+
+  const renderAccounts = () => (
+    <Box className="hw-account-list">
+      {accounts.map((account, idx) => {
+        const accountAlreadyConnected = connectedAccounts.includes(
+          account.address.toLowerCase(),
+        );
+        const value = account.index;
+        const checked =
+          selectedAccounts.includes(account.index) || accountAlreadyConnected;
+        const accountLink = getAccountLink(account.address, chainId, rpcPrefs);
+        const blockExplorerDomain = getURLHostName(accountLink);
+
+        return (
+          <Box
+            className="hw-account-list__item"
+            key={account.address}
+            data-testid="hw-account-list__item"
+            title={
+              accountAlreadyConnected
+                ? (t('selectAnAccountAlreadyConnected') as string)
+                : ''
+            }
+          >
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              className="hw-account-list__item__checkbox"
+            >
+              <Checkbox
+                id={`address-${idx}`}
+                isSelected={checked}
+                isDisabled={accountAlreadyConnected}
+                onChange={() => {
+                  onAccountChange(value);
+                }}
+                label={
+                  <Box asChild className="hw-account-list__item__label">
+                    <span>
+                      <Text
+                        asChild
+                        variant={TextVariant.BodySm}
+                        className="hw-account-list__item__index"
+                      >
+                        <span>{account.index + 1}</span>
+                      </Text>
+                      {`${account.address.slice(0, 4)}...${account.address.slice(
+                        -4,
+                      )}`}
+                      <Text
+                        asChild
+                        variant={TextVariant.BodySm}
+                        className="hw-account-list__item__balance"
+                      >
+                        <span>{account.balance}</span>
+                      </Text>
+                    </span>
+                  </Box>
+                }
+              />
+            </Box>
+            <ButtonIcon
+              className="hw-account-list__item__link"
+              onClick={() => {
+                trackEvent({
+                  category: MetaMetricsEventCategory.Accounts,
+                  event: 'Clicked Block Explorer Link',
+                  properties: {
+                    actions: 'Hardware Connect',
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    link_type: 'Account Tracker',
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    block_explorer_domain: blockExplorerDomain,
+                  },
+                });
+                global.platform.openTab({
+                  url: accountLink,
+                });
+              }}
+              ariaLabel={
+                t('genericExplorerView', [blockExplorerDomain]) as string
+              }
+              iconName={IconName.Export}
+              size={ButtonIconSize.Sm}
+              title={t('genericExplorerView', [blockExplorerDomain]) as string}
+            />
+          </Box>
+        );
+      })}
+    </Box>
+  );
+
+  const renderPagination = () => (
+    <Box flexDirection={BoxFlexDirection.Row} className="hw-list-pagination">
+      <TextButton
+        className="hw-list-pagination__button"
+        isDisabled={isFirstPage}
+        onClick={goToPreviousPage}
+        data-testid="hw-list-pagination__prev-button"
+      >
+        {`< ${t('prev')}`}
+      </TextButton>
+      <TextButton className="hw-list-pagination__button" onClick={goToNextPage}>
+        {`${t('next')} >`}
+      </TextButton>
+    </Box>
+  );
+
+  const renderButtons = () => {
+    const disabled = selectedAccounts.length === 0;
+
+    return (
+      <Box className="new-external-account-form__buttons">
+        <Button
+          data-testid="connect-hardware-account-list-cancel-btn"
+          variant={ButtonVariant.Secondary}
+          size={ButtonSize.Lg}
+          isFullWidth
+          onClick={onCancel}
+        >
+          {t('cancel')}
+        </Button>
+        <Button
+          data-testid="connect-hardware-account-list-unlock-btn"
+          variant={ButtonVariant.Primary}
+          size={ButtonSize.Lg}
+          isFullWidth
+          className="new-external-account-form__button unlock"
+          isDisabled={disabled}
+          onClick={() => onUnlockAccounts(device, selectedPath)}
+        >
+          {t('unlock')}
+        </Button>
+      </Box>
+    );
+  };
+
+  const renderForgetDevice = () => (
+    <Box className="hw-forget-device-container">
+      <TextButton
+        data-testid="hardware-forget-device-button"
+        onClick={() => onForgetDevice(device, selectedPath)}
+      >
+        {t('forgetDevice')}
+      </TextButton>
+    </Box>
+  );
+
+  return (
+    <Box className="new-external-account-form account-list">
+      {renderHeader()}
+      {renderAccounts()}
+      {renderPagination()}
+      {renderButtons()}
+      {renderForgetDevice()}
+    </Box>
+  );
+};
+
+export default AccountList;
diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
deleted file mode 100644
index 6a52b957e02e..000000000000
--- a/ui/pages/create-account/connect-hardware/index.js
+++ /dev/null
@@ -1,663 +0,0 @@
-'use no memo';
-// TODO: Enable React Compiler once this has been migrated to a functional component.
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { QrScanRequestType } from '@metamask/eth-qr-keyring';
-import { ErrorCode } from '@metamask/hw-wallet-sdk';
-import * as actions from '../../../store/actions';
-import { getCurrentChainId } from '../../../../shared/lib/selectors/networks';
-import {
-  getMetaMaskAccounts,
-  getRpcPrefsForCurrentProvider,
-  getMetaMaskAccountsConnected,
-  getActiveQrCodeScanRequest,
-} from '../../../selectors';
-import { formatBalance } from '../../../helpers/utils/util';
-import { getMostRecentOverviewPage } from '../../../ducks/history/history';
-import { SECOND } from '../../../../shared/constants/time';
-import {
-  HardwareDeviceNames,
-  LedgerTransportTypes,
-  U2F_ERROR,
-  LEDGER_ERRORS_CODES,
-  LEDGER_LIVE_PATH,
-  MEW_PATH,
-  BIP44_PATH,
-  LATTICE_STANDARD_BIP44_PATH,
-  LATTICE_LEDGER_LIVE_PATH,
-  LATTICE_MEW_PATH,
-  TREZOR_TESTNET_PATH,
-  DEVICE_KEYRING_MAP,
-} from '../../../../shared/constants/hardware-wallets';
-import {
-  BUTTON_VARIANT,
-  BUTTON_SIZES,
-  Button,
-  Text,
-} from '../../../components/component-library';
-import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
-import { TextColor } from '../../../helpers/constants/design-system';
-import { getHDEntropyIndex } from '../../../selectors/selectors';
-import withRouterHooks from '../../../helpers/higher-order-components/with-router-hooks/with-router-hooks';
-import { KeyringType } from '../../../../shared/constants/keyring';
-import {
-  MetaMetricsEventAccountType,
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../shared/constants/metametrics';
-import {
-  toHardwareWalletError,
-  HardwareWalletType,
-} from '../../../contexts/hardware-wallets';
-import AccountList from './account-list';
-import SelectHardware from './select-hardware';
-import { capitalizeStr } from './utils';
-
-export const LEDGER_HD_PATHS = [
-  { name: 'Ledger Live', value: LEDGER_LIVE_PATH },
-  { name: 'Legacy (MEW / MyCrypto)', value: MEW_PATH },
-  { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
-];
-
-export const LATTICE_HD_PATHS = [
-  {
-    name: `Standard (${LATTICE_STANDARD_BIP44_PATH})`,
-    value: LATTICE_STANDARD_BIP44_PATH,
-  },
-  {
-    name: `Ledger Live (${LATTICE_LEDGER_LIVE_PATH})`,
-    value: LATTICE_LEDGER_LIVE_PATH,
-  },
-  { name: `Ledger Legacy (${LATTICE_MEW_PATH})`, value: LATTICE_MEW_PATH },
-];
-
-export const TREZOR_HD_PATHS = [
-  { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
-  { name: `Legacy (Ledger / MEW / MyCrypto)`, value: MEW_PATH },
-  { name: `Trezor Testnets`, value: TREZOR_TESTNET_PATH },
-];
-
-const HD_PATHS = {
-  ledger: LEDGER_HD_PATHS,
-  lattice: LATTICE_HD_PATHS,
-  trezor: TREZOR_HD_PATHS,
-  oneKey: TREZOR_HD_PATHS,
-};
-
-const getErrorMessage = (errorCode, t) => {
-  const errorCodeLocalized = LEDGER_ERRORS_CODES[errorCode];
-  if (errorCodeLocalized !== undefined) {
-    return t(errorCodeLocalized);
-  }
-
-  return errorCode;
-};
-
-class ConnectHardwareForm extends Component {
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  state = {
-    error: null,
-    selectedAccounts: [],
-    accounts: [],
-    browserSupported: true,
-    unlocked: false,
-    device: null,
-    isFirefox: false,
-  };
-
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    const { accounts } = nextProps;
-    const newAccounts = this.state.accounts.map((a) => {
-      const normalizedAddress = a.address.toLowerCase();
-      const balanceValue = accounts[normalizedAddress]?.balance || null;
-      a.balance = balanceValue ? formatBalance(balanceValue, 6) : '...';
-      return a;
-    });
-
-    this.setState({ accounts: newAccounts });
-  }
-
-  componentDidMount() {
-    this.checkIfUnlocked();
-    const useAgent = window.navigator.userAgent;
-    if (/Firefox/u.test(useAgent)) {
-      this.setState({ isFirefox: true });
-    }
-  }
-
-  componentDidUpdate(prevProps) {
-    const prevScanRequest = prevProps.activeQrCodeScanRequest;
-    const currentScanRequest = this.props.activeQrCodeScanRequest;
-
-    // When the sidebar redirects to fullscreen for camera permissions during
-    // QR hardware wallet pairing, the original connectHardware caller is lost.
-    // Detect when a PAIR scan completes and fetch accounts from the
-    // now-initialized keyring.
-    if (
-      prevScanRequest?.type === QrScanRequestType.PAIR &&
-      !currentScanRequest &&
-      this.state.accounts.length === 0 &&
-      !this.state.device
-    ) {
-      const hdPath = this.props.defaultHdPaths[HardwareDeviceNames.qr];
-      this.props
-        .checkHardwareStatus(HardwareDeviceNames.qr, hdPath)
-        .then((isUnlocked) => {
-          if (
-            isUnlocked &&
-            this.state.accounts.length === 0 &&
-            !this.state.device
-          ) {
-            this.setState({ device: HardwareDeviceNames.qr });
-            this.getPage(HardwareDeviceNames.qr, 0, hdPath);
-          }
-        })
-        .catch((e) => {
-          const errorMessage = typeof e === 'string' ? e : e.message;
-          this.setState({ error: errorMessage });
-        });
-    }
-  }
-
-  /**
-   * We use this method to get all connected hardware wallets. This is just a workaround for
-   * the moment since, ideally, we should record all connected devices because we can have
-   * multiple devices using the same keyring.
-   *
-   * @returns {Array} Array of hardware wallet keyrings
-   */
-  getHardwareWalletKeyrings() {
-    const { keyrings } = this.props;
-    return keyrings.filter(
-      (keyring) =>
-        [
-          KeyringType.ledger,
-          KeyringType.trezor,
-          KeyringType.lattice,
-          KeyringType.qr,
-          KeyringType.oneKey,
-        ].includes(keyring.type) && keyring.accounts.length > 0,
-    );
-  }
-
-  async checkIfUnlocked() {
-    for (const device of [
-      HardwareDeviceNames.trezor,
-      HardwareDeviceNames.oneKey,
-      HardwareDeviceNames.ledger,
-      HardwareDeviceNames.lattice,
-    ]) {
-      const path = this.props.defaultHdPaths[device];
-      const unlocked = await this.props.checkHardwareStatus(device, path);
-      if (unlocked && this.state.device) {
-        this.setState({ unlocked: true });
-        this.getPage(device, 0, path);
-      }
-    }
-  }
-
-  connectToHardwareWallet = (device) => {
-    this.setState({ device });
-    if (this.state.accounts.length) {
-      return;
-    }
-
-    // Default values
-    const deviceCount = this.getHardwareWalletKeyrings().length;
-
-    this.context.trackEvent({
-      event: MetaMetricsEventName.ConnectHardwareWalletClicked,
-      properties: {
-        device_type: capitalizeStr(device),
-        connected_device_count: deviceCount,
-      },
-    });
-
-    this.getPage(device, 0, this.props.defaultHdPaths[device], true);
-  };
-
-  onPathChange = (path) => {
-    this.props.setHardwareWalletDefaultHdPath({
-      device: this.state.device,
-      path,
-    });
-    this.setState({
-      selectedAccounts: [],
-    });
-    this.getPage(this.state.device, 0, path);
-  };
-
-  onAccountChange = (account) => {
-    let { selectedAccounts } = this.state;
-    if (selectedAccounts.includes(account)) {
-      selectedAccounts = selectedAccounts.filter((acc) => account !== acc);
-    } else {
-      selectedAccounts.push(account);
-    }
-    this.setState({ selectedAccounts, error: null });
-  };
-
-  onAccountRestriction = () => {
-    this.setState({ error: this.context.t('ledgerAccountRestriction') });
-  };
-
-  showTemporaryAlert() {
-    this.props.showAlert(this.context.t('hardwareWalletConnected'));
-    // Autohide the alert after 5 seconds
-    setTimeout((_) => {
-      this.props.hideAlert();
-    }, SECOND * 5);
-  }
-
-  getPage = (device, page, hdPath, loadHid) => {
-    this.props
-      .connectHardware(device, page, hdPath, loadHid, this.context.t)
-      .then((accounts) => {
-        if (accounts.length) {
-          // If we just loaded the accounts for the first time
-          // (device previously locked) show the global alert
-          if (this.state.accounts.length === 0 && !this.state.unlocked) {
-            this.showTemporaryAlert();
-          }
-
-          // Map accounts with balances
-          const newAccounts = accounts.map((account) => {
-            const normalizedAddress = account.address.toLowerCase();
-            const balanceValue =
-              this.props.accounts[normalizedAddress]?.balance || null;
-            account.balance = balanceValue
-              ? formatBalance(balanceValue, 6)
-              : '...';
-            return account;
-          });
-
-          this.setState({
-            accounts: newAccounts,
-            unlocked: true,
-            device,
-            error: null,
-          });
-        }
-      })
-      .catch((e) => {
-        const errorMessage = typeof e === 'string' ? e : e.message;
-
-        // Use shared Ledger error mapping (hw-wallet-sdk) when connecting to Ledger
-        if (device === HardwareDeviceNames.ledger) {
-          const hwError = toHardwareWalletError(e, HardwareWalletType.Ledger);
-
-          if (
-            hwError.code !== ErrorCode.Unknown &&
-            hwError.code !== ErrorCode.ConnectionClosed
-          ) {
-            this.setState({ error: hwError.userMessage });
-            return;
-          }
-        }
-
-        const ledgerErrorCode = Object.keys(LEDGER_ERRORS_CODES).find(
-          (errorCode) => errorMessage.includes(errorCode),
-        );
-        if (errorMessage === 'Window blocked') {
-          this.setState({ browserSupported: false, error: null });
-        } else if (errorMessage.includes(U2F_ERROR)) {
-          this.setState({ error: U2F_ERROR });
-        } else if (
-          errorMessage === 'LEDGER_LOCKED' ||
-          errorMessage === 'LEDGER_WRONG_APP'
-        ) {
-          this.setState({
-            error: this.context.t('ledgerLocked'),
-          });
-        } else if (errorMessage.includes('timeout')) {
-          this.setState({
-            error: this.context.t('ledgerTimeout'),
-          });
-        } else if (ledgerErrorCode) {
-          this.setState({
-            error: `${errorMessage} - ${getErrorMessage(
-              ledgerErrorCode,
-              this.context.t,
-            )}`,
-          });
-        } else if (
-          errorMessage
-            .toLowerCase()
-            .includes(
-              'KeystoneError#pubkey_account.no_expected_account'.toLowerCase(),
-            )
-        ) {
-          this.setState({
-            error: this.context.t('QRHardwarePubkeyAccountOutOfRange'),
-          });
-        } else if (
-          errorMessage !== 'Window closed' &&
-          errorMessage !== 'Popup closed' &&
-          errorMessage
-            .toLowerCase()
-            .includes('KeystoneError#sync_cancel'.toLowerCase()) === false
-        ) {
-          this.setState({
-            error: errorMessage,
-          });
-        }
-      });
-  };
-
-  onForgetDevice = (device, hdPath) => {
-    const { trackEvent } = this.context;
-    const { forgetDevice } = this.props;
-
-    forgetDevice(device)
-      .then((_) => {
-        trackEvent({
-          event: MetaMetricsEventName.HardwareWalletForgotten,
-          properties: {
-            device_type: capitalizeStr(device),
-          },
-        });
-
-        this.setState({
-          error: null,
-          selectedAccounts: [],
-          accounts: [],
-          unlocked: false,
-        });
-      })
-      .catch((e) => {
-        trackEvent({
-          event: MetaMetricsEventName.HardwareWalletConnectionFailed,
-          properties: {
-            hd_path: hdPath,
-            device_type: capitalizeStr(device),
-            error: e.message,
-          },
-        });
-
-        this.setState({ error: e.message });
-      });
-  };
-
-  onUnlockAccounts = async (deviceName, path) => {
-    const {
-      navigate,
-      mostRecentOverviewPage,
-      unlockHardwareWalletAccounts,
-      hdEntropyIndex,
-    } = this.props;
-    const { selectedAccounts } = this.state;
-    const { trackEvent } = this.context;
-
-    if (selectedAccounts.length === 0) {
-      this.setState({ error: this.context.t('accountSelectionRequired') });
-    }
-
-    const description =
-      MEW_PATH === path
-        ? this.context.t('hardwareWalletLegacyDescription')
-        : '';
-
-    return unlockHardwareWalletAccounts(
-      selectedAccounts,
-      deviceName,
-      path || null,
-      description,
-    )
-      .then((_) => {
-        // Legacy event. Keeping it in case we have dashboards depending on it.
-        this.context.trackEvent({
-          category: MetaMetricsEventCategory.Accounts,
-          event: MetaMetricsEventName.AccountAdded,
-          properties: {
-            account_type: MetaMetricsEventAccountType.Hardware,
-            // For now we keep using the device name to avoid any discrepancies with our current metrics.
-            // TODO: This will be addressed later, see: https://github.com/MetaMask/metamask-extension/issues/29777
-            account_hardware_type: deviceName,
-            is_suggested_name: true,
-          },
-        });
-
-        const connectedDevices = this.getHardwareWalletKeyrings();
-        const deviceCount = connectedDevices.length;
-
-        const isAlreadyConnected = connectedDevices.some((keyring) => {
-          return keyring.type === DEVICE_KEYRING_MAP[deviceName];
-        });
-
-        trackEvent({
-          event: MetaMetricsEventName.HardwareWalletAccountConnected,
-          properties: {
-            device_type: capitalizeStr(deviceName),
-            hd_path: path,
-            connected_device_count: isAlreadyConnected
-              ? deviceCount
-              : deviceCount + 1,
-          },
-        });
-
-        navigate(mostRecentOverviewPage);
-      })
-      .catch((e) => {
-        // Legacy event. Keeping it in case we have dashboards depending on it.
-        this.context.trackEvent({
-          category: MetaMetricsEventCategory.Accounts,
-          event: MetaMetricsEventName.AccountAddFailed,
-          properties: {
-            account_type: MetaMetricsEventAccountType.Hardware,
-            // See comment above about `account_hardware_type`.
-            account_hardware_type: deviceName,
-            error: e.message,
-            hd_entropy_index: hdEntropyIndex,
-          },
-        });
-
-        trackEvent({
-          event: MetaMetricsEventName.HardwareWalletConnectionFailed,
-          properties: {
-            hd_path: path,
-            device_type: capitalizeStr(deviceName),
-            error: e.message,
-          },
-        });
-        this.setState({ error: e.message });
-      });
-  };
-
-  onCancel = () => {
-    const { navigate, mostRecentOverviewPage } = this.props;
-    navigate(mostRecentOverviewPage);
-  };
-
-  renderError() {
-    if (this.state.error === U2F_ERROR) {
-      if (this.state.device === 'ledger' && this.state.isFirefox) {
-        return (
-          <>
-            <Text color={TextColor.warningDefault} margin={[5, 5, 2]}>
-              {this.context.t('troubleConnectingToLedgerU2FOnFirefox', [
-                <Button
-                  variant={BUTTON_VARIANT.LINK}
-                  href={ZENDESK_URLS.HARDWARE_CONNECTION}
-                  size={BUTTON_SIZES.INHERIT}
-                  key="u2f-error-1"
-                  as="a"
-                  block={false}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {this.context.t('troubleConnectingToLedgerU2FOnFirefox2')}
-                </Button>,
-              ])}
-            </Text>
-            <Text color={TextColor.warningDefault} margin={[5, 5, 2]}>
-              {this.context.t(
-                'troubleConnectingToLedgerU2FOnFirefoxLedgerSolution',
-                [
-                  <Button
-                    variant={BUTTON_VARIANT.LINK}
-                    href={ZENDESK_URLS.LEDGER_FIREFOX_U2F_GUIDE}
-                    size={BUTTON_SIZES.INHERIT}
-                    key="u2f-error-1"
-                    as="a"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {this.context.t(
-                      'troubleConnectingToLedgerU2FOnFirefoxLedgerSolution2',
-                    )}
-                  </Button>,
-                ],
-              )}
-            </Text>
-          </>
-        );
-      }
-      return (
-        <Text color={TextColor.warningDefault} margin={[5, 5, 2]}>
-          {this.context.t('troubleConnectingToWallet', [
-            this.state.device,
-
-            <Button
-              variant={BUTTON_VARIANT.LINK}
-              href={ZENDESK_URLS.HARDWARE_CONNECTION}
-              key="u2f-error-1"
-            >
-              {this.context.t('walletConnectionGuide')}
-            </Button>,
-          ])}
-        </Text>
-      );
-    }
-    return this.state.error ? (
-      <span className="hw-connect__error">{this.state.error}</span>
-    ) : null;
-  }
-
-  renderContent() {
-    if (!this.state.accounts.length) {
-      return (
-        <SelectHardware
-          connectToHardwareWallet={this.connectToHardwareWallet}
-          browserSupported={this.state.browserSupported}
-          ledgerTransportType={this.props.ledgerTransportType}
-          onCancel={this.onCancel}
-        />
-      );
-    }
-
-    return (
-      <AccountList
-        onPathChange={this.onPathChange}
-        selectedPath={this.props.defaultHdPaths[this.state.device]}
-        device={this.state.device}
-        accounts={this.state.accounts}
-        connectedAccounts={this.props.connectedAccounts}
-        selectedAccounts={this.state.selectedAccounts}
-        onAccountChange={this.onAccountChange}
-        chainId={this.props.chainId}
-        rpcPrefs={this.props.rpcPrefs}
-        getPage={this.getPage}
-        onUnlockAccounts={this.onUnlockAccounts}
-        onForgetDevice={this.onForgetDevice}
-        onCancel={this.onCancel}
-        onAccountRestriction={this.onAccountRestriction}
-        hdPaths={HD_PATHS}
-      />
-    );
-  }
-
-  render() {
-    return (
-      <>
-        {this.renderError()}
-        {this.renderContent()}
-      </>
-    );
-  }
-}
-
-ConnectHardwareForm.propTypes = {
-  connectHardware: PropTypes.func,
-  checkHardwareStatus: PropTypes.func,
-  forgetDevice: PropTypes.func,
-  showAlert: PropTypes.func,
-  hideAlert: PropTypes.func,
-  unlockHardwareWalletAccounts: PropTypes.func,
-  setHardwareWalletDefaultHdPath: PropTypes.func,
-  navigate: PropTypes.func,
-  chainId: PropTypes.string,
-  rpcPrefs: PropTypes.object,
-  accounts: PropTypes.object,
-  connectedAccounts: PropTypes.array.isRequired,
-  defaultHdPaths: PropTypes.object,
-  mostRecentOverviewPage: PropTypes.string.isRequired,
-  ledgerTransportType: PropTypes.oneOf(Object.values(LedgerTransportTypes)),
-  hdEntropyIndex: PropTypes.number,
-  keyrings: PropTypes.array.isRequired,
-  activeQrCodeScanRequest: PropTypes.object,
-};
-
-const mapStateToProps = (state) => ({
-  chainId: getCurrentChainId(state),
-  rpcPrefs: getRpcPrefsForCurrentProvider(state),
-  accounts: getMetaMaskAccounts(state),
-  connectedAccounts: getMetaMaskAccountsConnected(state),
-  defaultHdPaths: state.appState.defaultHdPaths,
-  mostRecentOverviewPage: getMostRecentOverviewPage(state),
-  ledgerTransportType: state.metamask.ledgerTransportType,
-  hdEntropyIndex: getHDEntropyIndex(state),
-  keyrings: state.metamask.keyrings,
-  activeQrCodeScanRequest: getActiveQrCodeScanRequest(state),
-});
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    setHardwareWalletDefaultHdPath: ({ device, path }) => {
-      return dispatch(actions.setHardwareWalletDefaultHdPath({ device, path }));
-    },
-    connectHardware: (deviceName, page, hdPath, loadHid, t) => {
-      return dispatch(
-        actions.connectHardware(deviceName, page, hdPath, loadHid, t),
-      );
-    },
-    checkHardwareStatus: (deviceName, hdPath) => {
-      return dispatch(actions.checkHardwareStatus(deviceName, hdPath));
-    },
-    forgetDevice: (deviceName) => {
-      return dispatch(actions.forgetDevice(deviceName));
-    },
-    unlockHardwareWalletAccounts: (
-      indexes,
-      deviceName,
-      hdPath,
-      hdPathDescription,
-    ) => {
-      return dispatch(
-        actions.unlockHardwareWalletAccounts(
-          indexes,
-          deviceName,
-          hdPath,
-          hdPathDescription,
-        ),
-      );
-    },
-    showAlert: (msg) => dispatch(actions.showAlert(msg)),
-    hideAlert: () => dispatch(actions.hideAlert()),
-  };
-};
-
-ConnectHardwareForm.contextTypes = {
-  t: PropTypes.func,
-  trackEvent: PropTypes.func,
-};
-
-export default compose(
-  withRouterHooks,
-  connect(mapStateToProps, mapDispatchToProps),
-)(ConnectHardwareForm);
diff --git a/ui/pages/create-account/connect-hardware/index.test.tsx b/ui/pages/create-account/connect-hardware/index.test.tsx
index 989d9a00ef0e..ee4c422be67e 100644
--- a/ui/pages/create-account/connect-hardware/index.test.tsx
+++ b/ui/pages/create-account/connect-hardware/index.test.tsx
@@ -1,23 +1,41 @@
-import { act, fireEvent, waitFor } from '@testing-library/react';
+import {
+  act,
+  cleanup,
+  fireEvent,
+  waitFor,
+  screen,
+} from '@testing-library/react';
 import thunk from 'redux-thunk';
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
-import { useNavigate } from 'react-router-dom';
-import { QrScanRequestType } from '@metamask/eth-qr-keyring';
 
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
-import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
+import { tEn } from '../../../../test/lib/i18n-helpers';
 import {
   LedgerTransportTypes,
   HardwareDeviceNames,
+  LEDGER_LIVE_PATH,
+  MEW_PATH,
+  BIP44_PATH,
+  LATTICE_STANDARD_BIP44_PATH,
+  LATTICE_LEDGER_LIVE_PATH,
+  LATTICE_MEW_PATH,
+  TREZOR_TESTNET_PATH,
 } from '../../../../shared/constants/hardware-wallets';
 import { mockNetworkState } from '../../../../test/stub/networks';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
-import ConnectHardwareForm from '.';
+import ConnectHardwareForm, {
+  LEDGER_HD_PATHS,
+  LATTICE_HD_PATHS,
+  TREZOR_HD_PATHS,
+} from '.';
 
 const mockConnectHardware = jest.fn();
 const mockConnectHardwareAction = jest.fn();
 const mockCheckHardwareStatus = jest.fn().mockResolvedValue(false);
+const mockForgetDevice = jest.fn().mockResolvedValue(undefined);
+const mockUnlockHardwareWalletAccountsAction = jest.fn();
+const mockUnlockHardwareWalletAccounts = jest.fn().mockResolvedValue(undefined);
 
 jest.mock('../../../store/actions', () => ({
   connectHardware: (...args: unknown[]) => {
@@ -25,6 +43,16 @@ jest.mock('../../../store/actions', () => ({
     return mockConnectHardware;
   },
   checkHardwareStatus: () => mockCheckHardwareStatus,
+  forgetDevice: () => mockForgetDevice,
+  showAlert: () => ({ type: 'SHOW_ALERT', payload: '' }),
+  hideAlert: () => ({ type: 'HIDE_ALERT' }),
+  unlockHardwareWalletAccounts: (...args: unknown[]) => {
+    mockUnlockHardwareWalletAccountsAction(...args);
+    return mockUnlockHardwareWalletAccounts;
+  },
+  setHardwareWalletDefaultHdPath: () => ({
+    type: 'SET_HARDWARE_WALLET_DEFAULT_HD_PATH',
+  }),
 }));
 
 const mockGetActiveQrCodeScanRequest = jest.fn().mockReturnValue(null);
@@ -32,9 +60,7 @@ const mockGetActiveQrCodeScanRequest = jest.fn().mockReturnValue(null);
 jest.mock('../../../selectors', () => ({
   getCurrentChainId: () => '0x1',
   getSelectedAddress: () => '0xselectedAddress',
-  getRpcPrefsForCurrentProvider: () => {
-    return {};
-  },
+  getRpcPrefsForCurrentProvider: () => ({}),
   getMetaMaskAccountsConnected: () => [],
   getMetaMaskAccounts: () => {
     return {};
@@ -66,140 +92,272 @@ jest.mock('react-router-dom', () => ({
   useParams: () => ({}),
 }));
 
-const mockTrackEvent = jest.fn();
-
-const mockProps = {
-  forgetDevice: () => jest.fn(),
-  showAlert: () => jest.fn(),
-  hideAlert: () => jest.fn(),
-  unlockHardwareWalletAccount: () => jest.fn(),
-  setHardwareWalletDefaultHdPath: () => jest.fn(),
-  connectHardware: () => mockConnectHardware,
-  defaultHdPath: "m/44'/60'/0'/0",
-  mostRecentOverviewPage: MOCK_RECENT_PAGE,
-  trackEvent: () => mockTrackEvent,
-};
-
-const mockState = {
-  metamask: {
-    ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
-    internalAccounts: {
-      accounts: {
-        accountId: {
-          address: '0x0000000000000000000000000000000000000000',
-          metadata: {
-            keyring: 'HD Key Tree',
+const DEFAULT_HD_PATH = "m/44'/60'/0'/0";
+
+function createMockState(overrides?: Record<string, unknown>) {
+  return {
+    metamask: {
+      ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
+      internalAccounts: {
+        accounts: {
+          accountId: {
+            address: '0x0000000000000000000000000000000000000000',
+            metadata: { keyring: 'HD Key Tree' },
           },
         },
+        selectedAccount: 'accountId',
       },
-      selectedAccount: 'accountId',
+      keyrings: [
+        {
+          type: 'HD Key Tree',
+          accounts: ['0x0000000000000000000000000000000000000000'],
+        },
+      ],
+      ledgerTransportType: LedgerTransportTypes.webhid,
     },
-    keyrings: [
-      {
-        type: 'HD Key Tree',
-        accounts: ['0x0000000000000000000000000000000000000000'],
+    appState: {
+      networkDropdownOpen: false,
+      gasIsLoading: false,
+      isLoading: false,
+      modal: {
+        open: false,
+        modalState: { name: null, props: {} },
+        previousModalState: { name: null },
       },
-    ],
-  },
-  appState: {
-    networkDropdownOpen: false,
-    gasIsLoading: false,
-    isLoading: false,
-    modal: {
-      open: false,
-      modalState: {
-        name: null,
-        props: {},
+      warning: null,
+      chainId: '0x1',
+      rpcPrefs: null,
+      accounts: [],
+      connectedAccounts: [],
+      defaultHdPaths: {
+        [HardwareDeviceNames.lattice]: DEFAULT_HD_PATH,
+        [HardwareDeviceNames.ledger]: DEFAULT_HD_PATH,
+        [HardwareDeviceNames.oneKey]: DEFAULT_HD_PATH,
+        [HardwareDeviceNames.trezor]: DEFAULT_HD_PATH,
       },
-      previousModalState: {
-        name: null,
-      },
-    },
-    warning: null,
-    chainId: '0x1',
-    rpcPrefs: null,
-    accounts: [],
-    connectedAccounts: [],
-    defaultHdPaths: {
-      [HardwareDeviceNames.lattice]: "m/44'/60'/0'/0",
-      [HardwareDeviceNames.ledger]: "m/44'/60'/0'/0",
-      [HardwareDeviceNames.oneKey]: "m/44'/60'/0'/0",
-      [HardwareDeviceNames.trezor]: "m/44'/60'/0'/0",
+      mostRecentOverviewPage: '',
+      ledgerTransportType: LedgerTransportTypes.webhid,
     },
-    mostRecentOverviewPage: '',
-    ledgerTransportType: LedgerTransportTypes.webhid,
-  },
-};
+    ...overrides,
+  };
+}
+
+const MOCK_ACCOUNTS = [
+  { address: '0xAddress1', balance: null, index: 0 },
+  { address: '0xAddress2', balance: null, index: 1 },
+  { address: '0xAddress3', balance: null, index: 2 },
+  { address: '0xAddress4', balance: null, index: 3 },
+  { address: '0xAddress5', balance: null, index: 4 },
+];
+
+function connectToDevice(labelText: string) {
+  const deviceButton = screen.getByLabelText(labelText);
+  const continueButton = screen.getByText(tEn('continue'));
+  fireEvent.click(deviceButton);
+  fireEvent.click(continueButton);
+}
 
 describe('ConnectHardwareForm', () => {
-  const mockStore = configureMockStore([thunk])(mockState);
-
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  it('matchs snapshot', () => {
-    const { container } = renderWithProvider(
-      <ConnectHardwareForm {...mockProps} />,
-      mockStore,
-    );
+  describe('exported HD path constants', () => {
+    it('exports LEDGER_HD_PATHS with correct entries', () => {
+      expect(LEDGER_HD_PATHS).toStrictEqual([
+        { name: 'Ledger Live', value: LEDGER_LIVE_PATH },
+        { name: 'Legacy (MEW / MyCrypto)', value: MEW_PATH },
+        {
+          name: `BIP44 Standard (e.g. MetaMask, Trezor)`,
+          value: BIP44_PATH,
+        },
+      ]);
+    });
 
-    expect(container).toMatchSnapshot();
-  });
+    it('exports LATTICE_HD_PATHS with correct entries', () => {
+      expect(LATTICE_HD_PATHS).toStrictEqual([
+        {
+          name: `Standard (${LATTICE_STANDARD_BIP44_PATH})`,
+          value: LATTICE_STANDARD_BIP44_PATH,
+        },
+        {
+          name: `Ledger Live (${LATTICE_LEDGER_LIVE_PATH})`,
+          value: LATTICE_LEDGER_LIVE_PATH,
+        },
+        {
+          name: `Ledger Legacy (${LATTICE_MEW_PATH})`,
+          value: LATTICE_MEW_PATH,
+        },
+      ]);
+    });
 
-  it('verifies mocks are working', () => {
-    // Test that our mock is working
-    const navigate = useNavigate();
-    navigate('/test');
-    expect(mockUseNavigate).toHaveBeenCalledWith('/test');
+    it('exports TREZOR_HD_PATHS with correct entries', () => {
+      expect(TREZOR_HD_PATHS).toStrictEqual([
+        {
+          name: `BIP44 Standard (e.g. MetaMask, Trezor)`,
+          value: BIP44_PATH,
+        },
+        { name: `Legacy (Ledger / MEW / MyCrypto)`, value: MEW_PATH },
+        { name: `Trezor Testnets`, value: TREZOR_TESTNET_PATH },
+      ]);
+    });
   });
 
-  it('closes the form when close button is clicked', () => {
-    const { getByTestId } = renderWithProvider(
-      <ConnectHardwareForm {...mockProps} />,
-      mockStore,
-    );
+  describe('initial render', () => {
+    it('render matches snapshot', () => {
+      const mockStore = configureMockStore([thunk])(createMockState());
+      const { container } = renderWithProvider(
+        <ConnectHardwareForm />,
+        mockStore,
+      );
+      expect(container).toMatchSnapshot();
+    });
 
-    const closeButton = getByTestId('hardware-connect-close-btn');
+    it('renders SelectHardware when no accounts are loaded', () => {
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+      expect(screen.getByText(tEn('hardwareWallets'))).toBeInTheDocument();
+    });
 
-    fireEvent.click(closeButton);
+    it('does not auto-select or auto-connect a device on mount', async () => {
+      mockCheckHardwareStatus.mockReset().mockResolvedValue(true);
+      mockConnectHardware.mockReset();
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-    expect(mockUseNavigate).toHaveBeenCalledTimes(1);
-    expect(mockUseNavigate).toHaveBeenCalledWith(MOCK_RECENT_PAGE);
-  });
+      expect(mockCheckHardwareStatus).not.toHaveBeenCalled();
+      expect(mockConnectHardwareAction).not.toHaveBeenCalled();
+      expect(screen.getByText(tEn('hardwareWallets'))).toBeInTheDocument();
+    });
 
-  describe('U2F Error', () => {
-    it('renders a U2F error', async () => {
-      mockConnectHardware.mockRejectedValue(new Error('U2F Error'));
-      const mockStateWithU2F = Object.assign(mockState, {});
-      mockStateWithU2F.appState.ledgerTransportType = LedgerTransportTypes.u2f;
-      const mockStoreWithU2F = configureMockStore([thunk])(mockStateWithU2F);
-      const { getByText, getByLabelText, queryByText } = renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        mockStoreWithU2F,
-      );
+    it('ignores stale account fetches after a newer device selection starts', async () => {
+      let resolveLedgerFetch: (
+        value: { address: string; index: number }[],
+      ) => void;
+      const deferredLedgerFetch = new Promise<
+        { address: string; index: number }[]
+      >((resolve) => {
+        resolveLedgerFetch = resolve;
+      });
 
-      const ledgerButton = getByLabelText(messages.ledger.message);
-      const continueButton = getByText(messages.continue.message);
+      mockCheckHardwareStatus.mockReset().mockResolvedValue(false);
+      mockConnectHardware
+        .mockReset()
+        .mockImplementationOnce(() => deferredLedgerFetch)
+        .mockResolvedValueOnce([
+          {
+            address: '0x2222222222222222222222222222222222222222',
+            index: 0,
+          },
+        ]);
+
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      fireEvent.click(ledgerButton);
-      fireEvent.click(continueButton);
+      connectToDevice(tEn('ledger'));
+      connectToDevice(tEn('trezor'));
 
       await waitFor(() => {
-        expect(
-          getByText('We had trouble connecting to your ledger, try reviewing', {
-            exact: false,
-          }),
-        ).toBeInTheDocument();
-        const firefoxError = queryByText(
-          "If you're on the latest version of Firefox, you might be experiencing an issue related to Firefox dropping U2F support. Learn how to fix this issue",
-          { exact: false },
-        );
-        expect(firefoxError).not.toBeInTheDocument();
+        const accountItems = screen.getAllByTestId('hw-account-list__item');
+        expect(accountItems).toHaveLength(1);
+        expect(accountItems[0]).toHaveTextContent('0x22...2222');
+      });
+
+      await act(async () => {
+        resolveLedgerFetch?.([
+          {
+            address: '0x1111111111111111111111111111111111111111',
+            index: 0,
+          },
+        ]);
+      });
+
+      await waitFor(() => {
+        const accountItems = screen.getAllByTestId('hw-account-list__item');
+        expect(accountItems).toHaveLength(1);
+        expect(accountItems[0]).toHaveTextContent('0x22...2222');
+        expect(accountItems[0]).not.toHaveTextContent('0x11...1111');
       });
     });
 
-    it('renders a different U2F error for firefox', async () => {
+    it('does not start a duplicate fetch when the same device is selected again while pending', async () => {
+      let resolveLedgerFetch: (
+        value: { address: string; index: number }[],
+      ) => void;
+      const deferredLedgerFetch = new Promise<
+        { address: string; index: number }[]
+      >((resolve) => {
+        resolveLedgerFetch = resolve;
+      });
+
+      mockCheckHardwareStatus.mockReset().mockResolvedValue(false);
+      mockConnectHardware
+        .mockReset()
+        .mockImplementation(() => deferredLedgerFetch);
+      mockConnectHardwareAction.mockClear();
+
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+      connectToDevice(tEn('ledger'));
+
+      expect(
+        mockConnectHardwareAction.mock.calls.filter(
+          (call: unknown[]) => call[0] === HardwareDeviceNames.ledger,
+        ),
+      ).toHaveLength(1);
+
+      await act(async () => {
+        resolveLedgerFetch?.([]);
+      });
+    });
+
+    it('ignores stale rejected fetches after a newer device selection succeeds', async () => {
+      let rejectLedgerFetch: (reason?: Error) => void;
+      const deferredLedgerFetch = new Promise<
+        { address: string; index: number }[]
+      >((_, reject) => {
+        rejectLedgerFetch = reject;
+      });
+
+      mockCheckHardwareStatus.mockReset().mockResolvedValue(false);
+      mockConnectHardware
+        .mockReset()
+        .mockImplementationOnce(() => deferredLedgerFetch)
+        .mockResolvedValueOnce([
+          {
+            address: '0x2222222222222222222222222222222222222222',
+            index: 0,
+          },
+        ]);
+
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+      connectToDevice(tEn('trezor'));
+
+      await waitFor(() => {
+        const accountItems = screen.getAllByTestId('hw-account-list__item');
+        expect(accountItems).toHaveLength(1);
+        expect(accountItems[0]).toHaveTextContent('0x22...2222');
+      });
+
+      await act(async () => {
+        rejectLedgerFetch?.(new Error('stale ledger error'));
+      });
+
+      await waitFor(() => {
+        const accountItems = screen.getAllByTestId('hw-account-list__item');
+        expect(accountItems).toHaveLength(1);
+        expect(accountItems[0]).toHaveTextContent('0x22...2222');
+      });
+
+      expect(screen.queryByText('stale ledger error')).not.toBeInTheDocument();
+    });
+
+    it('detects Firefox user agent on mount', async () => {
       jest
         .spyOn(window.navigator, 'userAgent', 'get')
         .mockReturnValue(
@@ -207,415 +365,560 @@ describe('ConnectHardwareForm', () => {
         );
 
       mockConnectHardware.mockRejectedValue(new Error('U2F Error'));
-      const mockStateWithU2F = Object.assign(mockState, {});
-      mockStateWithU2F.appState.ledgerTransportType = LedgerTransportTypes.u2f;
-      const mockStoreWithU2F = configureMockStore([thunk])(mockStateWithU2F);
-      const { getByText, getByLabelText } = renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        mockStoreWithU2F,
-      );
-
-      const ledgerButton = getByLabelText(messages.ledger.message);
-      const continueButton = getByText(messages.continue.message);
-
-      fireEvent.click(ledgerButton);
-      fireEvent.click(continueButton);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
+      connectToDevice(tEn('ledger'));
       await waitFor(() => {
         expect(
-          getByText(
+          screen.getByText(
             "If you're on the latest version of Firefox, you might be experiencing an issue related to Firefox dropping U2F support. Learn how to fix this issue",
             { exact: false },
           ),
         ).toBeInTheDocument();
       });
+
+      jest.restoreAllMocks();
     });
   });
 
-  describe('QR Hardware Wallet Steps', () => {
-    it('renders the QR hardware wallet steps', async () => {
-      const { getByText, getByLabelText } = renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        mockStore,
-      );
+  describe('onCancel', () => {
+    it('navigates to the most recent overview page', () => {
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      const qrButton = getByLabelText('QRCode');
+      const closeButton = screen.getByTestId('hardware-connect-close-btn');
+      fireEvent.click(closeButton);
 
-      fireEvent.click(qrButton);
+      expect(mockUseNavigate).toHaveBeenCalledWith(MOCK_RECENT_PAGE);
+    });
+  });
+
+  describe('connectToHardwareWallet', () => {
+    it('calls connectHardware when a device is selected', async () => {
+      mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
 
       await waitFor(() => {
-        expect(getByText(messages.keystone.message)).toBeInTheDocument();
-        expect(getByText(messages.airgapVault.message)).toBeInTheDocument();
-        expect(getByText(messages.coolWallet.message)).toBeInTheDocument();
-        expect(getByText(messages.dcent.message)).toBeInTheDocument();
-        expect(getByText(messages.imToken.message)).toBeInTheDocument();
-        expect(
-          getByText(messages.QRHardwareWalletSteps2Description.message),
-        ).toBeInTheDocument();
+        expect(mockConnectHardware).toHaveBeenCalled();
       });
     });
-  });
 
-  describe('Select Hardware', () => {
-    it('checks link buttons for Ngrave Zero brand', async () => {
-      window.open = jest.fn();
+    it('does not call connectHardware again when accounts are already loaded', async () => {
+      mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      const { getByLabelText, getByTestId } = renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        mockStore,
-      );
+      connectToDevice(tEn('trezor'));
 
-      const qrButton = getByLabelText('QRCode');
+      await waitFor(() => {
+        expect(
+          screen.getAllByText(tEn('selectAnAccount')).length,
+        ).toBeGreaterThan(0);
+      });
 
-      fireEvent.click(qrButton);
+      mockConnectHardware.mockClear();
 
-      const buyNowButton = getByTestId('ngrave-brand-buy-now-btn');
-      expect(buyNowButton).toBeInTheDocument();
-      fireEvent.click(buyNowButton);
-      expect(window.open).toHaveBeenCalled();
+      const cancelButton = screen.getByText(tEn('cancel'));
+      expect(cancelButton).toBeInTheDocument();
+    });
 
-      const learnMoreButton = getByTestId('ngrave-brand-learn-more-btn');
-      expect(learnMoreButton).toBeInTheDocument();
-      fireEvent.click(learnMoreButton);
-      expect(window.open).toHaveBeenCalled();
+    it('transitions to account list on successful connection', async () => {
+      mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+
+      await waitFor(() => {
+        expect(
+          screen.getAllByText(tEn('selectAnAccount')).length,
+        ).toBeGreaterThan(0);
+      });
+
+      expect(screen.getAllByTestId('hw-account-list__item')).toHaveLength(5);
     });
   });
 
-  describe('getPage method', () => {
-    beforeEach(() => {
-      mockConnectHardware.mockReset();
+  describe('getPage error handling', () => {
+    it('displays a generic error message', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('Something went wrong'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('trezor'));
+
+      await waitFor(() => {
+        expect(
+          screen.getByText(tEn('hardwareWalletErrorUnknownErrorTitle')),
+        ).toBeInTheDocument();
+      });
     });
 
-    it('calls connectHardware with loadHid=true', async () => {
-      mockConnectHardware.mockReset();
+    it('displays ledgerLocked error for LEDGER_LOCKED', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('LEDGER_LOCKED'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      const mockAccounts = [
-        { address: '0xAddress1', balance: null, index: 0 },
-        { address: '0xAddress2', balance: null, index: 1 },
-      ];
-      mockConnectHardware.mockResolvedValue(mockAccounts);
-
-      renderWithProvider(<ConnectHardwareForm {...mockProps} />, mockStore);
-
-      const hdPath = "m/44'/60'/0'/0";
-      const deviceName = 'ledger';
-      const pageIndex = 0;
-      const loadHidValue = true;
-
-      await mockConnectHardware(
-        deviceName,
-        pageIndex,
-        hdPath,
-        loadHidValue,
-        jest.fn(),
-      );
+      connectToDevice(tEn('ledger'));
 
-      expect(mockConnectHardware).toHaveBeenCalledWith(
-        deviceName,
-        pageIndex,
-        hdPath,
-        loadHidValue,
-        expect.any(Function),
-      );
+      await waitFor(() => {
+        expect(screen.getByText(tEn('ledgerLocked'))).toBeInTheDocument();
+      });
     });
 
-    it('calls connectHardware with loadHid=false', async () => {
-      mockConnectHardware.mockReset();
+    it('displays ledgerLocked error for LEDGER_WRONG_APP', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('LEDGER_WRONG_APP'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      const mockAccounts = [
-        { address: '0xAddress1', balance: null, index: 0 },
-        { address: '0xAddress2', balance: null, index: 1 },
-      ];
-      mockConnectHardware.mockResolvedValue(mockAccounts);
-
-      renderWithProvider(<ConnectHardwareForm {...mockProps} />, mockStore);
-
-      const hdPath = "m/44'/60'/0'/0";
-      const deviceName = 'ledger';
-      const pageIndex = 0;
-      const loadHidValue = false;
-
-      await mockConnectHardware(
-        deviceName,
-        pageIndex,
-        hdPath,
-        loadHidValue,
-        jest.fn(),
-      );
+      connectToDevice(tEn('ledger'));
+
+      await waitFor(() => {
+        expect(screen.getByText(tEn('ledgerLocked'))).toBeInTheDocument();
+      });
+    });
 
-      expect(mockConnectHardware).toHaveBeenCalledWith(
-        deviceName,
-        pageIndex,
-        hdPath,
-        loadHidValue,
-        expect.any(Function),
+    it('displays ledgerTimeout error for timeout errors', async () => {
+      mockConnectHardware.mockRejectedValue(
+        new Error('Connection timeout occurred'),
       );
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+
+      await waitFor(() => {
+        expect(screen.getByText(tEn('ledgerTimeout'))).toBeInTheDocument();
+      });
     });
 
-    it('handles errors when connectHardware fails', async () => {
-      const testError = new Error('Test Error');
-      mockConnectHardware.mockReset();
-      mockConnectHardware.mockRejectedValue(testError);
+    it('displays U2F error message for non-Firefox browser', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('U2F Error'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      renderWithProvider(<ConnectHardwareForm {...mockProps} />, mockStore);
+      connectToDevice(tEn('ledger'));
 
-      await expect(mockConnectHardware()).rejects.toThrow('Test Error');
+      await waitFor(() => {
+        expect(
+          screen.getByText(
+            'We had trouble connecting to your ledger, try reviewing',
+            { exact: false },
+          ),
+        ).toBeInTheDocument();
+      });
     });
 
-    describe('Ledger error handling (toHardwareWalletError)', () => {
-      it('displays SDK userMessage when Ledger error has a mapped status code (e.g. 0x6a83 wrong app)', async () => {
-        mockConnectHardware.mockRejectedValue(
-          new Error('Ledger device: UNKNOWN_ERROR (0x6a83)'),
+    it('displays Firefox-specific U2F error message', async () => {
+      jest
+        .spyOn(window.navigator, 'userAgent', 'get')
+        .mockReturnValue(
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:95.0) Gecko/20100101 Firefox/95.0',
         );
 
-        const { getByText, getByLabelText } = renderWithProvider(
-          <ConnectHardwareForm {...mockProps} />,
-          mockStore,
-        );
+      mockConnectHardware.mockRejectedValue(new Error('U2F Error'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-        fireEvent.click(getByLabelText(messages.ledger.message));
-        fireEvent.click(getByText(messages.continue.message));
+      connectToDevice(tEn('ledger'));
 
-        await waitFor(() => {
-          expect(
-            getByText('Ethereum app is closed. Please open it to continue.'),
-          ).toBeInTheDocument();
-        });
+      await waitFor(() => {
+        expect(
+          screen.getByText(
+            "If you're on the latest version of Firefox, you might be experiencing an issue related to Firefox dropping U2F support. Learn how to fix this issue",
+            { exact: false },
+          ),
+        ).toBeInTheDocument();
       });
 
-      it('displays original error message when Ledger error maps to Unknown or ConnectionClosed (e.g. no app open)', async () => {
-        const appClosedMessage = 'Ledger: App closed or connection issue';
-        mockConnectHardware.mockRejectedValue(new Error(appClosedMessage));
+      jest.restoreAllMocks();
+    });
 
-        const { getByText, getByLabelText } = renderWithProvider(
-          <ConnectHardwareForm {...mockProps} />,
-          mockStore,
-        );
+    it('sets browserSupported to false for "Window blocked" error', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('Window blocked'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-        fireEvent.click(getByLabelText(messages.ledger.message));
-        fireEvent.click(getByText(messages.continue.message));
+      connectToDevice(tEn('ledger'));
 
-        await waitFor(() => {
-          expect(getByText(appClosedMessage)).toBeInTheDocument();
-        });
+      await waitFor(() => {
+        expect(
+          screen.getByText(tEn('browserNotSupported')),
+        ).toBeInTheDocument();
       });
     });
-  });
-
-  describe('componentDidUpdate - QR scan completion', () => {
-    beforeEach(() => {
-      mockCheckHardwareStatus.mockReset().mockResolvedValue(false);
-      mockConnectHardware.mockReset();
-      mockGetActiveQrCodeScanRequest.mockReturnValue(null);
-    });
 
-    const mockStateWithQrPath = {
-      ...mockState,
-      appState: {
-        ...mockState.appState,
-        defaultHdPaths: {
-          ...mockState.appState.defaultHdPaths,
-          [HardwareDeviceNames.qr]: "m/44'/60'/0'",
-        },
-      },
-    };
-
-    function createStoreWithFreshRefs() {
-      const store = configureMockStore([thunk])(mockStateWithQrPath);
-      const origGetState = store.getState.bind(store);
-      store.getState = () => ({
-        ...(origGetState() as Record<string, unknown>),
-      });
-      return store;
-    }
-
-    async function renderAndWaitForMount(
-      store: ReturnType<typeof createStoreWithFreshRefs>,
-    ) {
-      const result = renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        store,
+    it('displays QRHardwarePubkeyAccountOutOfRange for keystone pubkey error', async () => {
+      mockConnectHardware.mockRejectedValue(
+        new Error('KeystoneError#pubkey_account.no_expected_account'),
       );
-      await waitFor(() =>
-        expect(mockCheckHardwareStatus).toHaveBeenCalledTimes(4),
-      );
-      return result;
-    }
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-    async function simulateScanCompletion(
-      store: ReturnType<typeof createStoreWithFreshRefs>,
-    ) {
-      mockGetActiveQrCodeScanRequest.mockReturnValue(null);
-      await act(async () => {
-        store.dispatch({ type: 'FORCE_UPDATE' });
-      });
-    }
+      connectToDevice(tEn('ledger'));
 
-    it('fetches accounts when QR PAIR scan completes and keyring is unlocked', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
+      await waitFor(() => {
+        expect(
+          screen.getByText(tEn('QRHardwarePubkeyAccountOutOfRange')),
+        ).toBeInTheDocument();
       });
+    });
 
-      const store = createStoreWithFreshRefs();
-      await renderAndWaitForMount(store);
-
-      mockCheckHardwareStatus.mockReset().mockResolvedValue(true);
-      mockConnectHardware
-        .mockReset()
-        .mockResolvedValue([{ address: '0xQR1', balance: null, index: 0 }]);
+    it('ignores "Window closed" error silently', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('Window closed'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      await simulateScanCompletion(store);
+      connectToDevice(tEn('ledger'));
 
       await waitFor(() => {
-        expect(mockCheckHardwareStatus).toHaveBeenCalled();
         expect(mockConnectHardware).toHaveBeenCalled();
       });
+
+      expect(screen.queryByText('Window closed')).not.toBeInTheDocument();
     });
 
-    it('does not fetch accounts when keyring is locked', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
+    it('ignores "Popup closed" error silently', async () => {
+      mockConnectHardware.mockRejectedValue(new Error('Popup closed'));
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+
+      await waitFor(() => {
+        expect(mockConnectHardware).toHaveBeenCalled();
       });
 
-      const store = createStoreWithFreshRefs();
-      await renderAndWaitForMount(store);
+      expect(screen.queryByText('Popup closed')).not.toBeInTheDocument();
+    });
 
-      mockCheckHardwareStatus.mockReset().mockResolvedValue(false);
-      mockConnectHardware.mockReset();
+    it('ignores KeystoneError#sync_cancel error silently', async () => {
+      mockConnectHardware.mockRejectedValue(
+        new Error('KeystoneError#sync_cancel'),
+      );
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      await simulateScanCompletion(store);
+      connectToDevice(tEn('ledger'));
 
       await waitFor(() => {
-        expect(mockCheckHardwareStatus).toHaveBeenCalled();
+        expect(mockConnectHardware).toHaveBeenCalled();
       });
-      expect(mockConnectHardware).not.toHaveBeenCalled();
+
+      expect(
+        screen.queryByText('KeystoneError#sync_cancel'),
+      ).not.toBeInTheDocument();
     });
 
-    it('sets error state when checkHardwareStatus rejects with Error object', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
+    it('displays mapped message when ledger error code is found', async () => {
+      mockConnectHardware.mockRejectedValue(
+        new Error('Error with code 0x6501'),
+      );
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
+
+      await waitFor(() => {
+        expect(
+          screen.getByText(
+            'Ethereum app is out of date. Please update it to continue.',
+          ),
+        ).toBeInTheDocument();
       });
+    });
+  });
 
-      const store = createStoreWithFreshRefs();
-      const { getByText } = await renderAndWaitForMount(store);
+  describe('account list interactions', () => {
+    let mockStore: ReturnType<ReturnType<typeof configureMockStore>>;
 
-      mockCheckHardwareStatus
-        .mockReset()
-        .mockRejectedValue(new Error('hardware error'));
+    beforeEach(async () => {
+      mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+      mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      await simulateScanCompletion(store);
+      connectToDevice(tEn('trezor'));
 
       await waitFor(() => {
-        expect(getByText('hardware error')).toBeInTheDocument();
+        expect(
+          screen.getAllByText(tEn('selectAnAccount')).length,
+        ).toBeGreaterThan(0);
       });
     });
 
-    it('sets error state when checkHardwareStatus rejects with string', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
+    describe('onAccountChange', () => {
+      it('toggles account selection when clicking a checkbox', () => {
+        const checkboxes = screen.getAllByTestId('hw-account-list__item');
+        expect(checkboxes).toHaveLength(5);
+
+        const firstCheckbox = checkboxes[0].querySelector(
+          'input[type="checkbox"]',
+        );
+        if (firstCheckbox) {
+          fireEvent.click(firstCheckbox);
+        }
+      });
+    });
+
+    describe('onUnlockAccounts', () => {
+      it('disables unlock button when no accounts are selected', () => {
+        const unlockButton = screen.getByRole('button', {
+          name: tEn('unlock'),
+        });
+        expect(unlockButton).toBeDisabled();
       });
 
-      const store = createStoreWithFreshRefs();
-      const { getByText } = await renderAndWaitForMount(store);
+      it('navigates to overview page on successful unlock', async () => {
+        const checkboxes = screen.getAllByTestId('hw-account-list__item');
+        const firstCheckbox = checkboxes[0].querySelector(
+          'input[type="checkbox"]',
+        );
+        if (firstCheckbox) {
+          fireEvent.click(firstCheckbox);
+        }
 
-      mockCheckHardwareStatus.mockReset().mockRejectedValue('string error');
+        const unlockButton = screen.getByText(tEn('unlock'));
+        fireEvent.click(unlockButton);
 
-      await simulateScanCompletion(store);
+        await waitFor(() => {
+          expect(mockUnlockHardwareWalletAccounts).toHaveBeenCalled();
+        });
 
-      await waitFor(() => {
-        expect(getByText('string error')).toBeInTheDocument();
+        await waitFor(() => {
+          expect(mockUseNavigate).toHaveBeenCalledWith(MOCK_RECENT_PAGE);
+        });
       });
-    });
 
-    it('does not trigger when previous scan was not PAIR type', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.SIGN,
+      it('displays error when unlockHardwareWalletAccounts fails', async () => {
+        mockUnlockHardwareWalletAccounts.mockRejectedValueOnce(
+          new Error('Unlock failed'),
+        );
+
+        const checkboxes = screen.getAllByTestId('hw-account-list__item');
+        const firstCheckbox = checkboxes[0].querySelector(
+          'input[type="checkbox"]',
+        );
+        if (firstCheckbox) {
+          fireEvent.click(firstCheckbox);
+        }
+
+        const unlockButton = screen.getByText(tEn('unlock'));
+        fireEvent.click(unlockButton);
+
+        await waitFor(() => {
+          expect(screen.getByText('Unlock failed')).toBeInTheDocument();
+        });
       });
 
-      const store = createStoreWithFreshRefs();
-      await renderAndWaitForMount(store);
+      it('passes a null hd path fallback when no path is selected', async () => {
+        mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+        cleanup();
+
+        const storeWithEmptyPath = configureMockStore([thunk])(
+          createMockState({
+            appState: {
+              ...createMockState().appState,
+              defaultHdPaths: {
+                [HardwareDeviceNames.lattice]: DEFAULT_HD_PATH,
+                [HardwareDeviceNames.ledger]: DEFAULT_HD_PATH,
+                [HardwareDeviceNames.oneKey]: DEFAULT_HD_PATH,
+                [HardwareDeviceNames.trezor]: '',
+              },
+            },
+          }),
+        );
 
-      mockCheckHardwareStatus.mockReset();
+        renderWithProvider(<ConnectHardwareForm />, storeWithEmptyPath);
 
-      await simulateScanCompletion(store);
+        connectToDevice(tEn('trezor'));
 
-      expect(mockCheckHardwareStatus).not.toHaveBeenCalled();
+        await waitFor(() => {
+          expect(
+            screen.getAllByText(tEn('selectAnAccount')).length,
+          ).toBeGreaterThan(0);
+        });
+
+        const checkboxes = screen.getAllByTestId('hw-account-list__item');
+        const firstCheckbox = checkboxes[0].querySelector(
+          'input[type="checkbox"]',
+        );
+        if (firstCheckbox) {
+          fireEvent.click(firstCheckbox);
+        }
+
+        fireEvent.click(
+          screen.getByTestId('connect-hardware-account-list-unlock-btn'),
+        );
+
+        await waitFor(() => {
+          expect(mockUnlockHardwareWalletAccountsAction).toHaveBeenCalledWith(
+            [0],
+            HardwareDeviceNames.trezor,
+            null,
+            '',
+          );
+        });
+      });
     });
 
-    it('works when defaultHdPaths has no QR entry', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
+    describe('onForgetDevice', () => {
+      it('resets state and goes back to device selection on success', async () => {
+        const forgetButton = screen.getByTestId(
+          'hardware-forget-device-button',
+        );
+        fireEvent.click(forgetButton);
+
+        await waitFor(() => {
+          expect(mockForgetDevice).toHaveBeenCalled();
+        });
+
+        await waitFor(() => {
+          expect(screen.getByText(tEn('hardwareWallets'))).toBeInTheDocument();
+        });
       });
 
-      const storeWithoutQrPath = configureMockStore([thunk])({
-        ...mockState,
-        appState: {
-          ...mockState.appState,
-        },
+      it('displays error when forgetDevice fails', async () => {
+        mockForgetDevice.mockRejectedValueOnce(new Error('Forget failed'));
+
+        const forgetButton = screen.getByTestId(
+          'hardware-forget-device-button',
+        );
+        fireEvent.click(forgetButton);
+
+        await waitFor(() => {
+          expect(screen.getByText('Forget failed')).toBeInTheDocument();
+        });
       });
-      const origGetState = storeWithoutQrPath.getState.bind(storeWithoutQrPath);
-      storeWithoutQrPath.getState = () => ({
-        ...(origGetState() as Record<string, unknown>),
+    });
+
+    describe('pagination', () => {
+      it('disables Previous button on the first page', () => {
+        expect(
+          screen.getByTestId('hw-list-pagination__prev-button'),
+        ).toBeDisabled();
       });
+    });
+  });
 
-      renderWithProvider(
-        <ConnectHardwareForm {...mockProps} />,
-        storeWithoutQrPath,
-      );
-      await waitFor(() =>
-        expect(mockCheckHardwareStatus).toHaveBeenCalledTimes(4),
-      );
+  describe('QR Hardware Wallet Steps', () => {
+    it('renders the QR hardware wallet steps when QR is selected', async () => {
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      mockCheckHardwareStatus.mockReset().mockResolvedValue(true);
-      mockConnectHardware
-        .mockReset()
-        .mockResolvedValue([{ address: '0xQR1', balance: null, index: 0 }]);
+      const qrButton = screen.getByLabelText('QRCode');
+      fireEvent.click(qrButton);
 
-      mockGetActiveQrCodeScanRequest.mockReturnValue(null);
-      await act(async () => {
-        storeWithoutQrPath.dispatch({ type: 'FORCE_UPDATE' });
+      await waitFor(() => {
+        expect(screen.getByText(tEn('keystone'))).toBeInTheDocument();
+        expect(screen.getByText(tEn('airgapVault'))).toBeInTheDocument();
+        expect(screen.getByText(tEn('coolWallet'))).toBeInTheDocument();
+        expect(screen.getByText(tEn('dcent'))).toBeInTheDocument();
+        expect(screen.getByText(tEn('imToken'))).toBeInTheDocument();
       });
+    });
+  });
+
+  describe('Select Hardware', () => {
+    it('opens Ngrave Zero marketing links', async () => {
+      window.open = jest.fn();
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      const qrButton = screen.getByLabelText('QRCode');
+      fireEvent.click(qrButton);
+
+      const buyNowButton = screen.getByTestId('ngrave-brand-buy-now-btn');
+      fireEvent.click(buyNowButton);
+      expect(window.open).toHaveBeenCalled();
+
+      const learnMoreButton = screen.getByTestId('ngrave-brand-learn-more-btn');
+      fireEvent.click(learnMoreButton);
+      expect(window.open).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('showTemporaryAlert', () => {
+    it('dispatches showAlert on first hardware connection', async () => {
+      mockConnectHardware.mockResolvedValue(MOCK_ACCOUNTS);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+      connectToDevice(tEn('ledger'));
 
       await waitFor(() => {
-        expect(mockCheckHardwareStatus).toHaveBeenCalled();
-        expect(mockConnectHardware).toHaveBeenCalled();
+        expect(
+          screen.getAllByText(tEn('selectAnAccount')).length,
+        ).toBeGreaterThan(0);
       });
+
+      const showAlertAction = mockStore
+        .getActions()
+        .find((action: { type: string }) => action.type === 'SHOW_ALERT');
+      expect(showAlertAction).toBeDefined();
     });
+  });
 
-    it('does not overwrite device when user selects another device while checkHardwareStatus is pending', async () => {
-      mockGetActiveQrCodeScanRequest.mockReturnValue({
-        type: QrScanRequestType.PAIR,
-      });
+  describe('onAccountRestriction', () => {
+    it('displays ledgerAccountRestriction error when Next is clicked with fewer than 5 accounts', async () => {
+      const threeAccounts = MOCK_ACCOUNTS.slice(0, 3);
+      mockConnectHardware.mockResolvedValue(threeAccounts);
+      const mockStore = configureMockStore([thunk])(createMockState());
+      renderWithProvider(<ConnectHardwareForm />, mockStore);
 
-      const store = createStoreWithFreshRefs();
-      const { getByLabelText, getByText } = await renderAndWaitForMount(store);
+      connectToDevice(tEn('trezor'));
 
-      let resolveStatus: (value: boolean) => void;
-      const deferredStatus = new Promise<boolean>((resolve) => {
-        resolveStatus = resolve;
+      await waitFor(() => {
+        expect(
+          screen.getAllByText(tEn('selectAnAccount')).length,
+        ).toBeGreaterThan(0);
       });
-      mockCheckHardwareStatus.mockReset().mockReturnValue(deferredStatus);
-      mockConnectHardware
-        .mockReset()
-        .mockResolvedValue([{ address: '0xLedger1', balance: null, index: 0 }]);
-      mockConnectHardwareAction.mockClear();
 
-      await simulateScanCompletion(store);
+      const nextButton = screen.getByText(`${tEn('next')} >`);
+      fireEvent.click(nextButton);
 
-      const ledgerButton = getByLabelText(messages.ledger.message);
-      const continueButton = getByText(messages.continue.message);
-      fireEvent.click(ledgerButton);
-      fireEvent.click(continueButton);
+      expect(
+        screen.getByText(tEn('ledgerAccountRestriction')),
+      ).toBeInTheDocument();
+    });
 
-      await act(async () => {
-        resolveStatus?.(true);
+    describe('Ledger error handling (toHardwareWalletError)', () => {
+      it('displays SDK userMessage when Ledger error has a mapped status code (e.g. 0x6a83 wrong app)', async () => {
+        mockConnectHardware.mockRejectedValue(
+          new Error('Ledger device: UNKNOWN_ERROR (0x6a83)'),
+        );
+        const mockStore = configureMockStore([thunk])(createMockState());
+
+        renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+        fireEvent.click(screen.getByLabelText(tEn('ledger')));
+        fireEvent.click(screen.getByText(tEn('continue')));
+
+        await waitFor(() => {
+          expect(
+            screen.getByText(
+              'Ethereum app is closed. Please open it to continue.',
+            ),
+          ).toBeInTheDocument();
+        });
       });
 
-      await waitFor(() => {
-        const qrCalls = mockConnectHardwareAction.mock.calls.filter(
-          (call: unknown[]) => call[0] === HardwareDeviceNames.qr,
-        );
-        expect(qrCalls).toHaveLength(0);
+      it('displays original error message when Ledger error maps to Unknown or ConnectionClosed (e.g. no app open)', async () => {
+        const appClosedMessage = 'Ledger: App closed or connection issue';
+        mockConnectHardware.mockRejectedValue(new Error(appClosedMessage));
+        const mockStore = configureMockStore([thunk])(createMockState());
+
+        renderWithProvider(<ConnectHardwareForm />, mockStore);
+
+        fireEvent.click(screen.getByLabelText(tEn('ledger')));
+        fireEvent.click(screen.getByText(tEn('continue')));
+
+        await waitFor(() => {
+          expect(screen.getByText(appClosedMessage)).toBeInTheDocument();
+        });
       });
     });
   });
diff --git a/ui/pages/create-account/connect-hardware/index.tsx b/ui/pages/create-account/connect-hardware/index.tsx
new file mode 100644
index 000000000000..6586c2d3b9cf
--- /dev/null
+++ b/ui/pages/create-account/connect-hardware/index.tsx
@@ -0,0 +1,717 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable react-compiler/react-compiler */
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import { upperFirst } from 'lodash';
+import { useSelector, useDispatch } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+import { KeyringObject } from '@metamask/keyring-controller';
+import { ErrorCode } from '@metamask/hw-wallet-sdk';
+import { QrScanRequestType } from '@metamask/eth-qr-keyring';
+import {
+  Box,
+  Text,
+  TextButton,
+  TextColor,
+} from '@metamask/design-system-react';
+import * as actions from '../../../store/actions';
+import { getCurrentChainId } from '../../../../shared/lib/selectors/networks';
+import { getErrorMessage as toErrorMessage } from '../../../../shared/lib/error';
+import {
+  getMetaMaskAccounts,
+  getRpcPrefsForCurrentProvider,
+  getMetaMaskAccountsConnected,
+  getActiveQrCodeScanRequest,
+} from '../../../selectors';
+import { formatBalance } from '../../../helpers/utils/util';
+import { getMostRecentOverviewPage } from '../../../ducks/history/history';
+import { SECOND } from '../../../../shared/constants/time';
+import {
+  HardwareDeviceNames,
+  LedgerTransportTypes,
+  U2F_ERROR,
+  LEDGER_ERRORS_CODES,
+  LEDGER_LIVE_PATH,
+  MEW_PATH,
+  BIP44_PATH,
+  LATTICE_STANDARD_BIP44_PATH,
+  LATTICE_LEDGER_LIVE_PATH,
+  LATTICE_MEW_PATH,
+  TREZOR_TESTNET_PATH,
+  DEVICE_KEYRING_MAP,
+} from '../../../../shared/constants/hardware-wallets';
+import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
+import { getHDEntropyIndex } from '../../../selectors/selectors';
+import { KeyringType } from '../../../../shared/constants/keyring';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  toHardwareWalletError,
+  HardwareWalletType,
+} from '../../../contexts/hardware-wallets';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import type { MetaMaskReduxDispatch } from '../../../store/store';
+import AccountList from './account-list';
+import SelectHardware from './select-hardware';
+
+export const LEDGER_HD_PATHS = [
+  { name: 'Ledger Live', value: LEDGER_LIVE_PATH },
+  { name: 'Legacy (MEW / MyCrypto)', value: MEW_PATH },
+  { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
+];
+
+export const LATTICE_HD_PATHS = [
+  {
+    name: `Standard (${LATTICE_STANDARD_BIP44_PATH})`,
+    value: LATTICE_STANDARD_BIP44_PATH,
+  },
+  {
+    name: `Ledger Live (${LATTICE_LEDGER_LIVE_PATH})`,
+    value: LATTICE_LEDGER_LIVE_PATH,
+  },
+  { name: `Ledger Legacy (${LATTICE_MEW_PATH})`, value: LATTICE_MEW_PATH },
+];
+
+export const TREZOR_HD_PATHS = [
+  { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
+  { name: `Legacy (Ledger / MEW / MyCrypto)`, value: MEW_PATH },
+  { name: `Trezor Testnets`, value: TREZOR_TESTNET_PATH },
+];
+
+const HD_PATHS: Record<string, { name: string; value: string }[]> = {
+  ledger: LEDGER_HD_PATHS,
+  lattice: LATTICE_HD_PATHS,
+  trezor: TREZOR_HD_PATHS,
+  oneKey: TREZOR_HD_PATHS,
+};
+
+type HardwareAccount = {
+  address: string;
+  balance: string;
+  index: number;
+};
+
+type ActiveQrCodeScanRequest = {
+  type?: QrScanRequestType;
+} | null;
+
+const getErrorMessage = (
+  errorCode: string,
+  t: (key: string) => string,
+): string => {
+  const errorCodeLocalized =
+    LEDGER_ERRORS_CODES[errorCode as keyof typeof LEDGER_ERRORS_CODES];
+  if (errorCodeLocalized !== undefined) {
+    return t(errorCodeLocalized);
+  }
+  return errorCode;
+};
+
+const ConnectHardwareForm = () => {
+  const t = useI18nContext();
+  const { trackEvent } = useContext(MetaMetricsContext);
+  const dispatch: MetaMaskReduxDispatch = useDispatch();
+  const navigate = useNavigate();
+
+  // Selectors
+  const chainId = useSelector(getCurrentChainId);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const accounts = useSelector(getMetaMaskAccounts) as Record<
+    string,
+    { balance?: string }
+  >;
+  const connectedAccounts = useSelector(
+    getMetaMaskAccountsConnected,
+  ) as string[];
+  const defaultHdPaths = useSelector(
+    (state: { appState: { defaultHdPaths: Record<string, string> } }) =>
+      state.appState.defaultHdPaths,
+  );
+  const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
+  const hdEntropyIndex = useSelector(getHDEntropyIndex);
+  const ledgerTransportType = useSelector(
+    (state: {
+      metamask: { ledgerTransportType?: LedgerTransportTypes | 'live' };
+    }) => state.metamask.ledgerTransportType,
+  );
+  const keyrings = useSelector(
+    (state: { metamask: { keyrings: KeyringObject[] } }) =>
+      state.metamask.keyrings,
+  );
+  const activeQrCodeScanRequest = useSelector(
+    getActiveQrCodeScanRequest,
+  ) as ActiveQrCodeScanRequest;
+
+  // Local state
+  const [error, setError] = useState<string | null>(null);
+  const [selectedAccounts, setSelectedAccounts] = useState<number[]>([]);
+  const [hardwareAccounts, setHardwareAccounts] = useState<HardwareAccount[]>(
+    [],
+  );
+  const [browserSupported, setBrowserSupported] = useState(true);
+  const [unlocked, setUnlocked] = useState(false);
+  const [device, setDevice] = useState<string | null>(null);
+  const [isFirefox, setIsFirefox] = useState(false);
+  const previousActiveQrCodeScanRequest = useRef<ActiveQrCodeScanRequest>(
+    activeQrCodeScanRequest,
+  );
+  const latestHardwareAccounts = useRef(hardwareAccounts);
+  const latestDevice = useRef(device);
+  const latestPendingDevice = useRef<string | null>(null);
+  const latestGetPageRequestId = useRef(0);
+
+  useEffect(() => {
+    latestHardwareAccounts.current = hardwareAccounts;
+  }, [hardwareAccounts]);
+
+  useEffect(() => {
+    latestDevice.current = device;
+  }, [device]);
+
+  const setCurrentDevice = useCallback((nextDevice: string | null) => {
+    latestDevice.current = nextDevice;
+    setDevice(nextDevice);
+  }, []);
+
+  const hardwareWalletKeyrings = useMemo(
+    () =>
+      keyrings.filter(
+        (keyring) =>
+          (
+            [
+              KeyringType.ledger,
+              KeyringType.trezor,
+              KeyringType.lattice,
+              KeyringType.qr,
+              KeyringType.oneKey,
+            ] as string[]
+          ).includes(keyring.type) && keyring.accounts.length > 0,
+      ),
+    [keyrings],
+  );
+
+  // Update balances when accounts change
+  useEffect(() => {
+    setHardwareAccounts((prev) => {
+      if (prev.length === 0) {
+        return prev;
+      }
+      return prev.map((account) => {
+        const normalizedAddress = account.address.toLowerCase();
+        const balanceValue = accounts[normalizedAddress]?.balance || null;
+        return {
+          ...account,
+          balance: balanceValue ? formatBalance(balanceValue, 6) : '...',
+        };
+      });
+    });
+  }, [accounts]);
+
+  const showTemporaryAlert = useCallback(() => {
+    dispatch(actions.showAlert(t('hardwareWalletConnected') as string));
+    setTimeout(() => {
+      dispatch(actions.hideAlert());
+    }, SECOND * 5);
+  }, [dispatch, t]);
+
+  const getPage = useCallback(
+    async (
+      deviceName: string,
+      page: number,
+      hdPath: string,
+      loadHid?: boolean,
+      shouldShowConnectedAlert = true,
+    ) => {
+      // The actions.ts type declares `page` as string, but the background
+      // handler expects a number (0 = first, 1 = next, -1 = previous).
+      const requestId = latestGetPageRequestId.current + 1;
+      latestGetPageRequestId.current = requestId;
+      latestPendingDevice.current = deviceName;
+
+      try {
+        const nextAccounts = (await dispatch(
+          actions.connectHardware(
+            deviceName as HardwareDeviceNames,
+            page as unknown as string,
+            hdPath,
+            loadHid ?? false,
+            t as (key: string) => string,
+          ),
+        )) as { address: string; index?: number }[];
+
+        if (requestId !== latestGetPageRequestId.current) {
+          return;
+        }
+
+        latestPendingDevice.current = null;
+
+        if (nextAccounts.length) {
+          if (
+            shouldShowConnectedAlert &&
+            hardwareAccounts.length === 0 &&
+            !unlocked
+          ) {
+            showTemporaryAlert();
+          }
+
+          const newAccounts: HardwareAccount[] = nextAccounts.map(
+            (account, idx) => {
+              const normalizedAddress = account.address.toLowerCase();
+              const balanceValue = accounts[normalizedAddress]?.balance || null;
+              return {
+                address: account.address,
+                index: account.index ?? idx,
+                balance: balanceValue ? formatBalance(balanceValue, 6) : '...',
+              };
+            },
+          );
+
+          setHardwareAccounts(newAccounts);
+          setUnlocked(true);
+          setCurrentDevice(deviceName);
+          setError(null);
+        }
+      } catch (e: unknown) {
+        if (requestId !== latestGetPageRequestId.current) {
+          return;
+        }
+
+        latestPendingDevice.current = null;
+
+        const errorMessage = toErrorMessage(e);
+
+        // Use shared Ledger error mapping (hw-wallet-sdk) when connecting to Ledger.
+        if (deviceName === HardwareDeviceNames.ledger) {
+          const hwError = toHardwareWalletError(e, HardwareWalletType.Ledger);
+
+          if (
+            hwError.code !== ErrorCode.Unknown &&
+            hwError.code !== ErrorCode.ConnectionClosed
+          ) {
+            setError(hwError.userMessage);
+            return;
+          }
+        }
+
+        const ledgerErrorCode = Object.keys(LEDGER_ERRORS_CODES).find(
+          (errorCode) => errorMessage.includes(errorCode),
+        );
+        if (errorMessage === 'Window blocked') {
+          setBrowserSupported(false);
+          setError(null);
+        } else if (errorMessage.includes(U2F_ERROR)) {
+          setError(U2F_ERROR);
+        } else if (
+          errorMessage === 'LEDGER_LOCKED' ||
+          errorMessage === 'LEDGER_WRONG_APP'
+        ) {
+          setError(t('ledgerLocked') as string);
+        } else if (errorMessage.includes('timeout')) {
+          setError(t('ledgerTimeout') as string);
+        } else if (ledgerErrorCode) {
+          setError(
+            `${errorMessage} - ${getErrorMessage(ledgerErrorCode, t as (key: string) => string)}`,
+          );
+        } else if (
+          errorMessage
+            .toLowerCase()
+            .includes(
+              'KeystoneError#pubkey_account.no_expected_account'.toLowerCase(),
+            )
+        ) {
+          setError(t('QRHardwarePubkeyAccountOutOfRange') as string);
+        } else if (
+          errorMessage !== 'Window closed' &&
+          errorMessage !== 'Popup closed' &&
+          !errorMessage
+            .toLowerCase()
+            .includes('KeystoneError#sync_cancel'.toLowerCase())
+        ) {
+          setError(errorMessage);
+        }
+      }
+    },
+    [
+      accounts,
+      dispatch,
+      hardwareAccounts.length,
+      setCurrentDevice,
+      showTemporaryAlert,
+      t,
+      unlocked,
+    ],
+  );
+
+  useEffect(() => {
+    if (/Firefox/u.test(window.navigator.userAgent)) {
+      setIsFirefox(true);
+    }
+  }, []);
+
+  useEffect(() => {
+    const previousScanRequest = previousActiveQrCodeScanRequest.current;
+
+    if (
+      previousScanRequest?.type === QrScanRequestType.PAIR &&
+      !activeQrCodeScanRequest &&
+      latestHardwareAccounts.current.length === 0 &&
+      !latestDevice.current &&
+      !latestPendingDevice.current
+    ) {
+      const hdPath = defaultHdPaths[HardwareDeviceNames.qr];
+
+      dispatch(actions.checkHardwareStatus(HardwareDeviceNames.qr, hdPath))
+        .then((isUnlocked) => {
+          if (
+            isUnlocked &&
+            latestHardwareAccounts.current.length === 0 &&
+            !latestDevice.current &&
+            !latestPendingDevice.current
+          ) {
+            setCurrentDevice(HardwareDeviceNames.qr);
+            getPage(HardwareDeviceNames.qr, 0, hdPath).catch(() => undefined);
+          }
+        })
+        .catch((errorResponse: unknown) => {
+          setError(toErrorMessage(errorResponse));
+        });
+    }
+
+    previousActiveQrCodeScanRequest.current = activeQrCodeScanRequest;
+  }, [
+    activeQrCodeScanRequest,
+    defaultHdPaths,
+    dispatch,
+    getPage,
+    setCurrentDevice,
+  ]);
+
+  const connectToHardwareWallet = useCallback(
+    (nextDevice: string) => {
+      if (latestPendingDevice.current === nextDevice) {
+        return;
+      }
+
+      setCurrentDevice(nextDevice);
+      if (hardwareAccounts.length) {
+        return;
+      }
+
+      const deviceCount = hardwareWalletKeyrings.length;
+
+      trackEvent({
+        event: MetaMetricsEventName.ConnectHardwareWalletClicked,
+        properties: {
+          device_type: upperFirst(nextDevice),
+          connected_device_count: deviceCount,
+        },
+      });
+
+      getPage(nextDevice, 0, defaultHdPaths[nextDevice], true);
+    },
+    [
+      defaultHdPaths,
+      getPage,
+      hardwareAccounts.length,
+      hardwareWalletKeyrings.length,
+      setCurrentDevice,
+      trackEvent,
+    ],
+  );
+
+  const onPathChange = useCallback(
+    (path: string) => {
+      if (!device) {
+        return;
+      }
+      dispatch(
+        actions.setHardwareWalletDefaultHdPath({
+          device: device as HardwareDeviceNames,
+          path,
+        }),
+      );
+      setSelectedAccounts([]);
+      getPage(device, 0, path);
+    },
+    [device, dispatch, getPage],
+  );
+
+  const onAccountChange = useCallback((accountIndex: number) => {
+    setSelectedAccounts((prev) =>
+      prev.includes(accountIndex)
+        ? prev.filter((acc) => accountIndex !== acc)
+        : [...prev, accountIndex],
+    );
+    setError(null);
+  }, []);
+
+  const onAccountRestriction = useCallback(() => {
+    setError(t('ledgerAccountRestriction') as string);
+  }, [t]);
+
+  const onForgetDevice = useCallback(
+    async (deviceName: string, hdPath: string) => {
+      try {
+        await dispatch(actions.forgetDevice(deviceName as HardwareDeviceNames));
+
+        trackEvent({
+          event: MetaMetricsEventName.HardwareWalletForgotten,
+          properties: {
+            device_type: upperFirst(deviceName),
+          },
+        });
+
+        setError(null);
+        setSelectedAccounts([]);
+        latestGetPageRequestId.current += 1;
+        latestPendingDevice.current = null;
+        latestHardwareAccounts.current = [];
+        setHardwareAccounts([]);
+        setCurrentDevice(null);
+        setUnlocked(false);
+      } catch (e) {
+        const errorMessage = toErrorMessage(e);
+
+        trackEvent({
+          event: MetaMetricsEventName.HardwareWalletConnectionFailed,
+          properties: {
+            hd_path: hdPath,
+            device_type: upperFirst(deviceName),
+            error: errorMessage,
+          },
+        });
+
+        setError(errorMessage);
+      }
+    },
+    [dispatch, setCurrentDevice, trackEvent],
+  );
+
+  const onUnlockAccounts = useCallback(
+    async (deviceName: string, path: string) => {
+      if (selectedAccounts.length === 0) {
+        setError(t('accountSelectionRequired') as string);
+        return;
+      }
+
+      const description =
+        MEW_PATH === path
+          ? (t('hardwareWalletLegacyDescription') as string)
+          : '';
+
+      const selectedAccountIndexes = selectedAccounts
+        .filter(
+          (accountIndex) =>
+            Number.isInteger(Number(accountIndex)) && Number(accountIndex) >= 0,
+        )
+        .map(Number);
+      if (selectedAccountIndexes.length !== selectedAccounts.length) {
+        setError(t('accountSelectionRequired'));
+        return;
+      }
+
+      try {
+        await dispatch(
+          actions.unlockHardwareWalletAccounts(
+            selectedAccountIndexes,
+            deviceName as HardwareDeviceNames,
+            path || null,
+            description,
+          ),
+        );
+
+        // Legacy event
+        trackEvent({
+          category: MetaMetricsEventCategory.Accounts,
+          event: MetaMetricsEventName.AccountAdded,
+          properties: {
+            account_type: MetaMetricsEventAccountType.Hardware,
+            account_hardware_type: deviceName,
+            is_suggested_name: true,
+          },
+        });
+
+        const connectedDevices = hardwareWalletKeyrings;
+        const deviceCount = connectedDevices.length;
+        const isAlreadyConnected = connectedDevices.some(
+          (keyring) =>
+            keyring.type ===
+            DEVICE_KEYRING_MAP[deviceName as keyof typeof DEVICE_KEYRING_MAP],
+        );
+
+        trackEvent({
+          event: MetaMetricsEventName.HardwareWalletAccountConnected,
+          properties: {
+            device_type: upperFirst(deviceName),
+            hd_path: path,
+            connected_device_count: isAlreadyConnected
+              ? deviceCount
+              : deviceCount + 1,
+          },
+        });
+
+        navigate(mostRecentOverviewPage);
+      } catch (e) {
+        const errorMessage = toErrorMessage(e);
+
+        // Legacy event
+        trackEvent({
+          category: MetaMetricsEventCategory.Accounts,
+          event: MetaMetricsEventName.AccountAddFailed,
+          properties: {
+            account_type: MetaMetricsEventAccountType.Hardware,
+            account_hardware_type: deviceName,
+            error: errorMessage,
+            hd_entropy_index: hdEntropyIndex,
+          },
+        });
+
+        trackEvent({
+          event: MetaMetricsEventName.HardwareWalletConnectionFailed,
+          properties: {
+            hd_path: path,
+            device_type: upperFirst(deviceName),
+            error: errorMessage,
+          },
+        });
+        setError(errorMessage);
+      }
+    },
+    [
+      dispatch,
+      hardwareWalletKeyrings,
+      hdEntropyIndex,
+      mostRecentOverviewPage,
+      navigate,
+      selectedAccounts,
+      t,
+      trackEvent,
+    ],
+  );
+
+  const onCancel = useCallback(() => {
+    navigate(mostRecentOverviewPage);
+  }, [mostRecentOverviewPage, navigate]);
+
+  const renderError = () => {
+    if (error === U2F_ERROR) {
+      if (device === 'ledger' && isFirefox) {
+        return (
+          <>
+            <Box marginHorizontal={5} marginBottom={2}>
+              <Text color={TextColor.WarningDefault}>
+                {t('troubleConnectingToLedgerU2FOnFirefox', [
+                  <TextButton key="u2f-error-1" asChild className="inline">
+                    <a
+                      href={ZENDESK_URLS.HARDWARE_CONNECTION}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      {t('troubleConnectingToLedgerU2FOnFirefox2')}
+                    </a>
+                  </TextButton>,
+                ])}
+              </Text>
+            </Box>
+            <Box marginHorizontal={5} marginBottom={2}>
+              <Text color={TextColor.WarningDefault}>
+                {t('troubleConnectingToLedgerU2FOnFirefoxLedgerSolution', [
+                  <TextButton key="u2f-error-2" asChild className="inline">
+                    <a
+                      href={ZENDESK_URLS.LEDGER_FIREFOX_U2F_GUIDE}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      {t(
+                        'troubleConnectingToLedgerU2FOnFirefoxLedgerSolution2',
+                      )}
+                    </a>
+                  </TextButton>,
+                ])}
+              </Text>
+            </Box>
+          </>
+        );
+      }
+      return (
+        <Box marginHorizontal={5} marginBottom={2}>
+          <Text color={TextColor.WarningDefault}>
+            {t('troubleConnectingToWallet', [
+              device,
+              <TextButton key="u2f-error-1" asChild className="inline">
+                <a
+                  href={ZENDESK_URLS.HARDWARE_CONNECTION}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {t('walletConnectionGuide')}
+                </a>
+              </TextButton>,
+            ])}
+          </Text>
+        </Box>
+      );
+    }
+    return error ? (
+      <Text color={TextColor.ErrorDefault} className="hw-connect__error">
+        {error}
+      </Text>
+    ) : null;
+  };
+
+  const renderContent = () => {
+    if (!hardwareAccounts.length) {
+      return (
+        <SelectHardware
+          connectToHardwareWallet={connectToHardwareWallet}
+          browserSupported={browserSupported}
+          onCancel={onCancel}
+          ledgerTransportType={ledgerTransportType}
+        />
+      );
+    }
+
+    if (!device) {
+      return null;
+    }
+
+    return (
+      <AccountList
+        onPathChange={onPathChange}
+        selectedPath={defaultHdPaths[device]}
+        device={device}
+        accounts={hardwareAccounts}
+        connectedAccounts={connectedAccounts}
+        selectedAccounts={selectedAccounts}
+        onAccountChange={onAccountChange}
+        chainId={chainId}
+        rpcPrefs={rpcPrefs}
+        getPage={getPage}
+        onUnlockAccounts={onUnlockAccounts}
+        onForgetDevice={onForgetDevice}
+        onCancel={onCancel}
+        onAccountRestriction={onAccountRestriction}
+        hdPaths={HD_PATHS}
+      />
+    );
+  };
+
+  return (
+    <>
+      {renderError()}
+      {renderContent()}
+    </>
+  );
+};
+
+export default ConnectHardwareForm;
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
deleted file mode 100644
index 864b6be55926..000000000000
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ /dev/null
@@ -1,973 +0,0 @@
-import classnames from 'clsx';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import {
-  Text,
-  Box,
-  IconName,
-  ButtonIconSize,
-  ButtonIcon,
-  Button,
-  BUTTON_SIZES,
-  BUTTON_VARIANT,
-  BannerAlert,
-} from '../../../components/component-library';
-import LogoLedger from '../../../components/ui/logo/logo-ledger';
-import LogoQRBased from '../../../components/ui/logo/logo-qr-based';
-import LogoTrezor from '../../../components/ui/logo/logo-trezor';
-import LogoLattice from '../../../components/ui/logo/logo-lattice';
-
-import {
-  HardwareDeviceNames,
-  LedgerTransportTypes,
-  HardwareAffiliateLinks,
-  HardwareAffiliateTutorialLinks,
-  MarketingActionNames,
-  QrHardwareDeviceNames,
-} from '../../../../shared/constants/hardware-wallets';
-import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
-import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
-import { openWindow } from '../../../helpers/utils/window';
-import { getBrowserName } from '../../../../shared/lib/browser-runtime.utils';
-import {
-  AlignItems,
-  Display,
-  FlexDirection,
-  FontWeight,
-  JustifyContent,
-  TextAlign,
-  TextColor,
-  TextVariant,
-} from '../../../helpers/constants/design-system';
-import { PLATFORM_FIREFOX } from '../../../../shared/constants/app';
-import { capitalizeStr } from './utils';
-
-// Not all browsers have usb support. In particular, Firefox does
-// not support usb. More information on that can be found here:
-// https://mozilla.github.io/standards-positions/#webusb
-//
-// The below `&& window.navigator.usb` condition ensures that we
-// only attempt to connect Trezor via usb if we are in a browser
-// that supports usb. If not, the connection of the hardware wallet
-// to the browser will be handled by the Trezor connect screen. In
-// the case of Firefox, this will depend on the Trezor bridge software
-const isUSBSupported = !process.env.IN_TEST && window.navigator.usb;
-
-const isFirefox = getBrowserName() === PLATFORM_FIREFOX;
-
-export default class SelectHardware extends Component {
-  static contextTypes = {
-    t: PropTypes.func,
-    trackEvent: PropTypes.func,
-  };
-
-  static propTypes = {
-    onCancel: PropTypes.func.isRequired,
-    connectToHardwareWallet: PropTypes.func.isRequired,
-    browserSupported: PropTypes.bool.isRequired,
-    ledgerTransportType: PropTypes.oneOf(Object.values(LedgerTransportTypes)),
-  };
-
-  state = {
-    selectedDevice: null,
-    trezorRequestDevicePending: false,
-  };
-
-  trackMarketingEvent = (type, device) => {
-    const { trackEvent } = this.context;
-    trackEvent({
-      event: MetaMetricsEventName.HardwareWalletMarketingButtonClicked,
-      properties: {
-        button_type: type,
-        device_type: capitalizeStr(device),
-      },
-    });
-  };
-
-  connect = async () => {
-    const { selectedDevice } = this.state;
-
-    if (selectedDevice) {
-      if (selectedDevice === HardwareDeviceNames.trezor && isUSBSupported) {
-        this.setState({
-          trezorRequestDevicePending: true,
-        });
-        try {
-          await window.navigator.usb.requestDevice({
-            filters: [
-              { vendorId: 0x534c, productId: 0x0001 },
-              { vendorId: 0x1209, productId: 0x53c0 },
-              { vendorId: 0x1209, productId: 0x53c1 },
-            ],
-          });
-        } catch (e) {
-          if (!e.message.match('No device selected')) {
-            throw e;
-          }
-        } finally {
-          this.setState({ trezorRequestDevicePending: false });
-        }
-      }
-      this.props.connectToHardwareWallet(selectedDevice);
-    }
-    return null;
-  };
-
-  renderConnectToTrezorButton() {
-    return (
-      <button
-        data-testid="connect-trezor-btn"
-        className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === HardwareDeviceNames.trezor,
-        })}
-        onClick={(_) =>
-          this.setState({ selectedDevice: HardwareDeviceNames.trezor })
-        }
-      >
-        <LogoTrezor className="hw-connect__btn__img" ariaLabel="Trezor" />
-      </button>
-    );
-  }
-
-  renderConnectToLatticeButton() {
-    return (
-      <button
-        data-testid="connect-lattice-btn"
-        className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === HardwareDeviceNames.lattice,
-        })}
-        onClick={(_) =>
-          this.setState({ selectedDevice: HardwareDeviceNames.lattice })
-        }
-      >
-        <LogoLattice className="hw-connect__btn__img" ariaLabel="Lattice" />
-      </button>
-    );
-  }
-
-  renderConnectToLedgerButton() {
-    return (
-      <button
-        data-testid="connect-ledger-btn"
-        className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === HardwareDeviceNames.ledger,
-        })}
-        onClick={(_) =>
-          this.setState({ selectedDevice: HardwareDeviceNames.ledger })
-        }
-      >
-        <LogoLedger className="hw-connect__btn__img" ariaLabel="Ledger" />
-      </button>
-    );
-  }
-
-  renderConnectToQRButton() {
-    return (
-      <button
-        data-testid="connect-qr-btn"
-        className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === HardwareDeviceNames.qr,
-        })}
-        onClick={(_) =>
-          this.setState({ selectedDevice: HardwareDeviceNames.qr })
-        }
-      >
-        <LogoQRBased className="hw-connect__btn__img" ariaLabel="QRCode" />
-      </button>
-    );
-  }
-
-  renderButtons() {
-    return (
-      <>
-        <div className="hw-connect__btn-wrapper">
-          {this.renderConnectToLedgerButton()}
-          {this.renderConnectToTrezorButton()}
-        </div>
-        <div
-          className="hw-connect__btn-wrapper"
-          style={{ margin: '10px 0 0 0' }}
-        >
-          {this.renderConnectToLatticeButton()}
-          {this.renderConnectToQRButton()}
-        </div>
-      </>
-    );
-  }
-
-  renderContinueButton() {
-    return (
-      <Button
-        variant={BUTTON_VARIANT.PRIMARY}
-        size={BUTTON_SIZES.LG}
-        className="hw-connect__connect-btn"
-        onClick={this.connect}
-        disabled={
-          !this.state.selectedDevice ||
-          this.state.trezorRequestDevicePending ||
-          (this.state.selectedDevice === HardwareDeviceNames.ledger &&
-            isFirefox)
-        }
-      >
-        {this.context.t('continue')}
-      </Button>
-    );
-  }
-
-  renderFooter() {
-    return (
-      <Text
-        color={TextColor.textAlternative}
-        variant={TextVariant.bodySm}
-        textAlign={TextAlign.Center}
-        as="h6"
-        marginTop={4}
-        className="new-external-account-form footer"
-      >
-        {this.context.t('hardwareWalletsInfo')}
-      </Text>
-    );
-  }
-
-  renderUnsupportedBrowser() {
-    return (
-      <Box
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        justifyContent={JustifyContent.center}
-        alignItems={AlignItems.center}
-        className="new-external-account-form unsupported-browser"
-      >
-        <Box
-          className="hw-connect"
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
-          alignItems={AlignItems.center}
-        >
-          <Text
-            className="hw-connect__title"
-            variant={TextVariant.headingMd}
-            as="h3"
-            fontWeight={FontWeight.Bold}
-            marginTop={6}
-            marginBottom={3}
-          >
-            {this.context.t('browserNotSupported')}
-          </Text>
-          <Text
-            className="hw-connect__msg"
-            variant={TextVariant.bodyMd}
-            as="h5"
-            marginTop={3}
-            marginBottom={5}
-          >
-            {this.context.t('chromeRequiredForHardwareWallets')}
-          </Text>
-        </Box>
-        <Button
-          variant={BUTTON_VARIANT.PRIMARY}
-          size={BUTTON_SIZES.LG}
-          onClick={() =>
-            global.platform.openTab({
-              url: 'https://google.com/chrome',
-            })
-          }
-        >
-          {this.context.t('downloadGoogleChrome')}
-        </Button>
-      </Box>
-    );
-  }
-
-  renderHeader() {
-    return (
-      <Box
-        className="hw-connect__header"
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        alignItems={AlignItems.center}
-      >
-        {this.state.selectedDevice === HardwareDeviceNames.ledger &&
-          !isFirefox && (
-            <Box>
-              <BannerAlert
-                marginTop={6}
-                title={this.context.t(
-                  'ledgerMultipleDevicesUnsupportedInfoTitle',
-                )}
-              >
-                {this.context.t(
-                  'ledgerMultipleDevicesUnsupportedInfoDescription',
-                )}
-              </BannerAlert>
-            </Box>
-          )}
-        {this.state.selectedDevice === HardwareDeviceNames.ledger &&
-          isFirefox && (
-            <Box>
-              <BannerAlert
-                marginTop={6}
-                severity="warning"
-                title={this.context.t('ledgerFirefoxNotSupportedTitle')}
-              >
-                {this.context.t('ledgerFirefoxNotSupportedDescription1')}
-                <a
-                  className="hw-connect__href-link"
-                  href={ZENDESK_URLS.HARDWARE_CONNECTION_TREZOR_LEDGER}
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  {this.context.t('ledgerFirefoxNotSupportedLink')}
-                </a>
-                {this.context.t('ledgerFirefoxNotSupportedDescription2')}
-                <br />
-                {this.context.t('ledgerFirefoxNotSupportedDescription3')}
-              </BannerAlert>
-            </Box>
-          )}
-
-        <Box
-          display={Display.Flex}
-          flexDirection={FlexDirection.Row}
-          justifyContent={JustifyContent.center}
-          alignItems={AlignItems.center}
-          className="hw-connect__header__title-wrapper"
-          marginTop={6}
-        >
-          <Text
-            variant={TextVariant.headingMd}
-            as="h3"
-            fontWeight={FontWeight.Bold}
-            marginLeft="auto"
-          >
-            {this.context.t('hardwareWallets')}
-          </Text>
-          <ButtonIcon
-            iconName={IconName.Close}
-            ariaLabel={this.context.t('close')}
-            onClick={this.props.onCancel}
-            size={ButtonIconSize.Sm}
-            marginLeft="auto"
-            data-testid="hardware-connect-close-btn"
-          />
-        </Box>
-
-        <Text
-          className="hw-connect__header__msg"
-          variant={TextVariant.bodyMd}
-          as="h5"
-          marginTop={5}
-          marginBottom={3}
-        >
-          {this.context.t('hardwareWalletsMsg')}
-        </Text>
-      </Box>
-    );
-  }
-
-  renderTutorialSteps() {
-    switch (this.state.selectedDevice) {
-      case HardwareDeviceNames.ledger:
-        return this.renderLedgerTutorialSteps();
-      case HardwareDeviceNames.trezor:
-        return this.renderTrezorTutorialSteps();
-      case HardwareDeviceNames.lattice:
-        return this.renderLatticeTutorialSteps();
-      case HardwareDeviceNames.qr:
-        return this.renderQRHardwareWalletSteps();
-      default:
-        return '';
-    }
-  }
-
-  renderLedgerTutorialSteps() {
-    const steps = [];
-    if (this.props.ledgerTransportType === LedgerTransportTypes.live) {
-      steps.push({
-        renderButtons: false,
-        title: this.context.t('step1LedgerWallet'),
-        message: this.context.t('step1LedgerWalletMsg', [
-          <a
-            className="hw-connect__msg-link"
-            href="https://www.ledger.com/ledger-live"
-            rel="noopener noreferrer"
-            target="_blank"
-            key="ledger-live-app-link"
-          >
-            {this.context.t('ledgerLiveApp')}
-          </a>,
-        ]),
-      });
-    }
-
-    steps.push({
-      renderButtons: true,
-      asset: 'plug-in-wallet',
-      dimensions: { width: '225px', height: '75px' },
-      title: this.context.t('step2LedgerWallet'),
-      message: this.context.t('step2LedgerWalletMsg', [
-        <a
-          className="hw-connect__msg-link"
-          href={ZENDESK_URLS.HARDWARE_CONNECTION}
-          rel="noopener noreferrer"
-          target="_blank"
-          key="ledger-support-link"
-        >
-          {this.context.t('hardwareWalletSupportLinkConversion')}
-        </a>,
-      ]),
-    });
-
-    return (
-      <div className="hw-tutorial">
-        {steps.map((step, index) => (
-          <Box
-            display={Display.Flex}
-            flexDirection={FlexDirection.Column}
-            alignItems={AlignItems.center}
-            className="hw-connect"
-            key={index}
-          >
-            <h3 className="hw-connect__title">{step.title}</h3>
-            {step.renderButtons ? (
-              <Box
-                display={Display.Flex}
-                flexDirection={FlexDirection.Row}
-                justifyContent={JustifyContent.center}
-                marginBottom={2}
-              >
-                <Button
-                  className="hw-connect__external-btn-first"
-                  variant={BUTTON_VARIANT.SECONDARY}
-                  onClick={() => {
-                    this.trackMarketingEvent(
-                      MarketingActionNames.BuyNow,
-                      HardwareDeviceNames.ledger,
-                    );
-                    openWindow(HardwareAffiliateLinks.Ledger);
-                  }}
-                >
-                  {this.context.t('buyNow')}
-                </Button>
-                <Button
-                  className="hw-connect__external-btn"
-                  variant={BUTTON_VARIANT.SECONDARY}
-                  onClick={() => {
-                    this.trackMarketingEvent(
-                      MarketingActionNames.Tutorial,
-                      HardwareDeviceNames.ledger,
-                    );
-                    openWindow(HardwareAffiliateTutorialLinks.Ledger);
-                  }}
-                >
-                  {this.context.t('tutorial')}
-                </Button>
-              </Box>
-            ) : null}
-            <p className="hw-connect__msg">{step.message}</p>
-            {step.asset && (
-              <img
-                className="hw-connect__step-asset"
-                src={`images/${step.asset}.svg`}
-                {...step.dimensions}
-                alt=""
-              />
-            )}
-          </Box>
-        ))}
-      </div>
-    );
-  }
-
-  renderLatticeTutorialSteps() {
-    const steps = [
-      {
-        asset: 'connect-lattice',
-        dimensions: { width: '225px', height: '75px' },
-        title: this.context.t('step1LatticeWallet'),
-        message: this.context.t('step1LatticeWalletMsg', [
-          <a
-            className="hw-connect__msg-link"
-            href={ZENDESK_URLS.HARDWARE_CONNECTION}
-            rel="noopener noreferrer"
-            target="_blank"
-            key="lattice-setup-link"
-          >
-            {this.context.t('hardwareWalletSupportLinkConversion')}
-          </a>,
-        ]),
-      },
-    ];
-
-    return (
-      <div className="hw-tutorial">
-        {steps.map((step, index) => (
-          <Box
-            display={Display.Flex}
-            flexDirection={FlexDirection.Column}
-            alignItems={AlignItems.center}
-            className="hw-connect"
-            key={index}
-          >
-            <h3 className="hw-connect__title">{step.title}</h3>
-            <Box
-              display={Display.Flex}
-              flexDirection={FlexDirection.Row}
-              justifyContent={JustifyContent.center}
-              marginBottom={2}
-            >
-              <Button
-                className="hw-connect__external-btn-first"
-                variant={BUTTON_VARIANT.SECONDARY}
-                onClick={() => {
-                  this.trackMarketingEvent(
-                    MarketingActionNames.BuyNow,
-                    HardwareDeviceNames.lattice,
-                  );
-                  openWindow(HardwareAffiliateLinks.GridPlus);
-                }}
-              >
-                {this.context.t('buyNow')}
-              </Button>
-              <Button
-                className="hw-connect__external-btn"
-                variant={BUTTON_VARIANT.SECONDARY}
-                onClick={() => {
-                  this.trackMarketingEvent(
-                    MarketingActionNames.Tutorial,
-                    HardwareDeviceNames.lattice,
-                  );
-                  openWindow(HardwareAffiliateTutorialLinks.GridPlus);
-                }}
-              >
-                {this.context.t('tutorial')}
-              </Button>
-            </Box>
-            <p className="hw-connect__msg">{step.message}</p>
-            {step.asset && (
-              <img
-                className="hw-connect__step-asset"
-                src={`images/${step.asset}.svg`}
-                {...step.dimensions}
-                alt=""
-              />
-            )}
-          </Box>
-        ))}
-      </div>
-    );
-  }
-
-  renderTrezorTutorialSteps() {
-    const steps = [
-      {
-        asset: 'plug-in-wallet',
-        dimensions: { width: '225px', height: '75px' },
-        title: this.context.t('step1TrezorWallet'),
-        message: this.context.t('step1TrezorWalletMsg', [
-          <a
-            className="hw-connect__msg-link"
-            href={ZENDESK_URLS.HARDWARE_CONNECTION}
-            rel="noopener noreferrer"
-            target="_blank"
-            key="trezor-support-link"
-          >
-            {this.context.t('hardwareWalletSupportLinkConversion')}
-          </a>,
-        ]),
-      },
-    ];
-
-    return (
-      <div className="hw-tutorial">
-        {steps.map((step, index) => (
-          <Box
-            display={Display.Flex}
-            flexDirection={FlexDirection.Column}
-            alignItems={AlignItems.center}
-            className="hw-connect"
-            key={index}
-          >
-            <h3 className="hw-connect__title">{step.title}</h3>
-            <Box
-              display={Display.Flex}
-              flexDirection={FlexDirection.Row}
-              justifyContent={JustifyContent.center}
-              marginBottom={2}
-            >
-              <Button
-                className="hw-connect__external-btn-first"
-                variant={BUTTON_VARIANT.SECONDARY}
-                onClick={() => {
-                  this.trackMarketingEvent(
-                    MarketingActionNames.BuyNow,
-                    HardwareDeviceNames.trezor,
-                  );
-                  openWindow(HardwareAffiliateLinks.Trezor);
-                }}
-              >
-                {this.context.t('buyNow')}
-              </Button>
-              <Button
-                className="hw-connect__external-btn"
-                variant={BUTTON_VARIANT.SECONDARY}
-                onClick={() => {
-                  this.trackMarketingEvent(
-                    MarketingActionNames.Tutorial,
-                    HardwareDeviceNames.trezor,
-                  );
-                  openWindow(HardwareAffiliateTutorialLinks.Trezor);
-                }}
-              >
-                {this.context.t('tutorial')}
-              </Button>
-            </Box>
-
-            <p className="hw-connect__msg">{step.message}</p>
-            {step.asset && (
-              <img
-                className="hw-connect__step-asset"
-                src={`images/${step.asset}.svg`}
-                {...step.dimensions}
-                alt=""
-              />
-            )}
-          </Box>
-        ))}
-      </div>
-    );
-  }
-
-  renderQRHardwareWalletSteps() {
-    const steps = [];
-    steps.push(
-      {
-        title: this.context.t('QRHardwareWalletSteps1Title'),
-        message: this.context.t('QRHardwareWalletSteps1Description'),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('keystone')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.LearnMore,
-                  QrHardwareDeviceNames.Keystone,
-                );
-                openWindow(HardwareAffiliateLinks.Keystone);
-              }}
-            >
-              {this.context.t('learnMoreKeystone')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.Keystone,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.Keystone);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('airgapVault')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.AirGap,
-                );
-                openWindow(HardwareAffiliateLinks.AirGap);
-              }}
-            >
-              {this.context.t('downloadNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.AirGap,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.AirGap);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('coolWallet')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.CoolWallet,
-                );
-                openWindow(HardwareAffiliateLinks.CoolWallet);
-              }}
-            >
-              {this.context.t('buyNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.CoolWallet,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.CoolWallet);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">{this.context.t('dcent')}</p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.DCent,
-                );
-                openWindow(HardwareAffiliateLinks.DCent);
-              }}
-            >
-              {this.context.t('buyNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.DCent,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.DCent);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('imToken')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.ImToken,
-                );
-                openWindow(HardwareAffiliateLinks.ImToken);
-              }}
-            >
-              {this.context.t('downloadNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.ImToken,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.ImToken);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('oneKey')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  HardwareDeviceNames.oneKey,
-                );
-                openWindow(HardwareAffiliateLinks.OneKey);
-              }}
-            >
-              {this.context.t('buyNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  HardwareDeviceNames.oneKey,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.OneKey);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('QRHardwareWalletSteps2Description')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.Ngrave,
-                );
-                openWindow(HardwareAffiliateLinks.Ngrave);
-              }}
-              data-testid="ngrave-brand-buy-now-btn"
-            >
-              {this.context.t('buyNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.Ngrave,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.Ngrave);
-              }}
-              data-testid="ngrave-brand-learn-more-btn"
-            >
-              {this.context.t('learnMoreUpperCase')}
-            </Button>
-          </>
-        ),
-      },
-      {
-        message: (
-          <>
-            <p className="hw-connect__QR-subtitle">
-              {this.context.t('keycardShell')}
-            </p>
-            <Button
-              className="hw-connect__external-btn-first"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.BuyNow,
-                  QrHardwareDeviceNames.KShell,
-                );
-                openWindow(HardwareAffiliateLinks.KShell);
-              }}
-            >
-              {this.context.t('buyNow')}
-            </Button>
-            <Button
-              className="hw-connect__external-btn"
-              variant={BUTTON_VARIANT.SECONDARY}
-              onClick={() => {
-                this.trackMarketingEvent(
-                  MarketingActionNames.Tutorial,
-                  QrHardwareDeviceNames.KShell,
-                );
-                openWindow(HardwareAffiliateTutorialLinks.KShell);
-              }}
-            >
-              {this.context.t('tutorial')}
-            </Button>
-          </>
-        ),
-      },
-    );
-    return (
-      <div className="hw-tutorial">
-        {steps.map((step, index) => (
-          <div className="hw-connect" key={index}>
-            {step.title && <h3 className="hw-connect__title">{step.title}</h3>}
-            <div className="hw-connect__msg">{step.message}</div>
-            {step.asset && (
-              <img
-                className="hw-connect__step-asset"
-                src={`images/${step.asset}.svg`}
-                {...step.dimensions}
-                alt=""
-              />
-            )}
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-  renderConnectScreen() {
-    return (
-      <Box
-        className="new-external-account-form"
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        alignItems={AlignItems.center}
-        justifyContent={JustifyContent.center}
-      >
-        {this.renderHeader()}
-        {this.renderButtons()}
-        {this.state.selectedDevice ? this.renderTutorialSteps() : null}
-        {this.renderContinueButton()}
-        {this.renderFooter()}
-      </Box>
-    );
-  }
-
-  render() {
-    if (this.props.browserSupported) {
-      return this.renderConnectScreen();
-    }
-    return this.renderUnsupportedBrowser();
-  }
-}
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.stories.js b/ui/pages/create-account/connect-hardware/select-hardware.stories.tsx
similarity index 57%
rename from ui/pages/create-account/connect-hardware/select-hardware.stories.js
rename to ui/pages/create-account/connect-hardware/select-hardware.stories.tsx
index 25dfa2594de5..4f7fc0e9f614 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.stories.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.stories.tsx
@@ -1,14 +1,24 @@
 import React from 'react';
 import { LedgerTransportTypes } from '../../../../shared/constants/hardware-wallets';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
 import SelectHardware from './select-hardware';
 
-const mockTrackEvent = (event, properties) => {
-  console.log('Mock track event:', { event, properties });
-  return Promise.resolve();
+const mockMetaMetricsContext = {
+  trackEvent: () => Promise.resolve(),
+  bufferedTrace: () => Promise.resolve(undefined),
+  bufferedEndTrace: () => undefined,
+  onboardingParentContext: { current: null },
 };
 
 export default {
   title: 'Pages/CreateAccount/ConnectHardware/SelectHardware',
+  decorators: [
+    (Story: () => JSX.Element) => (
+      <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
+        <Story />
+      </MetaMetricsContext.Provider>
+    ),
+  ],
 };
 
 export const DefaultStory = () => {
@@ -19,10 +29,7 @@ export const DefaultStory = () => {
       connectToHardwareWallet={() => {
         /* no-op */
       }}
-      ledgerTransportType={LedgerTransportTypes.live}
-      context={{
-        trackEvent: mockTrackEvent,
-      }}
+      ledgerTransportType={LedgerTransportTypes.webhid}
     />
   );
 };
@@ -35,10 +42,6 @@ export const BrowserNotSupported = () => {
       onCancel={() => null}
       browserSupported={false}
       connectToHardwareWallet={() => undefined}
-      ledgerTransportType={LedgerTransportTypes.live}
-      context={{
-        trackEvent: mockTrackEvent,
-      }}
     />
   );
 };
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.test.tsx b/ui/pages/create-account/connect-hardware/select-hardware.test.tsx
new file mode 100644
index 000000000000..f8296b2ce882
--- /dev/null
+++ b/ui/pages/create-account/connect-hardware/select-hardware.test.tsx
@@ -0,0 +1,164 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
+import {
+  HardwareAffiliateLinks,
+  HardwareAffiliateTutorialLinks,
+  HardwareDeviceNames,
+} from '../../../../shared/constants/hardware-wallets';
+import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { openWindow } from '../../../helpers/utils/window';
+import SelectHardware from './select-hardware';
+
+jest.mock('../../../helpers/utils/window', () => ({
+  openWindow: jest.fn(),
+}));
+
+jest.mock('../../../../shared/lib/browser-runtime.utils', () => ({
+  getBrowserName: () => 'chrome',
+}));
+
+describe('SelectHardware', () => {
+  const mockOnCancel = jest.fn();
+  const mockConnectToHardwareWallet = jest.fn();
+
+  const render = (browserSupported = true, ledgerTransportType?: 'live') =>
+    renderWithProvider(
+      <SelectHardware
+        onCancel={mockOnCancel}
+        connectToHardwareWallet={mockConnectToHardwareWallet}
+        browserSupported={browserSupported}
+        ledgerTransportType={ledgerTransportType}
+      />,
+      undefined,
+    );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    global.platform = {
+      openTab: jest.fn(),
+    } as unknown as typeof global.platform;
+  });
+
+  it('disables continue button when no device is selected', () => {
+    render();
+
+    expect(
+      screen.getByRole('button', { name: messages.continue.message }),
+    ).toBeDisabled();
+  });
+
+  it('calls connectToHardwareWallet when ledger is selected and continue is clicked', () => {
+    render();
+
+    fireEvent.click(screen.getByLabelText(messages.ledger.message));
+    fireEvent.click(
+      screen.getByRole('button', { name: messages.continue.message }),
+    );
+
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledTimes(1);
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledWith(
+      HardwareDeviceNames.ledger,
+    );
+  });
+
+  it('calls onCancel when close button is clicked', () => {
+    render();
+
+    fireEvent.click(screen.getByTestId('hardware-connect-close-btn'));
+
+    expect(mockOnCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls connectToHardwareWallet when trezor is selected and continue is clicked', () => {
+    render();
+
+    fireEvent.click(screen.getByLabelText(messages.trezor.message));
+    fireEvent.click(
+      screen.getByRole('button', { name: messages.continue.message }),
+    );
+
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledTimes(1);
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledWith(
+      HardwareDeviceNames.trezor,
+    );
+  });
+
+  it('calls connectToHardwareWallet when qr is selected and continue is clicked', () => {
+    render();
+
+    fireEvent.click(screen.getByLabelText('QRCode'));
+    fireEvent.click(
+      screen.getByRole('button', { name: messages.continue.message }),
+    );
+
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledTimes(1);
+    expect(mockConnectToHardwareWallet).toHaveBeenCalledWith(
+      HardwareDeviceNames.qr,
+    );
+  });
+
+  it('opens ledger marketing links when ledger is selected', () => {
+    render();
+
+    fireEvent.click(screen.getByLabelText(messages.ledger.message));
+    fireEvent.click(
+      screen.getByRole('button', { name: messages.buyNow.message }),
+    );
+    fireEvent.click(
+      screen.getByRole('button', { name: messages.tutorial.message }),
+    );
+
+    expect(openWindow).toHaveBeenNthCalledWith(
+      1,
+      HardwareAffiliateLinks.Ledger,
+    );
+    expect(openWindow).toHaveBeenNthCalledWith(
+      2,
+      HardwareAffiliateTutorialLinks.Ledger,
+    );
+    expect(openWindow).toHaveBeenCalledTimes(2);
+  });
+
+  it('renders Ledger Live setup step for live transport', () => {
+    render(true, 'live');
+
+    fireEvent.click(screen.getByLabelText(messages.ledger.message));
+
+    expect(
+      screen.getByText(messages.step1LedgerWallet.message),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(messages.step2LedgerWallet.message),
+    ).toBeInTheDocument();
+  });
+
+  it('renders unsupported browser screen and opens Chrome download link', () => {
+    render(false);
+
+    fireEvent.click(
+      screen.getByRole('button', {
+        name: messages.downloadGoogleChrome.message,
+      }),
+    );
+
+    expect(global.platform.openTab).toHaveBeenCalledTimes(1);
+    expect(global.platform.openTab).toHaveBeenCalledWith({
+      url: 'https://google.com/chrome',
+    });
+  });
+
+  it('opens Ngrave marketing links when QR device is selected', () => {
+    render();
+
+    fireEvent.click(screen.getByLabelText('QRCode'));
+    fireEvent.click(screen.getByTestId('ngrave-brand-buy-now-btn'));
+    fireEvent.click(screen.getByTestId('ngrave-brand-learn-more-btn'));
+
+    expect(openWindow).toHaveBeenNthCalledWith(
+      1,
+      HardwareAffiliateLinks.Ngrave,
+    );
+    expect(openWindow).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.tsx b/ui/pages/create-account/connect-hardware/select-hardware.tsx
new file mode 100644
index 000000000000..6e9ca1d63a10
--- /dev/null
+++ b/ui/pages/create-account/connect-hardware/select-hardware.tsx
@@ -0,0 +1,699 @@
+import classnames from 'clsx';
+import React, { useCallback, useContext, useState } from 'react';
+import { upperFirst } from 'lodash';
+import {
+  Box,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  ButtonIcon,
+  ButtonIconSize,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  IconName,
+  Text,
+  TextAlign,
+  TextButton,
+  TextColor,
+  TextVariant,
+  FontWeight,
+} from '@metamask/design-system-react';
+import {
+  BannerAlert,
+  BannerAlertSeverity,
+} from '../../../components/component-library';
+import LogoLedger from '../../../components/ui/logo/logo-ledger';
+import LogoQRBased from '../../../components/ui/logo/logo-qr-based';
+import LogoTrezor from '../../../components/ui/logo/logo-trezor';
+import LogoLattice from '../../../components/ui/logo/logo-lattice';
+
+import {
+  HardwareDeviceNames,
+  HardwareAffiliateLinks,
+  HardwareAffiliateTutorialLinks,
+  LedgerTransportTypes,
+  MarketingActionNames,
+  QrHardwareDeviceNames,
+} from '../../../../shared/constants/hardware-wallets';
+import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { openWindow } from '../../../helpers/utils/window';
+import { getBrowserName } from '../../../../shared/lib/browser-runtime.utils';
+import { PLATFORM_FIREFOX } from '../../../../shared/constants/app';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+// Not all browsers have usb support. In particular, Firefox does
+// not support usb. More information on that can be found here:
+// https://mozilla.github.io/standards-positions/#webusb
+//
+// The below `&& window.navigator.usb` condition ensures that we
+// only attempt to connect Trezor via usb if we are in a browser
+// that supports usb. If not, the connection of the hardware wallet
+// to the browser will be handled by the Trezor connect screen. In
+// the case of Firefox, this will depend on the Trezor bridge software
+const isUSBSupported = !process.env.IN_TEST && window.navigator.usb;
+
+const isFirefox = getBrowserName() === PLATFORM_FIREFOX;
+
+const LEDGER_LIVE_APP_URL = 'https://www.ledger.com/ledger-live';
+
+type DeviceButtonConfig = {
+  device: HardwareDeviceNames;
+  testId: string;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  logo: React.ComponentType<{ className: string; ariaLabel: string }>;
+  ariaLabel: string;
+};
+
+const DEVICE_BUTTONS: DeviceButtonConfig[] = [
+  {
+    device: HardwareDeviceNames.ledger,
+    testId: 'connect-ledger-btn',
+    logo: LogoLedger as DeviceButtonConfig['logo'],
+    ariaLabel: 'Ledger',
+  },
+  {
+    device: HardwareDeviceNames.trezor,
+    testId: 'connect-trezor-btn',
+    logo: LogoTrezor as DeviceButtonConfig['logo'],
+    ariaLabel: 'Trezor',
+  },
+  {
+    device: HardwareDeviceNames.lattice,
+    testId: 'connect-lattice-btn',
+    logo: LogoLattice as DeviceButtonConfig['logo'],
+    ariaLabel: 'Lattice',
+  },
+  {
+    device: HardwareDeviceNames.qr,
+    testId: 'connect-qr-btn',
+    logo: LogoQRBased as DeviceButtonConfig['logo'],
+    ariaLabel: 'QRCode',
+  },
+];
+
+type TutorialStepConfig = {
+  titleKey: string;
+  messageKey: string;
+  asset: string;
+  dimensions: { width: string; height: string };
+  deviceName: string;
+  buyLink: string;
+  tutorialLink: string;
+};
+
+const DEVICE_TUTORIAL_CONFIG: Partial<Record<string, TutorialStepConfig>> = {
+  [HardwareDeviceNames.ledger]: {
+    titleKey: 'step2LedgerWallet',
+    messageKey: 'step2LedgerWalletMsg',
+    asset: 'plug-in-wallet',
+    dimensions: { width: '225px', height: '75px' },
+    deviceName: HardwareDeviceNames.ledger,
+    buyLink: HardwareAffiliateLinks.Ledger,
+    tutorialLink: HardwareAffiliateTutorialLinks.Ledger,
+  },
+  [HardwareDeviceNames.trezor]: {
+    titleKey: 'step1TrezorWallet',
+    messageKey: 'step1TrezorWalletMsg',
+    asset: 'plug-in-wallet',
+    dimensions: { width: '225px', height: '75px' },
+    deviceName: HardwareDeviceNames.trezor,
+    buyLink: HardwareAffiliateLinks.Trezor,
+    tutorialLink: HardwareAffiliateTutorialLinks.Trezor,
+  },
+  [HardwareDeviceNames.lattice]: {
+    titleKey: 'step1LatticeWallet',
+    messageKey: 'step1LatticeWalletMsg',
+    asset: 'connect-lattice',
+    dimensions: { width: '225px', height: '75px' },
+    deviceName: HardwareDeviceNames.lattice,
+    buyLink: HardwareAffiliateLinks.GridPlus,
+    tutorialLink: HardwareAffiliateTutorialLinks.GridPlus,
+  },
+};
+
+type QrBrandConfig = {
+  labelKey: string;
+  deviceName: string;
+  primaryLabelKey: string;
+  primaryLink: string;
+  primaryAction: string;
+  secondaryLabelKey: string;
+  secondaryLink: string;
+  testIdPrefix?: string;
+};
+
+const QR_BRAND_CONFIG: QrBrandConfig[] = [
+  {
+    labelKey: 'keystone',
+    deviceName: QrHardwareDeviceNames.Keystone,
+    primaryLabelKey: 'learnMoreKeystone',
+    primaryLink: HardwareAffiliateLinks.Keystone,
+    primaryAction: MarketingActionNames.LearnMore,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.Keystone,
+  },
+  {
+    labelKey: 'airgapVault',
+    deviceName: QrHardwareDeviceNames.AirGap,
+    primaryLabelKey: 'downloadNow',
+    primaryLink: HardwareAffiliateLinks.AirGap,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.AirGap,
+  },
+  {
+    labelKey: 'coolWallet',
+    deviceName: QrHardwareDeviceNames.CoolWallet,
+    primaryLabelKey: 'buyNow',
+    primaryLink: HardwareAffiliateLinks.CoolWallet,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.CoolWallet,
+  },
+  {
+    labelKey: 'dcent',
+    deviceName: QrHardwareDeviceNames.DCent,
+    primaryLabelKey: 'buyNow',
+    primaryLink: HardwareAffiliateLinks.DCent,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.DCent,
+  },
+  {
+    labelKey: 'imToken',
+    deviceName: QrHardwareDeviceNames.ImToken,
+    primaryLabelKey: 'downloadNow',
+    primaryLink: HardwareAffiliateLinks.ImToken,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.ImToken,
+  },
+  {
+    labelKey: 'oneKey',
+    deviceName: HardwareDeviceNames.oneKey,
+    primaryLabelKey: 'buyNow',
+    primaryLink: HardwareAffiliateLinks.OneKey,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.OneKey,
+  },
+  {
+    labelKey: 'QRHardwareWalletSteps2Description',
+    deviceName: QrHardwareDeviceNames.Ngrave,
+    primaryLabelKey: 'buyNow',
+    primaryLink: HardwareAffiliateLinks.Ngrave,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'learnMoreUpperCase',
+    secondaryLink: HardwareAffiliateTutorialLinks.Ngrave,
+    testIdPrefix: 'ngrave-brand',
+  },
+  {
+    labelKey: 'keycardShell',
+    deviceName: QrHardwareDeviceNames.KShell,
+    primaryLabelKey: 'buyNow',
+    primaryLink: HardwareAffiliateLinks.KShell,
+    primaryAction: MarketingActionNames.BuyNow,
+    secondaryLabelKey: 'tutorial',
+    secondaryLink: HardwareAffiliateTutorialLinks.KShell,
+  },
+];
+
+type SelectHardwareProps = {
+  onCancel: () => void;
+  connectToHardwareWallet: (device: string) => void;
+  browserSupported: boolean;
+  ledgerTransportType?: LedgerTransportTypes | 'live';
+};
+
+const SelectHardware = ({
+  onCancel,
+  connectToHardwareWallet,
+  browserSupported,
+  ledgerTransportType,
+}: SelectHardwareProps) => {
+  const t = useI18nContext();
+  const { trackEvent } = useContext(MetaMetricsContext);
+  const [selectedDevice, setSelectedDevice] = useState<string | null>(null);
+  const [trezorRequestDevicePending, setTrezorRequestDevicePending] =
+    useState(false);
+
+  const trackMarketingEvent = useCallback(
+    (type: string, device: string) => {
+      trackEvent({
+        event: MetaMetricsEventName.HardwareWalletMarketingButtonClicked,
+        properties: {
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          button_type: type,
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          device_type: upperFirst(device),
+        },
+      });
+    },
+    [trackEvent],
+  );
+
+  const connect = useCallback(async () => {
+    if (selectedDevice) {
+      if (selectedDevice === HardwareDeviceNames.trezor && isUSBSupported) {
+        setTrezorRequestDevicePending(true);
+        try {
+          await window.navigator.usb.requestDevice({
+            filters: [
+              { vendorId: 0x534c, productId: 0x0001 },
+              { vendorId: 0x1209, productId: 0x53c0 },
+              { vendorId: 0x1209, productId: 0x53c1 },
+            ],
+          });
+        } catch (e) {
+          if (!(e instanceof Error) || !e.message.match('No device selected')) {
+            throw e;
+          }
+        } finally {
+          setTrezorRequestDevicePending(false);
+        }
+      }
+      connectToHardwareWallet(selectedDevice);
+    }
+    return null;
+  }, [connectToHardwareWallet, selectedDevice]);
+
+  const renderDeviceButton = ({
+    device: deviceName,
+    testId,
+    logo: LogoComponent,
+    ariaLabel,
+  }: DeviceButtonConfig) => (
+    <button
+      data-testid={testId}
+      type="button"
+      className={classnames('hw-connect__btn', {
+        selected: selectedDevice === deviceName,
+      })}
+      onClick={() => setSelectedDevice(deviceName)}
+      key={deviceName}
+    >
+      <LogoComponent className="hw-connect__btn__img" ariaLabel={ariaLabel} />
+    </button>
+  );
+
+  const renderMarketingButtons = (
+    deviceName: string,
+    buyLink: string,
+    tutorialLink: string,
+  ) => (
+    <Box
+      flexDirection={BoxFlexDirection.Row}
+      justifyContent={BoxJustifyContent.Center}
+      marginBottom={2}
+    >
+      <Button
+        className="hw-connect__external-btn-first"
+        variant={ButtonVariant.Secondary}
+        onClick={() => {
+          trackMarketingEvent(MarketingActionNames.BuyNow, deviceName);
+          openWindow(buyLink);
+        }}
+      >
+        {t('buyNow')}
+      </Button>
+      <Button
+        className="hw-connect__external-btn"
+        variant={ButtonVariant.Secondary}
+        onClick={() => {
+          trackMarketingEvent(MarketingActionNames.Tutorial, deviceName);
+          openWindow(tutorialLink);
+        }}
+      >
+        {t('tutorial')}
+      </Button>
+    </Box>
+  );
+
+  const renderQrBrandSection = (brand: QrBrandConfig) => (
+    <>
+      <Text
+        asChild
+        variant={TextVariant.BodyMd}
+        fontWeight={FontWeight.Bold}
+        className="hw-connect__QR-subtitle"
+      >
+        <p>{t(brand.labelKey)}</p>
+      </Text>
+      <Button
+        className="hw-connect__external-btn-first"
+        variant={ButtonVariant.Secondary}
+        onClick={() => {
+          trackMarketingEvent(brand.primaryAction, brand.deviceName);
+          openWindow(brand.primaryLink);
+        }}
+        {...(brand.testIdPrefix
+          ? { 'data-testid': `${brand.testIdPrefix}-buy-now-btn` }
+          : {})}
+      >
+        {t(brand.primaryLabelKey)}
+      </Button>
+      <Button
+        className="hw-connect__external-btn"
+        variant={ButtonVariant.Secondary}
+        onClick={() => {
+          trackMarketingEvent(MarketingActionNames.Tutorial, brand.deviceName);
+          openWindow(brand.secondaryLink);
+        }}
+        {...(brand.testIdPrefix
+          ? { 'data-testid': `${brand.testIdPrefix}-learn-more-btn` }
+          : {})}
+      >
+        {t(brand.secondaryLabelKey)}
+      </Button>
+    </>
+  );
+
+  const renderDeviceButtons = () => (
+    <>
+      <Box className="hw-connect__btn-wrapper">
+        {renderDeviceButton(DEVICE_BUTTONS[0])}
+        {renderDeviceButton(DEVICE_BUTTONS[1])}
+      </Box>
+      <Box className="hw-connect__btn-wrapper" marginTop={2}>
+        {renderDeviceButton(DEVICE_BUTTONS[2])}
+        {renderDeviceButton(DEVICE_BUTTONS[3])}
+      </Box>
+    </>
+  );
+
+  const renderContinueButton = () => (
+    <Button
+      data-testid="connect-hardware-continue-btn"
+      variant={ButtonVariant.Primary}
+      size={ButtonSize.Lg}
+      className="hw-connect__connect-btn"
+      onClick={connect}
+      disabled={
+        !selectedDevice ||
+        trezorRequestDevicePending ||
+        (selectedDevice === HardwareDeviceNames.ledger && isFirefox)
+      }
+    >
+      {t('continue')}
+    </Button>
+  );
+
+  const renderFooter = () => (
+    <Box marginTop={4} className="new-external-account-form footer">
+      <Text
+        color={TextColor.TextAlternative}
+        variant={TextVariant.BodySm}
+        textAlign={TextAlign.Center}
+        asChild
+      >
+        <h6>{t('hardwareWalletsInfo')}</h6>
+      </Text>
+    </Box>
+  );
+
+  const renderUnsupportedBrowser = () => (
+    <Box
+      flexDirection={BoxFlexDirection.Column}
+      justifyContent={BoxJustifyContent.Center}
+      alignItems={BoxAlignItems.Center}
+      className="new-external-account-form unsupported-browser"
+    >
+      <Box
+        className="hw-connect"
+        flexDirection={BoxFlexDirection.Column}
+        alignItems={BoxAlignItems.Center}
+      >
+        <Box marginTop={6} marginBottom={3}>
+          <Text
+            className="hw-connect__title"
+            variant={TextVariant.HeadingMd}
+            asChild
+            fontWeight={FontWeight.Bold}
+          >
+            <h3>{t('browserNotSupported')}</h3>
+          </Text>
+        </Box>
+        <Box marginTop={3} marginBottom={5}>
+          <Text
+            className="hw-connect__msg"
+            variant={TextVariant.BodyMd}
+            asChild
+          >
+            <h5>{t('chromeRequiredForHardwareWallets')}</h5>
+          </Text>
+        </Box>
+      </Box>
+      <Button
+        variant={ButtonVariant.Primary}
+        size={ButtonSize.Lg}
+        onClick={() =>
+          global.platform.openTab({
+            url: 'https://google.com/chrome',
+          })
+        }
+      >
+        {t('downloadGoogleChrome')}
+      </Button>
+    </Box>
+  );
+
+  const renderHeader = () => (
+    <Box
+      className="hw-connect__header"
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Center}
+    >
+      {selectedDevice === HardwareDeviceNames.ledger && !isFirefox && (
+        <Box>
+          <BannerAlert
+            marginTop={6}
+            title={t('ledgerMultipleDevicesUnsupportedInfoTitle')}
+          >
+            {t('ledgerMultipleDevicesUnsupportedInfoDescription')}
+          </BannerAlert>
+        </Box>
+      )}
+      {selectedDevice === HardwareDeviceNames.ledger && isFirefox && (
+        <Box>
+          <BannerAlert
+            marginTop={6}
+            severity={BannerAlertSeverity.Warning}
+            title={t('ledgerFirefoxNotSupportedTitle')}
+          >
+            {t('ledgerFirefoxNotSupportedDescription1')}
+            <TextButton className="hw-connect__href-link" asChild>
+              <a
+                href={ZENDESK_URLS.HARDWARE_CONNECTION_TREZOR_LEDGER}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {t('ledgerFirefoxNotSupportedLink')}
+              </a>
+            </TextButton>
+            {t('ledgerFirefoxNotSupportedDescription2')}
+            <br />
+            {t('ledgerFirefoxNotSupportedDescription3')}
+          </BannerAlert>
+        </Box>
+      )}
+
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        justifyContent={BoxJustifyContent.Center}
+        alignItems={BoxAlignItems.Center}
+        className="hw-connect__header__title-wrapper"
+        marginTop={4}
+      >
+        <Box className="ml-auto">
+          <Text
+            variant={TextVariant.HeadingMd}
+            asChild
+            fontWeight={FontWeight.Bold}
+          >
+            <h3>{t('hardwareWallets')}</h3>
+          </Text>
+        </Box>
+        <ButtonIcon
+          iconName={IconName.Close}
+          ariaLabel={t('close') as string}
+          onClick={onCancel}
+          size={ButtonIconSize.Sm}
+          className="ml-auto"
+          data-testid="hardware-connect-close-btn"
+        />
+      </Box>
+      <Box marginTop={5} marginBottom={3}>
+        <Text
+          className="hw-connect__header__msg"
+          variant={TextVariant.BodyMd}
+          asChild
+        >
+          <h5>{t('hardwareWalletsMsg')}</h5>
+        </Text>
+      </Box>
+    </Box>
+  );
+
+  /**
+   * Renders tutorial steps for Ledger, Trezor, or Lattice using a shared layout.
+   * Each device has a single step with buy/tutorial marketing buttons,
+   * a message with a support link, and an asset image.
+   *
+   * @param config - The tutorial step configuration for the device
+   */
+  const renderDeviceTutorialContent = (config: TutorialStepConfig) => (
+    <Box
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Center}
+      className="hw-connect"
+    >
+      <Text
+        asChild
+        variant={TextVariant.HeadingSm}
+        className="hw-connect__title"
+      >
+        <h3>{t(config.titleKey)}</h3>
+      </Text>
+      {renderMarketingButtons(
+        config.deviceName,
+        config.buyLink,
+        config.tutorialLink,
+      )}
+      <Text asChild variant={TextVariant.BodyMd} className="hw-connect__msg">
+        <p>
+          {t(config.messageKey, [
+            <TextButton
+              className="hw-connect__msg-link"
+              key={`${config.deviceName}-support-link`}
+              asChild
+            >
+              <a
+                href={ZENDESK_URLS.HARDWARE_CONNECTION}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {t('hardwareWalletSupportLinkConversion')}
+              </a>
+            </TextButton>,
+          ])}
+        </p>
+      </Text>
+      <img
+        className="hw-connect__step-asset"
+        src={`images/${config.asset}.svg`}
+        {...config.dimensions}
+        alt=""
+      />
+    </Box>
+  );
+
+  const renderDeviceTutorialSteps = (config: TutorialStepConfig) => (
+    <Box className="hw-tutorial">{renderDeviceTutorialContent(config)}</Box>
+  );
+
+  /**
+   * Renders the QR hardware wallet section with a title step
+   * followed by all supported QR-based wallet brands.
+   */
+  const renderQRHardwareWalletSteps = () => (
+    <Box className="hw-tutorial">
+      <Box className="hw-connect">
+        <Text
+          asChild
+          variant={TextVariant.HeadingSm}
+          className="hw-connect__title"
+        >
+          <h3>{t('QRHardwareWalletSteps1Title')}</h3>
+        </Text>
+        <Text asChild variant={TextVariant.BodyMd} className="hw-connect__msg">
+          <p>{t('QRHardwareWalletSteps1Description')}</p>
+        </Text>
+      </Box>
+      {QR_BRAND_CONFIG.map((brand) => (
+        <Box className="hw-connect" key={brand.deviceName}>
+          <Box className="hw-connect__msg">{renderQrBrandSection(brand)}</Box>
+        </Box>
+      ))}
+    </Box>
+  );
+
+  const renderLedgerLiveStep = () => (
+    <Box className="hw-connect">
+      <Text
+        asChild
+        variant={TextVariant.HeadingSm}
+        className="hw-connect__title"
+      >
+        <h3>{t('step1LedgerWallet')}</h3>
+      </Text>
+      <Text asChild variant={TextVariant.BodyMd} className="hw-connect__msg">
+        <p>
+          {t('step1LedgerWalletMsg', [
+            <TextButton
+              className="hw-connect__msg-link"
+              key="ledger-live-app-link"
+              asChild
+            >
+              <a
+                href={LEDGER_LIVE_APP_URL}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {t('ledgerLiveApp')}
+              </a>
+            </TextButton>,
+          ])}
+        </p>
+      </Text>
+    </Box>
+  );
+
+  const renderTutorialSteps = () => {
+    if (selectedDevice === HardwareDeviceNames.qr) {
+      return renderQRHardwareWalletSteps();
+    }
+    const config = selectedDevice
+      ? DEVICE_TUTORIAL_CONFIG[selectedDevice]
+      : undefined;
+
+    if (
+      selectedDevice === HardwareDeviceNames.ledger &&
+      ledgerTransportType === 'live' &&
+      config
+    ) {
+      return (
+        <Box className="hw-tutorial">
+          {renderLedgerLiveStep()}
+          {renderDeviceTutorialContent(config)}
+        </Box>
+      );
+    }
+
+    return config ? renderDeviceTutorialSteps(config) : null;
+  };
+
+  const renderConnectScreen = () => (
+    <Box
+      className="new-external-account-form"
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Center}
+      justifyContent={BoxJustifyContent.Center}
+    >
+      {renderHeader()}
+      {renderDeviceButtons()}
+      {selectedDevice ? renderTutorialSteps() : null}
+      {renderContinueButton()}
+      {renderFooter()}
+    </Box>
+  );
+
+  if (browserSupported) {
+    return renderConnectScreen();
+  }
+  return renderUnsupportedBrowser();
+};
+
+export default SelectHardware;
diff --git a/ui/pages/create-account/connect-hardware/utils.ts b/ui/pages/create-account/connect-hardware/utils.ts
deleted file mode 100644
index 4a5a6cb52013..000000000000
--- a/ui/pages/create-account/connect-hardware/utils.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Capitalizes the first letter of a string.
- *
- * @param str - The string to capitalize
- * @returns The capitalized string
- */
-export const capitalizeStr = (str: string) => {
-  if (str.length === 0) {
-    return str;
-  }
-  return str.charAt(0).toUpperCase() + str.slice(1);
-};
diff --git a/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap b/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap
index d1dc842cb0fd..299934819d1f 100644
--- a/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap
+++ b/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`CreatePasswordForm renders match snapshot 1`] = `
         </p>
       </div>
       <div
-        class="mm-box"
+        class=""
       >
         <div
           class="mm-box mm-form-text-field mm-box--display-flex mm-box--flex-direction-column"
@@ -71,18 +71,24 @@ exports[`CreatePasswordForm renders match snapshot 1`] = `
             />
             <button
               aria-label="[passwordToggleShow]"
-              class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
               data-testid="show-password"
               type="button"
             >
-              <span
-                class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-                style="mask-image: url('./images/icons/eye.svg');"
-              />
+              <svg
+                class="inline-block w-6 h-6 text-inherit"
+                fill="currentColor"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 15.886q1.875 0 3.188-1.313C16.5 13.26 16.5 12.636 16.5 11.386s-.437-2.313-1.312-3.188S13.25 6.886 12 6.886s-2.312.437-3.187 1.312S7.5 10.136 7.5 11.386s.438 2.312 1.313 3.187S10.75 15.886 12 15.886m0-1.8q-1.125 0-1.912-.788C9.3 12.51 9.3 12.136 9.3 11.386s.263-1.388.788-1.913S11.25 8.686 12 8.686s1.388.262 1.913.787.787 1.163.787 1.913-.262 1.387-.787 1.912-1.163.788-1.913.788m0 4.8q-3.65 0-6.65-2.038c-3-2.038-3.45-3.18-4.35-5.462Q2.35 7.96 5.35 5.922T12 3.885t6.65 2.038T23 11.385q-1.35 3.426-4.35 5.463c-3 2.037-4.217 2.038-6.65 2.038m0-2q2.825 0 5.188-1.488c2.363-1.488 2.779-2.33 3.612-4.012a9.77 9.77 0 0 0-3.612-4.013Q14.825 5.886 12 5.886c-2.825 0-3.612.495-5.187 1.487A9.77 9.77 0 0 0 3.2 11.386q1.25 2.524 3.613 4.012c2.363 1.488 3.304 1.488 5.187 1.488"
+                />
+              </svg>
             </button>
           </div>
           <p
-            class="mm-box mm-text mm-help-text mm-form-text-field__help-text mm-text--body-sm mm-box--margin-top-1 mm-box--color-text-alternative"
+            class="mm-box mm-text mm-help-text mm-form-text-field__help-text text-alternative mm-text--body-sm mm-box--margin-top-1 mm-box--color-text-default"
             data-testid="short-password-error"
           >
             [passwordNotLongEnough]
@@ -111,14 +117,20 @@ exports[`CreatePasswordForm renders match snapshot 1`] = `
             />
             <button
               aria-label="[passwordToggleShow]"
-              class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+              class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
               data-testid="show-confirm-password"
               type="button"
             >
-              <span
-                class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-                style="mask-image: url('./images/icons/eye.svg');"
-              />
+              <svg
+                class="inline-block w-6 h-6 text-inherit"
+                fill="currentColor"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M12 15.886q1.875 0 3.188-1.313C16.5 13.26 16.5 12.636 16.5 11.386s-.437-2.313-1.312-3.188S13.25 6.886 12 6.886s-2.312.437-3.187 1.312S7.5 10.136 7.5 11.386s.438 2.312 1.313 3.187S10.75 15.886 12 15.886m0-1.8q-1.125 0-1.912-.788C9.3 12.51 9.3 12.136 9.3 11.386s.263-1.388.788-1.913S11.25 8.686 12 8.686s1.388.262 1.913.787.787 1.163.787 1.913-.262 1.387-.787 1.912-1.163.788-1.913.788m0 4.8q-3.65 0-6.65-2.038c-3-2.038-3.45-3.18-4.35-5.462Q2.35 7.96 5.35 5.922T12 3.885t6.65 2.038T23 11.385q-1.35 3.426-4.35 5.463c-3 2.037-4.217 2.038-6.65 2.038m0-2q2.825 0 5.188-1.488c2.363-1.488 2.779-2.33 3.612-4.012a9.77 9.77 0 0 0-3.612-4.013Q14.825 5.886 12 5.886c-2.825 0-3.612.495-5.187 1.487A9.77 9.77 0 0 0 3.2 11.386q1.25 2.524 3.613 4.012c2.363 1.488 3.304 1.488 5.187 1.488"
+                />
+              </svg>
             </button>
           </div>
           
diff --git a/ui/pages/defi/components/__snapshots__/defi-details-list.test.tsx.snap b/ui/pages/defi/components/__snapshots__/defi-details-list.test.tsx.snap
index 491599f1fdbb..db5f3c64f92c 100644
--- a/ui/pages/defi/components/__snapshots__/defi-details-list.test.tsx.snap
+++ b/ui/pages/defi/components/__snapshots__/defi-details-list.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DeFiDetailsPage renders defi details list 1`] = `
+exports[`DefiDetailsList renders defi details list 1`] = `
 <div>
   <div
     class="mm-box"
@@ -15,88 +15,8 @@ exports[`DeFiDetailsPage renders defi details list 1`] = `
         Supplied
       </p>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
-      >
-        <a
-          class="mm-box mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
-          data-testid="multichain-token-list-button"
-          style="height: 62px;"
-        >
-          <div
-            class="mm-box mm-badge-wrapper mm-box--margin-right-4 mm-box--display-inline-block"
-            style="align-self: center;"
-          >
-            <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-section mm-box--rounded-full"
-            >
-              <img
-                alt="Ethereum logo"
-                class="mm-avatar-token__token-image"
-                src="https://example.com/eth-icon.png"
-              />
-            </div>
-            <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-            >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-section mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
-              >
-                <img
-                  alt="Custom Mainnet RPC logo"
-                  class="mm-avatar-network__network-image"
-                  src="./images/eth_logo.svg"
-                />
-              </div>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
-            style="flex-grow: 1; overflow: hidden;"
-          >
-            <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
-            >
-              <div
-                class="flex flex-row gap-2 min-w-0"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-                  data-testid="multichain-token-list-item-token-name"
-                >
-                  Ethereum
-                </p>
-              </div>
-              <p
-                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
-                data-testid="multichain-token-list-item-secondary-value"
-                style="white-space: nowrap; padding-inline-start: 8px;"
-              >
-                $2,000.00
-              </p>
-            </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
-                  data-testid="token-increase-decrease-percentage-0x0"
-                >
-                  -
-                </p>
-              </div>
-              <p
-                class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-                data-testid="multichain-token-list-item-value"
-              >
-                500 Ethereum
-              </p>
-            </div>
-          </div>
-        </a>
-      </div>
+        data-testid="defi-details-token-cell-stub"
+      />
     </div>
     <div
       class="mm-box"
@@ -108,88 +28,8 @@ exports[`DeFiDetailsPage renders defi details list 1`] = `
         Reward
       </p>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
-      >
-        <a
-          class="mm-box mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
-          data-testid="multichain-token-list-button"
-          style="height: 62px;"
-        >
-          <div
-            class="mm-box mm-badge-wrapper mm-box--margin-right-4 mm-box--display-inline-block"
-            style="align-self: center;"
-          >
-            <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-section mm-box--rounded-full"
-            >
-              <img
-                alt="Ethereum logo"
-                class="mm-avatar-token__token-image"
-                src="https://example.com/eth-icon.png"
-              />
-            </div>
-            <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-            >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-section mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
-              >
-                <img
-                  alt="Custom Mainnet RPC logo"
-                  class="mm-avatar-network__network-image"
-                  src="./images/eth_logo.svg"
-                />
-              </div>
-            </div>
-          </div>
-          <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
-            style="flex-grow: 1; overflow: hidden;"
-          >
-            <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
-            >
-              <div
-                class="flex flex-row gap-2 min-w-0"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-                  data-testid="multichain-token-list-item-token-name"
-                >
-                  Ethereum
-                </p>
-              </div>
-              <p
-                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
-                data-testid="multichain-token-list-item-secondary-value"
-                style="white-space: nowrap; padding-inline-start: 8px;"
-              >
-                $2,000.00
-              </p>
-            </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
-              >
-                <p
-                  class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
-                  data-testid="token-increase-decrease-percentage-0x0"
-                >
-                  -
-                </p>
-              </div>
-              <p
-                class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-                data-testid="multichain-token-list-item-value"
-              >
-                500 Ethereum
-              </p>
-            </div>
-          </div>
-        </a>
-      </div>
+        data-testid="defi-details-token-cell-stub"
+      />
     </div>
   </div>
 </div>
diff --git a/ui/pages/defi/components/defi-details-list.test.tsx b/ui/pages/defi/components/defi-details-list.test.tsx
index 06d51a2dee5c..18b17896bbb7 100644
--- a/ui/pages/defi/components/defi-details-list.test.tsx
+++ b/ui/pages/defi/components/defi-details-list.test.tsx
@@ -4,8 +4,23 @@ import thunk from 'redux-thunk';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import mockState from '../../../../test/data/mock-state.json';
+import type { TokenCellProps } from '../../../components/app/assets/token-cell/token-cell';
+import TokenCell from '../../../components/app/assets/token-cell';
 import DefiDetailsList from './defi-details-list';
 
+jest.mock('../../../components/app/assets/token-cell', () => {
+  const ReactActual = jest.requireActual<typeof import('react')>('react');
+  const moduleExports: { default: ReturnType<typeof jest.fn> } = {
+    default: jest.fn(() =>
+      ReactActual.createElement('div', {
+        'data-testid': 'defi-details-token-cell-stub',
+      }),
+    ),
+  };
+  Object.defineProperty(moduleExports, '__esModule', { value: true });
+  return moduleExports;
+});
+
 const mockUseParams = jest
   .fn()
   .mockReturnValue({ chainId: CHAIN_IDS.MAINNET, protocolId: 'aave' });
@@ -32,8 +47,38 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-describe('DeFiDetailsPage', () => {
+const sampleTokens = [
+  [
+    {
+      symbol: 'ETH',
+      type: 'underlying' as const,
+      address: '0x0',
+      name: 'Ethereum',
+      decimals: 18,
+      balance: 500,
+      balanceRaw: '500000000000000000000',
+      marketValue: 2000,
+      iconUrl: 'https://example.com/eth-icon.png',
+    },
+    {
+      symbol: 'ETH',
+      type: 'underlying-claimable' as const,
+      address: '0x0',
+      name: 'Ethereum',
+      decimals: 18,
+      balance: 500,
+      balanceRaw: '500000000000000000000',
+      marketValue: 2000,
+      iconUrl: 'https://example.com/eth-icon.png',
+    },
+  ],
+];
+
+describe('DefiDetailsList', () => {
   const store = configureMockStore([thunk])(mockState);
+  const MockedTokenCell = TokenCell as jest.MockedFunction<
+    (props: TokenCellProps) => React.ReactElement | null
+  >;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -47,32 +92,7 @@ describe('DeFiDetailsPage', () => {
   it('renders defi details list', () => {
     const { container } = renderWithProvider(
       <DefiDetailsList
-        tokens={[
-          [
-            {
-              symbol: 'ETH',
-              type: 'underlying',
-              address: '0x0',
-              name: 'Ethereum',
-              decimals: 18,
-              balance: 500,
-              balanceRaw: '500000000000000000000',
-              marketValue: 2000,
-              iconUrl: 'https://example.com/eth-icon.png',
-            },
-            {
-              symbol: 'ETH',
-              type: 'underlying-claimable',
-              address: '0x0',
-              name: 'Ethereum',
-              decimals: 18,
-              balance: 500,
-              balanceRaw: '500000000000000000000',
-              marketValue: 2000,
-              iconUrl: 'https://example.com/eth-icon.png',
-            },
-          ],
-        ]}
+        tokens={sampleTokens}
         positionType={'supply'}
         chainId={'0x1'}
       />,
@@ -81,4 +101,21 @@ describe('DeFiDetailsPage', () => {
 
     expect(container).toMatchSnapshot();
   });
+
+  it('does not pass musd Merkl or convert surfaces to TokenCell (DeFi list is not a Merkl / mUSD home-list surface)', () => {
+    renderWithProvider(
+      <DefiDetailsList
+        tokens={sampleTokens}
+        positionType="supply"
+        chainId={CHAIN_IDS.MAINNET}
+      />,
+      store,
+    );
+
+    expect(MockedTokenCell).toHaveBeenCalled();
+    for (const [props] of MockedTokenCell.mock.calls) {
+      expect(props.musd?.merklClaimBonus).toBeUndefined();
+      expect(props.musd?.convert).toBeUndefined();
+    }
+  });
 });
diff --git a/ui/pages/defi/components/defi-details-list.tsx b/ui/pages/defi/components/defi-details-list.tsx
index b39f9eab8001..ffa6ef8d07e3 100644
--- a/ui/pages/defi/components/defi-details-list.tsx
+++ b/ui/pages/defi/components/defi-details-list.tsx
@@ -131,7 +131,6 @@ const DefiDetailsList = React.memo(
                         onClick={undefined}
                         fixCurrencyToUSD
                         safeChains={safeChains}
-                        showMerklBadge
                       />
                     ))}
                   </Box>
diff --git a/ui/pages/error-page/error-component.test.tsx b/ui/pages/error-page/error-component.test.tsx
index 92b7ba0af125..bf43145a55be 100644
--- a/ui/pages/error-page/error-component.test.tsx
+++ b/ui/pages/error-page/error-component.test.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import '@testing-library/jest-dom';
-import browser from 'webextension-polyfill';
 import { fireEvent } from '@testing-library/react';
 import thunk from 'redux-thunk';
 import configureMockState from 'redux-mock-store';
@@ -13,16 +12,15 @@ import { getMessage } from '../../helpers/utils/i18n-helper';
 import { enLocale as messages } from '../../../test/lib/i18n-helpers';
 import { getUserSubscriptions } from '../../selectors/subscription';
 import mockState from '../../../test/data/mock-state.json';
+import { reloadExtensionFromUi } from '../../helpers/utils/reload-extension-from-ui';
 import ErrorPage from './error-page.component';
 
 jest.mock('../../hooks/useI18nContext', () => ({
   useI18nContext: jest.fn(),
 }));
 
-jest.mock('webextension-polyfill', () => ({
-  runtime: {
-    reload: jest.fn(),
-  },
+jest.mock('../../helpers/utils/reload-extension-from-ui', () => ({
+  reloadExtensionFromUi: jest.fn().mockResolvedValue(undefined),
 }));
 
 jest.mock('react-redux', () => ({
@@ -159,7 +157,7 @@ describe('ErrorPage', () => {
     expect(describeButton).toBeNull();
   });
 
-  it('should reload the extension when the "Try Again" button is clicked', () => {
+  it('reloads the extension when the "Try Again" button is clicked', () => {
     const { getByTestId } = renderWithProvider(
       <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
         <ErrorPage error={MockError} />
@@ -167,7 +165,7 @@ describe('ErrorPage', () => {
     );
     const tryAgainButton = getByTestId('error-page-try-again-button');
     fireEvent.click(tryAgainButton);
-    expect(browser.runtime.reload).toHaveBeenCalled();
+    expect(reloadExtensionFromUi).toHaveBeenCalledTimes(1);
   });
 
   it('should open the support consent modal when the "Contact Support" button is clicked', () => {
diff --git a/ui/pages/error-page/error-page.component.tsx b/ui/pages/error-page/error-page.component.tsx
index f726309720e4..504010fc7dac 100644
--- a/ui/pages/error-page/error-page.component.tsx
+++ b/ui/pages/error-page/error-page.component.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import browser from 'webextension-polyfill';
 
 import { getParticipateInMetaMetrics } from '../../selectors';
 import { useI18nContext } from '../../hooks/useI18nContext';
@@ -37,6 +36,7 @@ import { Textarea } from '../../components/component-library/textarea/textarea';
 import { TextareaResize } from '../../components/component-library/textarea/textarea.types';
 import { ButtonSize } from '../../components/component-library/button/button.types';
 import VisitSupportDataConsentModal from '../../components/app/modals/visit-support-data-consent-modal';
+import { reloadExtensionFromUi } from '../../helpers/utils/reload-extension-from-ui';
 
 type ErrorPageProps = {
   error: {
@@ -107,6 +107,7 @@ const ErrorPage: React.FC<ErrorPageProps> = ({ error }) => {
             color={TextColor.inherit}
             variant={TextVariant.headingMd}
             marginBottom={4}
+            data-testid="error-page-title"
           >
             {t('errorPageTitle')}
           </Text>
@@ -300,8 +301,9 @@ const ErrorPage: React.FC<ErrorPageProps> = ({ error }) => {
             variant={ButtonVariant.Secondary}
             block
             data-testid="error-page-try-again-button"
-            // TODO: should this be a safe reload via the `WriteManager`?
-            onClick={() => browser.runtime.reload()}
+            onClick={async () => {
+              await reloadExtensionFromUi();
+            }}
           >
             {t('errorPageTryAgain')}
           </Button>
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 7a95f5a9008a..91ba1cd8c3ae 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -7,6 +7,7 @@ import {
   MetaMetricsContextProp,
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../shared/constants/metametrics';
 import TermsOfUsePopup from '../../components/app/terms-of-use-popup';
 import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
@@ -678,7 +679,7 @@ export default class Home extends PureComponent {
         category: MetaMetricsEventCategory.Home,
         event: MetaMetricsEventName.AnalyticsPreferenceSelected,
         properties: {
-          has_marketing_consent: false,
+          [MetaMetricsUserTrait.HasMarketingConsent]: false,
           location: 'marketing_consent_modal',
         },
       });
@@ -690,7 +691,7 @@ export default class Home extends PureComponent {
         category: MetaMetricsEventCategory.Home,
         event: MetaMetricsEventName.AnalyticsPreferenceSelected,
         properties: {
-          has_marketing_consent: consent,
+          [MetaMetricsUserTrait.HasMarketingConsent]: consent,
           location: 'marketing_consent_modal',
         },
       });
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index b82acee79201..717ecaffc69b 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -85,6 +85,7 @@ import {
   setRedirectAfterDefaultPage,
 } from '../../ducks/history/history';
 import { AppHeader } from '../../components/multichain/app-header';
+import { DappConnectionControlBar } from '../../components/multichain/dapp-connection-control-bar';
 import Home from './home.component';
 
 const mapStateToProps = (state) => {
@@ -244,7 +245,6 @@ const HomeWithRouter = ({ match: _match, ...props }) => {
 
   return (
     <>
-      {/* Note: Consider a sticky header instead of overflow */}
       <AppHeader />
 
       <div className="flex flex-col flex-1 min-h-0">
@@ -252,6 +252,7 @@ const HomeWithRouter = ({ match: _match, ...props }) => {
           {...props}
           evaluateCohortEligibility={evaluateCohortEligibility}
         />
+        <DappConnectionControlBar />
       </div>
     </>
   );
diff --git a/ui/pages/home/home.container.test.tsx b/ui/pages/home/home.container.test.tsx
new file mode 100644
index 000000000000..6363120c9318
--- /dev/null
+++ b/ui/pages/home/home.container.test.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import configureStore from '../../store/store';
+import mockState from '../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
+
+jest.mock('../../components/multichain/app-header', () => ({
+  AppHeader: () => <div data-testid="mock-app-header" />,
+}));
+
+jest.mock('../../components/multichain/dapp-connection-control-bar', () => ({
+  DappConnectionControlBar: () => <div data-testid="dapp-control-bar-bottom" />,
+}));
+
+jest.mock('./home.component', () => {
+  const HomeComponent = () => <div data-testid="mock-home" />;
+  return HomeComponent;
+});
+
+jest.mock('../../contexts/shield/shield-subscription', () => ({
+  useShieldSubscriptionContext: () => ({
+    evaluateCohortEligibility: jest.fn(),
+  }),
+}));
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => jest.fn(),
+}));
+
+const renderHome = () => {
+  const store = configureStore({
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      isUnlocked: true,
+      completedOnboarding: true,
+    },
+  });
+
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+  const HomeContainer = require('./home.container').default;
+  return renderWithProvider(<HomeContainer />, store);
+};
+
+describe('HomeWithRouter', () => {
+  it('renders AppHeader and DappConnectionControlBar', () => {
+    const { getByTestId } = renderHome();
+    expect(getByTestId('mock-app-header')).toBeInTheDocument();
+    expect(getByTestId('dapp-control-bar-bottom')).toBeInTheDocument();
+  });
+
+  it('renders DappConnectionControlBar after Home content', () => {
+    const { getByTestId } = renderHome();
+    const home = getByTestId('mock-home');
+    const bar = getByTestId('dapp-control-bar-bottom');
+    const position = home.compareDocumentPosition(bar);
+    expect(position).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
+  });
+});
diff --git a/ui/pages/keychains/__snapshots__/restore-vault.test.tsx.snap b/ui/pages/keychains/__snapshots__/restore-vault.test.tsx.snap
index 8e29f62cd48e..4eba7810e152 100644
--- a/ui/pages/keychains/__snapshots__/restore-vault.test.tsx.snap
+++ b/ui/pages/keychains/__snapshots__/restore-vault.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`Restore vault Component renders match snapshot 1`] = `
              
             Enter your 
             <button
-              class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed"
+              class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed"
               role="button"
             >
               <span
diff --git a/ui/pages/keychains/password-prompt.tsx b/ui/pages/keychains/password-prompt.tsx
index 6f86973eb61e..e414c025562a 100644
--- a/ui/pages/keychains/password-prompt.tsx
+++ b/ui/pages/keychains/password-prompt.tsx
@@ -26,6 +26,8 @@ type PasswordPromptProps = {
   onTogglePasswordVisibility: (event: React.MouseEvent) => void;
   onSubmit: (event: React.MouseEvent | React.FormEvent) => void;
   onContinueClick: (event: React.MouseEvent) => void;
+  isMalicious?: boolean;
+  dangerAcknowledged?: boolean;
 };
 
 export function PasswordPrompt({
@@ -36,11 +38,22 @@ export function PasswordPrompt({
   onTogglePasswordVisibility,
   onSubmit,
   onContinueClick,
+  isMalicious = false,
+  dangerAcknowledged = false,
 }: Readonly<PasswordPromptProps>) {
   const t = useI18nContext();
   return (
     <>
-      <form onSubmit={onSubmit} data-testid="reveal-seed-password-form">
+      <form
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (password === '' || (isMalicious && !dangerAcknowledged)) {
+            return;
+          }
+          onSubmit(event);
+        }}
+        data-testid="reveal-seed-password-form"
+      >
         <Label htmlFor="password-box">{t('enterPasswordContinue')}</Label>
         <TextField
           inputProps={{
@@ -84,7 +97,8 @@ export function PasswordPrompt({
         <Button
           size={ButtonSize.Lg}
           onClick={onContinueClick}
-          disabled={password === ''}
+          isDanger={isMalicious}
+          disabled={password === '' || (isMalicious && !dangerAcknowledged)}
           data-testid="reveal-seed-password-continue"
           className="w-full"
         >
diff --git a/ui/pages/keychains/reveal-seed-warning.tsx b/ui/pages/keychains/reveal-seed-warning.tsx
index 35267efe018e..67dbcaea6c0b 100644
--- a/ui/pages/keychains/reveal-seed-warning.tsx
+++ b/ui/pages/keychains/reveal-seed-warning.tsx
@@ -1,5 +1,10 @@
 import React from 'react';
-import { TextVariant, TextColor, Text } from '@metamask/design-system-react';
+import {
+  TextVariant,
+  TextColor,
+  Text,
+  FontWeight,
+} from '@metamask/design-system-react';
 import {
   BannerAlert,
   BannerAlertSeverity,
@@ -7,16 +12,26 @@ import {
 
 type RevealSeedWarningProps = {
   message: string;
+  title?: string;
+  'data-testid'?: string;
 };
 
 export function RevealSeedWarning({
   message,
+  title,
+  'data-testid': dataTestId = 'reveal-seed-warning',
 }: Readonly<RevealSeedWarningProps>) {
   return (
-    <BannerAlert
-      severity={BannerAlertSeverity.Danger}
-      data-testid="reveal-seed-warning"
-    >
+    <BannerAlert severity={BannerAlertSeverity.Danger} data-testid={dataTestId}>
+      {title && (
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextDefault}
+          fontWeight={FontWeight.Bold}
+        >
+          {title}
+        </Text>
+      )}
       <Text variant={TextVariant.BodySm} color={TextColor.TextDefault}>
         {message}
       </Text>
diff --git a/ui/pages/keychains/reveal-seed.test.tsx b/ui/pages/keychains/reveal-seed.test.tsx
index 1f4a7b95ed67..cbc0ba50ce0f 100644
--- a/ui/pages/keychains/reveal-seed.test.tsx
+++ b/ui/pages/keychains/reveal-seed.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent, waitFor } from '@testing-library/react';
 import thunk from 'redux-thunk';
+import { RecommendedAction } from '@metamask/phishing-controller';
 import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
 import mockState from '../../../test/data/mock-state.json';
 import { MetaMetricsContext } from '../../contexts/metametrics';
@@ -39,6 +40,7 @@ const mockRequestRevealSeedWords = jest
   .mockImplementation(
     mockSuccessfulSrpReveal as () => (dispatch: jest.Mock) => Promise<string>,
   );
+const mockScanUrlForPhishing = jest.fn().mockResolvedValue(null);
 
 const password = 'password';
 
@@ -46,6 +48,7 @@ jest.mock('../../store/actions.ts', () => ({
   ...jest.requireActual('../../store/actions.ts'),
   requestRevealSeedWords: (userPassword: string, keyringId?: string) =>
     mockRequestRevealSeedWords(userPassword, keyringId),
+  scanUrlForPhishing: (...args: unknown[]) => mockScanUrlForPhishing(...args),
 }));
 
 type NavigateQuizToPasswordScreenArgs = {
@@ -86,6 +89,19 @@ async function navigateQuizToPasswordScreen({
   });
 }
 
+function createMockMetaMetricsContext() {
+  const mockTrackEvent = jest.fn();
+  return {
+    context: {
+      trackEvent: mockTrackEvent,
+      bufferedTrace: jest.fn(),
+      bufferedEndTrace: jest.fn(),
+      onboardingParentContext: { current: null },
+    },
+    mockTrackEvent,
+  };
+}
+
 describe('Reveal Seed Page', () => {
   const mockStore = configureMockStore([thunk])(mockState as object);
 
@@ -95,18 +111,26 @@ describe('Reveal Seed Page', () => {
   });
 
   afterEach(() => {
-    jest.clearAllMocks();
+    mockScanUrlForPhishing.mockReset().mockResolvedValue(null);
   });
 
-  it('should match snapshot', () => {
+  it('should match snapshot', async () => {
     const { container } = renderWithProvider(<RevealSeedPage />, mockStore);
 
+    await waitFor(() => {
+      expect(mockScanUrlForPhishing).toHaveBeenCalled();
+    });
+
     expect(container).toMatchSnapshot();
   });
 
-  it('shows quiz introduction first', () => {
+  it('shows quiz introduction first', async () => {
     const { getByText } = renderWithProvider(<RevealSeedPage />, mockStore);
 
+    await waitFor(() => {
+      expect(mockScanUrlForPhishing).toHaveBeenCalled();
+    });
+
     expect(
       getByText(messages.srpSecurityQuizGetStarted.message),
     ).toBeInTheDocument();
@@ -150,6 +174,32 @@ describe('Reveal Seed Page', () => {
     });
   });
 
+  it('submits the password form via form submit', async () => {
+    const { queryByTestId, getByText } = renderWithProvider(
+      <RevealSeedPage />,
+      mockStore,
+    );
+
+    await navigateQuizToPasswordScreen({
+      getByText,
+      queryByTestId,
+      fireEvent,
+    });
+
+    fireEvent.change(queryByTestId('input-password') as HTMLElement, {
+      target: { value: password },
+    });
+
+    fireEvent.submit(queryByTestId('reveal-seed-password-form') as HTMLElement);
+
+    await waitFor(() => {
+      expect(mockRequestRevealSeedWords).toHaveBeenCalledWith(
+        password,
+        undefined,
+      );
+    });
+  });
+
   it('shows error when password is wrong', async () => {
     mockRequestRevealSeedWords.mockImplementation(
       mockUnsuccessfulSrpReveal as () => (
@@ -222,15 +272,10 @@ describe('Reveal Seed Page', () => {
         ) => Promise<string>,
       );
 
-    const mockTrackEvent = jest.fn();
-    const mockMetaMetricsContext = {
-      trackEvent: mockTrackEvent,
-      bufferedTrace: jest.fn(),
-      bufferedEndTrace: jest.fn(),
-      onboardingParentContext: { current: null },
-    };
+    const { context: metricsContext, mockTrackEvent } =
+      createMockMetaMetricsContext();
     const { queryByTestId, getByText, getByRole } = renderWithProvider(
-      <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
+      <MetaMetricsContext.Provider value={metricsContext}>
         <RevealSeedPage />
       </MetaMetricsContext.Provider>,
       store,
@@ -430,15 +475,10 @@ describe('Reveal Seed Page', () => {
   });
 
   it('should emit event when back button is clicked', async () => {
-    const mockTrackEvent = jest.fn();
-    const mockMetaMetricsContext = {
-      trackEvent: mockTrackEvent,
-      bufferedTrace: jest.fn(),
-      bufferedEndTrace: jest.fn(),
-      onboardingParentContext: { current: null },
-    };
+    const { context: metricsContext, mockTrackEvent } =
+      createMockMetaMetricsContext();
     const { getByLabelText } = renderWithProvider(
-      <MetaMetricsContext.Provider value={mockMetaMetricsContext}>
+      <MetaMetricsContext.Provider value={metricsContext}>
         <RevealSeedPage />
       </MetaMetricsContext.Provider>,
       mockStore,
@@ -463,6 +503,179 @@ describe('Reveal Seed Page', () => {
     });
   });
 
+  describe('dapp scan warning', () => {
+    function setupDappScanTest(
+      scanResult: {
+        recommendedAction: RecommendedAction;
+        hostname: string;
+      } | null = null,
+    ) {
+      mockScanUrlForPhishing.mockReset().mockResolvedValue(scanResult);
+    }
+
+    it('does not show dapp scan warning when scan returns no result', async () => {
+      setupDappScanTest();
+      const { queryByTestId, getByText } = renderWithProvider(
+        <RevealSeedPage />,
+        mockStore,
+      );
+
+      await navigateQuizToPasswordScreen({
+        getByText,
+        queryByTestId,
+        fireEvent,
+      });
+
+      await waitFor(() => {
+        expect(mockScanUrlForPhishing).toHaveBeenCalled();
+      });
+
+      expect(queryByTestId('dapp-scan-warning')).not.toBeInTheDocument();
+      expect(queryByTestId('reveal-seed-warning')).toBeInTheDocument();
+    });
+
+    it('shows dapp scan warning and hides generic warning when site is malicious', async () => {
+      setupDappScanTest({
+        recommendedAction: RecommendedAction.Block,
+        hostname: 'evil.com',
+      });
+
+      const { queryByTestId, getByText } = renderWithProvider(
+        <RevealSeedPage />,
+        mockStore,
+      );
+
+      await navigateQuizToPasswordScreen({
+        getByText,
+        queryByTestId,
+        fireEvent,
+      });
+
+      await waitFor(() => {
+        expect(queryByTestId('dapp-scan-warning')).toBeInTheDocument();
+      });
+
+      expect(queryByTestId('reveal-seed-warning')).not.toBeInTheDocument();
+    });
+
+    it('shows acknowledgment checkbox when site is malicious', async () => {
+      setupDappScanTest({
+        recommendedAction: RecommendedAction.Block,
+        hostname: 'evil.com',
+      });
+
+      const { queryByTestId, getByText } = renderWithProvider(
+        <RevealSeedPage />,
+        mockStore,
+      );
+
+      await navigateQuizToPasswordScreen({
+        getByText,
+        queryByTestId,
+        fireEvent,
+      });
+
+      await waitFor(() => {
+        expect(
+          queryByTestId('dapp-scan-acknowledge-checkbox'),
+        ).toBeInTheDocument();
+      });
+    });
+
+    it('continue button is disabled until checkbox is acknowledged on malicious site', async () => {
+      setupDappScanTest({
+        recommendedAction: RecommendedAction.Block,
+        hostname: 'evil.com',
+      });
+
+      const { queryByTestId, getByText } = renderWithProvider(
+        <RevealSeedPage />,
+        mockStore,
+      );
+
+      await navigateQuizToPasswordScreen({
+        getByText,
+        queryByTestId,
+        fireEvent,
+      });
+
+      await waitFor(() => {
+        expect(queryByTestId('dapp-scan-warning')).toBeInTheDocument();
+      });
+
+      fireEvent.change(queryByTestId('input-password') as HTMLElement, {
+        target: { value: password },
+      });
+
+      const continueButton = queryByTestId(
+        'reveal-seed-password-continue',
+      ) as HTMLElement;
+      expect(continueButton).toBeDisabled();
+
+      fireEvent.click(
+        queryByTestId('dapp-scan-acknowledge-checkbox') as HTMLElement,
+      );
+
+      expect(continueButton).toBeEnabled();
+    });
+
+    it('fires SrpRevealMaliciousSiteDetected metric only when site is malicious', async () => {
+      setupDappScanTest({
+        recommendedAction: RecommendedAction.Block,
+        hostname: 'evil.com',
+      });
+
+      const { context: metricsContext, mockTrackEvent } =
+        createMockMetaMetricsContext();
+
+      renderWithProvider(
+        <MetaMetricsContext.Provider value={metricsContext}>
+          <RevealSeedPage />
+        </MetaMetricsContext.Provider>,
+        mockStore,
+      );
+
+      await waitFor(() => {
+        expect(mockTrackEvent).toHaveBeenCalledWith({
+          category: MetaMetricsEventCategory.Keys,
+          event: MetaMetricsEventName.SrpRevealMaliciousSiteDetected,
+          properties: {
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            key_type: MetaMetricsEventKeyType.Srp,
+            hostname: 'evil.com',
+          },
+        });
+      });
+    });
+
+    it('does not fire metric event when site is not malicious', async () => {
+      setupDappScanTest({
+        recommendedAction: RecommendedAction.None,
+        hostname: 'safe-site.com',
+      });
+
+      const { context: metricsContext, mockTrackEvent } =
+        createMockMetaMetricsContext();
+
+      renderWithProvider(
+        <MetaMetricsContext.Provider value={metricsContext}>
+          <RevealSeedPage />
+        </MetaMetricsContext.Provider>,
+        mockStore,
+      );
+
+      await waitFor(() => {
+        expect(mockScanUrlForPhishing).toHaveBeenCalled();
+      });
+
+      expect(mockTrackEvent).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: MetaMetricsEventName.SrpRevealMaliciousSiteDetected,
+        }),
+      );
+    });
+  });
+
   describe('multi-srp', () => {
     it('passes the keyringId to the requestRevealSeedWords action', async () => {
       const keyringId = 'ULID01234567890ABCDEFGHIJKLMN';
diff --git a/ui/pages/keychains/reveal-seed.tsx b/ui/pages/keychains/reveal-seed.tsx
index f2f6da2da006..eeab555adbfb 100644
--- a/ui/pages/keychains/reveal-seed.tsx
+++ b/ui/pages/keychains/reveal-seed.tsx
@@ -6,9 +6,15 @@ import {
   TextButton,
   Text,
   Box,
+  Checkbox,
   TextVariant,
   TextColor,
+  BoxBackgroundColor,
 } from '@metamask/design-system-react';
+import {
+  RecommendedAction,
+  type PhishingDetectionScanResult,
+} from '@metamask/phishing-controller';
 import { getErrorMessage } from '../../../shared/lib/error';
 import {
   MetaMetricsEventCategory,
@@ -18,8 +24,11 @@ import {
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
 import { useI18nContext } from '../../hooks/useI18nContext';
-import { requestRevealSeedWords } from '../../store/actions';
-import { getHDEntropyIndex } from '../../selectors';
+import {
+  requestRevealSeedWords,
+  scanUrlForPhishing,
+} from '../../store/actions';
+import { getHDEntropyIndex, getOriginOfCurrentTab } from '../../selectors';
 import { endTrace, trace, TraceName } from '../../../shared/lib/trace';
 import { PREVIOUS_ROUTE } from '../../helpers/constants/routes';
 import { Toast, ToastContainer } from '../../components/multichain/toast';
@@ -59,6 +68,55 @@ function RevealSeedPage() {
 
   const [showSuccessToast, setShowSuccessToast] = useState(false);
 
+  const activeTabOrigin = useSelector(getOriginOfCurrentTab);
+  const [scanResult, setScanResult] =
+    useState<PhishingDetectionScanResult | null>(null);
+  const [dangerAcknowledged, setDangerAcknowledged] = useState(false);
+
+  useEffect(() => {
+    let cancelled = false;
+    setScanResult(null);
+    setDangerAcknowledged(false);
+
+    if (activeTabOrigin) {
+      const originToScan = activeTabOrigin;
+      scanUrlForPhishing(originToScan)
+        .then((result) => {
+          if (cancelled) {
+            return;
+          }
+          setScanResult(result);
+        })
+        .catch(() => {
+          // Scan failed — no action needed
+        });
+    }
+
+    return () => {
+      cancelled = true;
+    };
+  }, [activeTabOrigin]);
+
+  const trackEventRef = React.useRef(trackEvent);
+  trackEventRef.current = trackEvent;
+
+  useEffect(() => {
+    if (scanResult?.recommendedAction === RecommendedAction.Block) {
+      trackEventRef.current({
+        category: MetaMetricsEventCategory.Keys,
+        event: MetaMetricsEventName.SrpRevealMaliciousSiteDetected,
+        properties: {
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          key_type: MetaMetricsEventKeyType.Srp,
+          hostname: scanResult.hostname ?? 'unknown',
+        },
+      });
+    }
+  }, [scanResult]);
+
+  // Only Block triggers the malicious warning. Warn and None show the generic warning.
+  const isMalicious = scanResult?.recommendedAction === RecommendedAction.Block;
+
   const onClickCopy = useCallback(() => {
     if (!seedWords || !phraseRevealed) {
       return;
@@ -300,6 +358,8 @@ function RevealSeedPage() {
           onTogglePasswordVisibility={togglePasswordVisibility}
           onSubmit={handleSubmit}
           onContinueClick={handlePasswordContinueClick}
+          isMalicious={isMalicious}
+          dangerAcknowledged={dangerAcknowledged}
         />
       );
     }
@@ -339,20 +399,44 @@ function RevealSeedPage() {
         backButtonAriaLabel={t('back')}
       />
       {screen === PASSWORD_PROMPT_SCREEN && (
-        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
-          {t('revealSeedWordsDescription1', [
-            <TextButton
-              key="srp-learn-srp"
-              onClick={handleSrpClick}
-              className="hover:bg-transparent"
-            >
-              {t('revealSeedWordsSRPName')}
-            </TextButton>,
-          ])}
-        </Text>
-      )}
-      {screen === PASSWORD_PROMPT_SCREEN && (
-        <RevealSeedWarning message={t('revealSeedWordsWarning')} />
+        <>
+          <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+            {t('revealSeedWordsDescription1', [
+              <TextButton
+                key="srp-learn-srp"
+                onClick={handleSrpClick}
+                className="hover:bg-transparent"
+              >
+                {t('revealSeedWordsSRPName')}
+              </TextButton>,
+            ])}
+          </Text>
+          {isMalicious ? (
+            <>
+              <RevealSeedWarning
+                message={t('dappScanMaliciousWarning')}
+                title={t('dappScanMaliciousTitle')}
+                data-testid="dapp-scan-warning"
+              />
+              <Box
+                className="flex w-full p-4 rounded-lg border-l-4 border-l-[var(--color-error-default)]"
+                backgroundColor={BoxBackgroundColor.ErrorMuted}
+              >
+                <Checkbox
+                  id="dapp-scan-acknowledge-checkbox"
+                  label={t('alertModalAcknowledge')}
+                  isSelected={dangerAcknowledged}
+                  onChange={() => setDangerAcknowledged(!dangerAcknowledged)}
+                  inputProps={{
+                    'data-testid': 'dapp-scan-acknowledge-checkbox',
+                  }}
+                />
+              </Box>
+            </>
+          ) : (
+            <RevealSeedWarning message={t('revealSeedWordsWarning')} />
+          )}
+        </>
       )}
       {renderContent()}
       {showSuccessToast && (
diff --git a/ui/pages/multi-srp/import-srp/__snapshots__/import-srp.test.tsx.snap b/ui/pages/multi-srp/import-srp/__snapshots__/import-srp.test.tsx.snap
index 6d6e64e5cc27..cf0116a5460f 100644
--- a/ui/pages/multi-srp/import-srp/__snapshots__/import-srp.test.tsx.snap
+++ b/ui/pages/multi-srp/import-srp/__snapshots__/import-srp.test.tsx.snap
@@ -18,12 +18,18 @@ exports[`ImportSrp renders matches snapshot 1`] = `
         >
           <button
             aria-label="back"
-            class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+            class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
           >
-            <span
-              class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-              style="mask-image: url('./images/icons/arrow-left.svg');"
-            />
+            <svg
+              class="inline-block w-6 h-6 text-inherit"
+              fill="currentColor"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="m15.112 21.886-10-10 10-10 1.775 1.775-8.225 8.224 8.225 8.226z"
+              />
+            </svg>
           </button>
         </div>
         <div
@@ -41,20 +47,26 @@ exports[`ImportSrp renders matches snapshot 1`] = `
         >
           <button
             aria-label="close"
-            class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+            class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
           >
-            <span
-              class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-              style="mask-image: url('./images/icons/close.svg');"
-            />
+            <svg
+              class="inline-block w-6 h-6 text-inherit"
+              fill="currentColor"
+              viewBox="0 0 24 24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M6.4 19 5 17.6l5.6-5.6L5 6.4 6.4 5l5.6 5.6L17.6 5 19 6.4 13.4 12l5.6 5.6-1.4 1.4-5.6-5.6z"
+              />
+            </svg>
           </button>
         </div>
       </div>
       <div
-        class="mm-box mm-box--margin-bottom-2 mm-box--text-align-left"
+        class="mb-2 text-left"
       >
         <h2
-          class="mm-box mm-text mm-text--heading-lg mm-box--color-text-default"
+          class="text-default text-s-heading-lg leading-s-heading-lg tracking-s-heading-lg md:text-l-heading-lg md:leading-l-heading-lg md:tracking-l-heading-lg font-bold font-default"
         >
           Import a wallet
         </h2>
@@ -125,15 +137,19 @@ exports[`ImportSrp renders matches snapshot 1`] = `
         </div>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center mm-box--text-align-left mm-box--width-full"
+        class="w-full"
       >
         <button
-          class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--disabled import-srp__continue-button mm-button-primary mm-button-primary--disabled mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-icon-inverse mm-box--background-color-icon-default mm-box--rounded-xl"
+          class="inline-flex items-center justify-center rounded-xl px-4 font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default text-primary-inverse hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default w-full import-srp__continue-button"
           data-testid="import-srp-confirm"
           disabled=""
-          type="primary"
+          role="button"
         >
-          Continue
+          <span
+            class="text-inherit text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+          >
+            Continue
+          </span>
         </button>
       </div>
     </div>
diff --git a/ui/pages/multi-srp/import-srp/import-srp.tsx b/ui/pages/multi-srp/import-srp/import-srp.tsx
index d92abb5b640a..b256bacaa1c3 100644
--- a/ui/pages/multi-srp/import-srp/import-srp.tsx
+++ b/ui/pages/multi-srp/import-srp/import-srp.tsx
@@ -1,12 +1,6 @@
 import React, { useEffect, useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  hideWarning,
-  checkIsSeedlessPasswordOutdated,
-  importMnemonicToVault,
-} from '../../../store/actions';
 import {
   ButtonIcon,
   ButtonSize,
@@ -14,7 +8,14 @@ import {
   Box,
   Button,
   Text,
-} from '../../../components/component-library';
+  TextVariant,
+} from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  hideWarning,
+  checkIsSeedlessPasswordOutdated,
+  importMnemonicToVault,
+} from '../../../store/actions';
 import { setShowNewSrpAddedToast } from '../../../components/app/toast-master/utils';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { Header, Page } from '../../../components/multichain/pages/page';
@@ -23,15 +24,6 @@ import { getIsSeedlessPasswordOutdated } from '../../../ducks/metamask/metamask'
 import PasswordOutdatedModal from '../../../components/app/password-outdated-modal';
 import { MetaMaskReduxDispatch } from '../../../store/store';
 import SrpInputForm from '../../srp-input-form';
-import {
-  BlockSize,
-  FlexDirection,
-  AlignItems,
-  Display,
-  JustifyContent,
-  TextAlign,
-  TextVariant,
-} from '../../../helpers/constants/design-system';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 
@@ -119,30 +111,21 @@ export const ImportSrp = () => {
         {t('importSecretRecoveryPhrase')}
       </Header>
       {isSeedlessPasswordOutdated && <PasswordOutdatedModal />}
-      <Box textAlign={TextAlign.Left} marginBottom={2}>
-        <Text variant={TextVariant.headingLg}>{t('importAWallet')}</Text>
+      <Box className="text-left" marginBottom={2}>
+        <Text variant={TextVariant.HeadingLg}>{t('importAWallet')}</Text>
       </Box>
       <SrpInputForm
         error={srpError}
         setSecretRecoveryPhrase={setSecretRecoveryPhrase}
         onClearCallback={() => setSrpError('')}
       />
-      <Box
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        justifyContent={JustifyContent.center}
-        alignItems={AlignItems.center}
-        width={BlockSize.Full}
-        textAlign={TextAlign.Left}
-      >
+      <Box className="w-full">
         <Button
-          width={BlockSize.Full}
           size={ButtonSize.Lg}
-          type="primary"
           data-testid="import-srp-confirm"
           onClick={importWallet}
           disabled={!secretRecoveryPhrase.trim() || Boolean(srpError)}
-          className="import-srp__continue-button"
+          className="w-full import-srp__continue-button"
         >
           {t('continue')}
         </Button>
diff --git a/ui/pages/multichain-accounts/account-list/account-list.tsx b/ui/pages/multichain-accounts/account-list/account-list.tsx
index 1378e5c2ab00..b9bf84362919 100644
--- a/ui/pages/multichain-accounts/account-list/account-list.tsx
+++ b/ui/pages/multichain-accounts/account-list/account-list.tsx
@@ -30,6 +30,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MultichainAccountList } from '../../../components/multichain-accounts/multichain-account-list';
 import {
   getAccountTree,
+  getSelectedAccountGroup,
   getNormalizedGroupsMetadata,
 } from '../../../selectors/multichain-accounts/account-tree';
 import {
@@ -60,7 +61,7 @@ export const AccountList = () => {
   const navigate = useNavigate();
   const accountTree = useSelector(getAccountTree);
   const { wallets } = accountTree;
-  const { selectedAccountGroup } = accountTree;
+  const selectedAccountGroup = useSelector(getSelectedAccountGroup);
   const [searchPattern, setSearchPattern] = useState<string>('');
   const groupsMetadata = useSelector(getNormalizedGroupsMetadata);
   const permittedAccounts = useSelector(getAllPermittedAccountsForCurrentTab);
diff --git a/ui/pages/multichain-accounts/multichain-account-details-page/multichain-account-details-page.test.tsx b/ui/pages/multichain-accounts/multichain-account-details-page/multichain-account-details-page.test.tsx
index 38a8f18371d6..bea2817917bc 100644
--- a/ui/pages/multichain-accounts/multichain-account-details-page/multichain-account-details-page.test.tsx
+++ b/ui/pages/multichain-accounts/multichain-account-details-page/multichain-account-details-page.test.tsx
@@ -236,7 +236,7 @@ describe('MultichainAccountDetailsPage', () => {
   describe('tracing', () => {
     it('calls ShowAccountAddressList trace when clicking network addresses link', () => {
       const store = configureStore(mockState);
-      const groupId = mockState.metamask.accountTree.selectedAccountGroup;
+      const groupId = mockState.metamask.selectedAccountGroup;
       setSearchParams(groupId);
       renderWithProvider(
         <MultichainAccountDetailsPage />,
diff --git a/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.stories.tsx b/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.stories.tsx
index d33b6de9e65d..373e7195b5e9 100644
--- a/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.stories.tsx
+++ b/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.stories.tsx
@@ -23,6 +23,9 @@ const mockTargetSubjectMetadata = {
   subjectType: 'website' as const,
 };
 
+const mockSelectedAccountGroup =
+  'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0' as AccountGroupId;
+
 const mockAccountTreeState = {
   wallets: {
     'entropy:01JKAF3DSGM3AB87EM9N0K41AJ': {
@@ -39,6 +42,7 @@ const mockAccountTreeState = {
             entropy: { groupIndex: 0 },
             pinned: false,
             hidden: false,
+            lastSelected: 0,
           },
         },
         'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/1': {
@@ -50,6 +54,7 @@ const mockAccountTreeState = {
             entropy: { groupIndex: 1 },
             pinned: false,
             hidden: false,
+            lastSelected: 0,
           },
         },
       },
@@ -59,8 +64,6 @@ const mockAccountTreeState = {
       },
     },
   },
-  selectedAccountGroup:
-    'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0' as AccountGroupId,
 };
 
 const mockInternalAccountsState = {
@@ -114,6 +117,7 @@ const mockMultichainState = createMockMultichainAccountsState(
   mockAccountTreeState,
   mockInternalAccountsState,
   mockNetworkConfigurations,
+  mockSelectedAccountGroup,
 );
 
 const store = configureStore({
diff --git a/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.test.tsx b/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.test.tsx
index 2bea45ee2eb5..80fcc50733e2 100644
--- a/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.test.tsx
+++ b/ui/pages/multichain-accounts/multichain-accounts-connect-page/multichain-accounts-connect-page.test.tsx
@@ -321,6 +321,7 @@ const mockAccountTreeState = {
             entropy: { groupIndex: 0 },
             pinned: false,
             hidden: false,
+            lastSelected: 0,
           },
         },
       },
@@ -330,9 +331,9 @@ const mockAccountTreeState = {
       },
     },
   },
-  selectedAccountGroup:
-    'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0' as AccountGroupId,
 };
+const mockSelectedAccountGroup =
+  'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0' as AccountGroupId;
 
 const mockInternalAccountsState = {
   accounts: {
@@ -408,6 +409,7 @@ const render = (
     mockAccountTreeState,
     mockInternalAccountsState,
     mockNetworkConfigurations,
+    mockSelectedAccountGroup,
   );
 
   const store = configureStore({
diff --git a/ui/pages/notifications-settings/notifications-settings.tsx b/ui/pages/notifications-settings/notifications-settings.tsx
index 46c22bd5d52e..f0ddfbaa516a 100644
--- a/ui/pages/notifications-settings/notifications-settings.tsx
+++ b/ui/pages/notifications-settings/notifications-settings.tsx
@@ -68,9 +68,10 @@ export function NotificationsSettingsContent() {
 
   return (
     <Box
-      className="settings-page__body"
       flexDirection={BoxFlexDirection.Column}
       alignItems={BoxAlignItems.Stretch}
+      paddingTop={3}
+      paddingHorizontal={4}
       gap={6}
     >
       <NotificationsSettingsAllowNotifications
diff --git a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.tsx.snap b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.tsx.snap
index 2635802a5dca..70de187aabe7 100644
--- a/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.tsx.snap
+++ b/ui/pages/onboarding-flow/create-password/__snapshots__/create-password.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = `
           </p>
         </div>
         <div
-          class="mm-box"
+          class=""
         >
           <div
             class="mm-box mm-form-text-field mm-box--display-flex mm-box--flex-direction-column"
@@ -74,18 +74,24 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = `
               />
               <button
                 aria-label="Show password"
-                class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
                 data-testid="show-password"
                 type="button"
               >
-                <span
-                  class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-                  style="mask-image: url('./images/icons/eye.svg');"
-                />
+                <svg
+                  class="inline-block w-6 h-6 text-inherit"
+                  fill="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M12 15.886q1.875 0 3.188-1.313C16.5 13.26 16.5 12.636 16.5 11.386s-.437-2.313-1.312-3.188S13.25 6.886 12 6.886s-2.312.437-3.187 1.312S7.5 10.136 7.5 11.386s.438 2.312 1.313 3.187S10.75 15.886 12 15.886m0-1.8q-1.125 0-1.912-.788C9.3 12.51 9.3 12.136 9.3 11.386s.263-1.388.788-1.913S11.25 8.686 12 8.686s1.388.262 1.913.787.787 1.163.787 1.913-.262 1.387-.787 1.912-1.163.788-1.913.788m0 4.8q-3.65 0-6.65-2.038c-3-2.038-3.45-3.18-4.35-5.462Q2.35 7.96 5.35 5.922T12 3.885t6.65 2.038T23 11.385q-1.35 3.426-4.35 5.463c-3 2.037-4.217 2.038-6.65 2.038m0-2q2.825 0 5.188-1.488c2.363-1.488 2.779-2.33 3.612-4.012a9.77 9.77 0 0 0-3.612-4.013Q14.825 5.886 12 5.886c-2.825 0-3.612.495-5.187 1.487A9.77 9.77 0 0 0 3.2 11.386q1.25 2.524 3.613 4.012c2.363 1.488 3.304 1.488 5.187 1.488"
+                  />
+                </svg>
               </button>
             </div>
             <p
-              class="mm-box mm-text mm-help-text mm-form-text-field__help-text mm-text--body-sm mm-box--margin-top-1 mm-box--color-text-alternative"
+              class="mm-box mm-text mm-help-text mm-form-text-field__help-text text-alternative mm-text--body-sm mm-box--margin-top-1 mm-box--color-text-default"
               data-testid="short-password-error"
             >
               Must be at least 8 characters
@@ -114,14 +120,20 @@ exports[`Onboarding Create Password Render should match snapshot 1`] = `
               />
               <button
                 aria-label="Show password"
-                class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                class="inline-flex items-center justify-center p-0 h-8 w-8 rounded-lg bg-transparent hover:bg-hover active:bg-pressed text-icon-default"
                 data-testid="show-confirm-password"
                 type="button"
               >
-                <span
-                  class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
-                  style="mask-image: url('./images/icons/eye.svg');"
-                />
+                <svg
+                  class="inline-block w-6 h-6 text-inherit"
+                  fill="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M12 15.886q1.875 0 3.188-1.313C16.5 13.26 16.5 12.636 16.5 11.386s-.437-2.313-1.312-3.188S13.25 6.886 12 6.886s-2.312.437-3.187 1.312S7.5 10.136 7.5 11.386s.438 2.312 1.313 3.187S10.75 15.886 12 15.886m0-1.8q-1.125 0-1.912-.788C9.3 12.51 9.3 12.136 9.3 11.386s.263-1.388.788-1.913S11.25 8.686 12 8.686s1.388.262 1.913.787.787 1.163.787 1.913-.262 1.387-.787 1.912-1.163.788-1.913.788m0 4.8q-3.65 0-6.65-2.038c-3-2.038-3.45-3.18-4.35-5.462Q2.35 7.96 5.35 5.922T12 3.885t6.65 2.038T23 11.385q-1.35 3.426-4.35 5.463c-3 2.037-4.217 2.038-6.65 2.038m0-2q2.825 0 5.188-1.488c2.363-1.488 2.779-2.33 3.612-4.012a9.77 9.77 0 0 0-3.612-4.013Q14.825 5.886 12 5.886c-2.825 0-3.612.495-5.187 1.487A9.77 9.77 0 0 0 3.2 11.386q1.25 2.524 3.613 4.012c2.363 1.488 3.304 1.488 5.187 1.488"
+                  />
+                </svg>
               </button>
             </div>
             
diff --git a/ui/pages/onboarding-flow/create-password/create-password.tsx b/ui/pages/onboarding-flow/create-password/create-password.tsx
index 4b50a785052b..61baeddb3969 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.tsx
+++ b/ui/pages/onboarding-flow/create-password/create-password.tsx
@@ -25,6 +25,7 @@ import {
   MetaMetricsEventAccountType,
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../shared/constants/metametrics';
 import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
 import { PLATFORM_FIREFOX } from '../../../../shared/constants/app';
@@ -265,6 +266,18 @@ export default function CreatePassword({
       },
     });
     if (isSocialLoginFlow) {
+      // track analytics preference selected event for social login users
+      // as social login users will not see the metametrics screen
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+          [MetaMetricsUserTrait.HasMarketingConsent]: termsChecked,
+          location: 'onboarding_create_password',
+        },
+      });
+
       if (termsChecked) {
         dispatch(setMarketingConsent(true));
         dispatch(setDataCollectionForMarketing(true));
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.tsx b/ui/pages/onboarding-flow/metametrics/metametrics.tsx
index 9c2ebae039d1..1d086e15f5ad 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.tsx
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.tsx
@@ -33,6 +33,7 @@ import {
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../shared/constants/metametrics';
 import { PLATFORM_FIREFOX } from '../../../../shared/constants/app';
 import {
@@ -191,26 +192,26 @@ export default function OnboardingMetametrics() {
       }
 
       if (isParticipateInMetaMetricsChecked) {
-        dispatch(
-          setDataCollectionForMarketing(isDataCollectionForMarketingChecked),
-        );
-        dispatch(setParticipateInMetaMetrics(true));
-
         await trackEvent({
           category: MetaMetricsEventCategory.Onboarding,
           event: MetaMetricsEventName.AppInstalled,
         });
+
         await trackEvent({
           category: MetaMetricsEventCategory.Onboarding,
           event: MetaMetricsEventName.AnalyticsPreferenceSelected,
           properties: {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            is_metrics_opted_in: true,
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            has_marketing_consent: Boolean(isDataCollectionForMarketingChecked),
+            [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+            [MetaMetricsUserTrait.HasMarketingConsent]:
+              isDataCollectionForMarketingChecked,
             location: 'onboarding_metametrics',
           },
         });
+
+        dispatch(
+          setDataCollectionForMarketing(isDataCollectionForMarketingChecked),
+        );
+        dispatch(setParticipateInMetaMetrics(true));
       } else {
         dispatch(setParticipateInMetaMetrics(false));
         dispatch(setDataCollectionForMarketing(false));
diff --git a/ui/pages/onboarding-flow/onboarding-flow.tsx b/ui/pages/onboarding-flow/onboarding-flow.tsx
index 2e174824840e..cf04adeee864 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.tsx
+++ b/ui/pages/onboarding-flow/onboarding-flow.tsx
@@ -114,7 +114,7 @@ export default function OnboardingFlow() {
   const isFromSettingsSecurity = new URLSearchParams(search).get(
     'isFromSettingsSecurity',
   );
-  const { bufferedTrace, onboardingParentContext } =
+  const { bufferedTrace, onboardingParentContext, trackEvent } =
     useContext(MetaMetricsContext);
   const isUnlocked = useSelector(getIsUnlocked);
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
@@ -242,7 +242,7 @@ export default function OnboardingFlow() {
         firstTimeFlowType === FirstTimeFlowType.socialImport
       ) {
         retrievedSecretRecoveryPhrase = await dispatch(
-          restoreSocialBackupAndGetSeedPhrase(password),
+          restoreSocialBackupAndGetSeedPhrase(password, trackEvent),
         );
       } else {
         retrievedSecretRecoveryPhrase = await dispatch(
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.tsx b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.tsx
index f771cee098a9..88bb29dc5234 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.tsx
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.tsx
@@ -166,9 +166,9 @@ describe('Privacy Settings Onboarding View', () => {
         updatedMockStore,
       );
 
-      // Default Settings - Security & privacy category
+      // Default Settings - Security & privacy category (social login copy)
       const itemCategorySecurityPrivacy = getByText(
-        messages.securityAndPrivacy.message,
+        messages.securityDefaultSettingsSocialLogin.message,
       );
       expect(itemCategorySecurityPrivacy).toBeInTheDocument();
     });
diff --git a/ui/pages/perps/perps-market-detail-page.test.tsx b/ui/pages/perps/perps-market-detail-page.test.tsx
index 67638dca6286..45d921cddab3 100644
--- a/ui/pages/perps/perps-market-detail-page.test.tsx
+++ b/ui/pages/perps/perps-market-detail-page.test.tsx
@@ -407,6 +407,18 @@ describe('PerpsMarketDetailPage', () => {
       ).toBeGreaterThanOrEqual(1);
     });
 
+    it('displays leverage value in position details', () => {
+      const store = mockStore(createMockState(true));
+
+      const { getByTestId, getByText } = renderWithProvider(
+        <PerpsMarketDetailPage />,
+        store,
+      );
+
+      expect(getByTestId('perps-position-leverage')).toBeInTheDocument();
+      expect(getByText(/Long 3x/)).toBeInTheDocument();
+    });
+
     it('displays stats section', () => {
       const store = mockStore(createMockState(true));
 
diff --git a/ui/pages/perps/perps-market-detail-page.tsx b/ui/pages/perps/perps-market-detail-page.tsx
index 1b87f59721a4..05eeb92593b0 100644
--- a/ui/pages/perps/perps-market-detail-page.tsx
+++ b/ui/pages/perps/perps-market-detail-page.tsx
@@ -62,6 +62,7 @@ import {
   safeDecodeURIComponent,
   getChangeColor,
 } from '../../components/app/perps/utils';
+import { normalizeMarketDetailsOrders } from '../../components/app/perps/utils/orderUtils';
 import { PerpsDetailPageSkeleton } from '../../components/app/perps/perps-skeletons';
 import { Skeleton } from '../../components/component-library/skeleton';
 import { Popover, PopoverPosition } from '../../components/component-library';
@@ -202,6 +203,8 @@ const PerpsMarketDetailPage: React.FC = () => {
     return safeDecodeURIComponent(symbol);
   }, [symbol]);
 
+  const [showSizeInFiat, setShowSizeInFiat] = useState(false);
+
   // Subscribe to live price data for current symbol (provides oracle price, live funding, OI)
   // Uses background streaming via perpsActivatePriceStream + PerpsStreamManager
   const [livePrice, setLivePrice] = useState<PriceUpdate | undefined>(
@@ -278,34 +281,26 @@ const PerpsMarketDetailPage: React.FC = () => {
     positionRef.current = position;
   }, [position]);
 
-  // Find user-placed limit orders resting on the orderbook for this market.
-  // Excludes all position-attached orders:
-  // - isTrigger: TP/SL trigger orders
-  // - reduceOnly: close/reduce orders tied to positions
-  // - triggerPrice: any order with a trigger condition (TP/SL variant)
-  // - detailedOrderType containing "Take Profit" or "Stop" (belt-and-suspenders)
+  // Filter and sort open orders for this market, then normalize for display.
+  // Normalization adds synthetic TP/SL rows for parent orders and filters out
+  // full-position TP/SL (those stay on the position card / auto-close section).
   const orders = useMemo(() => {
     if (!decodedSymbol) {
       return [];
     }
-    return allOrders.filter((order) => {
-      if (order.symbol.toLowerCase() !== decodedSymbol.toLowerCase()) {
-        return false;
-      }
-      if (order.status !== 'open') {
-        return false;
-      }
-      // Exclude position-attached orders
-      if (order.isTrigger || order.reduceOnly || order.triggerPrice) {
-        return false;
-      }
-      const detailed = order.detailedOrderType?.toLowerCase() ?? '';
-      if (detailed.includes('take profit') || detailed.includes('stop')) {
-        return false;
-      }
-      return true;
+    const marketOrders = allOrders
+      .filter(
+        (order) =>
+          order.symbol.toLowerCase() === decodedSymbol.toLowerCase() &&
+          order.status === 'open',
+      )
+      .sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0));
+
+    return normalizeMarketDetailsOrders({
+      orders: marketOrders,
+      existingPosition: position,
     });
-  }, [decodedSymbol, allOrders]);
+  }, [decodedSymbol, allOrders, position]);
 
   // Candle period state and chart ref
   const [selectedPeriod, setSelectedPeriod] = useState<CandlePeriod>(
@@ -937,7 +932,7 @@ const PerpsMarketDetailPage: React.FC = () => {
                   className="flex-1 cursor-pointer rounded-xl bg-muted px-4 py-3 hover:bg-muted-hover active:bg-muted-pressed"
                   flexDirection={BoxFlexDirection.Column}
                   onClick={() => {
-                    // TODO: Handle size card press
+                    setShowSizeInFiat((prev) => !prev);
                   }}
                 >
                   <Box paddingBottom={1}>
@@ -952,7 +947,13 @@ const PerpsMarketDetailPage: React.FC = () => {
                     variant={TextVariant.BodyMd}
                     fontWeight={FontWeight.Medium}
                   >
-                    {`${formatNumber(Math.abs(parseFloat(position.size)), { maximumSignificantDigits: 4 })} ${getDisplayName(position.symbol)}`}
+                    {showSizeInFiat && Boolean(position.entryPrice)
+                      ? formatCurrencyWithMinThreshold(
+                          Math.abs(parseFloat(position.size)) *
+                            parseFloat(position.entryPrice.replace(/,/gu, '')),
+                          'USD',
+                        )
+                      : `${formatNumber(Math.abs(parseFloat(position.size)), { maximumSignificantDigits: 4 })} ${getDisplayName(position.symbol)}`}
                   </Text>
                 </Box>
 
@@ -1105,10 +1106,12 @@ const PerpsMarketDetailPage: React.FC = () => {
                         ? TextColor.SuccessDefault
                         : TextColor.ErrorDefault
                     }
+                    data-testid="perps-position-leverage"
                   >
                     {parseFloat(position.size) >= 0
                       ? t('perpsLong')
-                      : t('perpsShort')}
+                      : t('perpsShort')}{' '}
+                    {position.leverage.value}x
                   </Text>
                 </Box>
 
@@ -1636,6 +1639,7 @@ const PerpsMarketDetailPage: React.FC = () => {
       {/* TP/SL update modal (from Auto Close row) */}
       {position && isTPSLModalOpen && (
         <UpdateTPSLModal
+          key={position.symbol}
           isOpen={isTPSLModalOpen}
           onClose={handleCloseTPSLModal}
           position={position}
diff --git a/ui/pages/perps/perps-order-entry-page.test.tsx b/ui/pages/perps/perps-order-entry-page.test.tsx
index 91ed7a2e7e87..20780787f08a 100644
--- a/ui/pages/perps/perps-order-entry-page.test.tsx
+++ b/ui/pages/perps/perps-order-entry-page.test.tsx
@@ -1,21 +1,23 @@
-import React from 'react';
-import configureMockStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import { screen, fireEvent, act, waitFor } from '@testing-library/react';
 import type {
   AccountState,
   Position,
   PerpsMarketData,
 } from '@metamask/perps-controller';
-import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
+import { screen, fireEvent, act, waitFor } from '@testing-library/react';
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+
 import mockState from '../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
 import {
   mockPositions,
   mockAccountState,
   mockCryptoMarkets,
   mockHip3Markets,
 } from '../../components/app/perps/mocks';
+import PerpsOrderEntryPage from './perps-order-entry-page';
 
 jest.mock('../../hooks/perps/usePerpsEligibility', () => ({
   usePerpsEligibility: () => ({ isEligible: true }),
@@ -48,9 +50,53 @@ jest.mock('../../store/background-connection', () => ({
     mockSubmitRequestToBackground(...args),
 }));
 
+let priceSubscriptionCallback: ((updates: unknown[]) => void) | undefined;
+let orderBookSubscriptionCallback: ((book: unknown) => void) | undefined;
+
+const setBackgroundRequestDefaults = () => {
+  mockSubmitRequestToBackground.mockImplementation((method: string) => {
+    if (method === 'perpsActivateStreaming') {
+      return Promise.resolve(undefined);
+    }
+    return Promise.resolve({ success: true });
+  });
+};
+
+const getInsufficientBalanceMessage = (
+  requiredMargin: string,
+  availableBalance: string,
+) =>
+  messages.perpsOrderValidationInsufficientBalance.message
+    .replace('$1', requiredMargin)
+    .replace('$2', availableBalance);
+
+// Mock controller for usePerpsController() - delegates to submitRequestToBackground so test assertions pass
+const mockPerpsController = {
+  placeOrder: jest
+    .fn()
+    .mockImplementation((...args: unknown[]) =>
+      mockSubmitRequestToBackground('perpsPlaceOrder', args),
+    ),
+  closePosition: jest
+    .fn()
+    .mockImplementation((...args: unknown[]) =>
+      mockSubmitRequestToBackground('perpsClosePosition', args),
+    ),
+  updatePositionTPSL: jest
+    .fn()
+    .mockImplementation((...args: unknown[]) =>
+      mockSubmitRequestToBackground('perpsUpdatePositionTPSL', args),
+    ),
+  subscribeToPrices: jest.fn(() => jest.fn()),
+  subscribeToOrderBook: jest.fn(() => jest.fn()),
+};
+
 jest.mock('../../providers/perps', () => {
   return {
     getPerpsStreamManager: () => mockGetPerpsStreamManager(),
+    PerpsControllerProvider: ({ children }: { children: React.ReactNode }) =>
+      children,
+    usePerpsController: () => mockPerpsController,
   };
 });
 
@@ -131,9 +177,17 @@ jest.mock('react-router-dom', () => ({
   },
 }));
 
-// eslint-disable-next-line import-x/first
-import PerpsOrderEntryPage from './perps-order-entry-page';
-
+const mockIsNearLiquidationPrice = jest.fn();
+jest.mock('../../components/app/perps/order-entry/limit-price-warnings', () => {
+  const actual = jest.requireActual(
+    '../../components/app/perps/order-entry/limit-price-warnings',
+  );
+  return {
+    ...actual,
+    isNearLiquidationPrice: (...args: unknown[]) =>
+      mockIsNearLiquidationPrice(...args),
+  };
+});
 describe('PerpsOrderEntryPage', () => {
   const middlewares = [thunk];
   const mockStore = configureMockStore(middlewares);
@@ -150,8 +204,27 @@ describe('PerpsOrderEntryPage', () => {
     },
   });
 
+  const createMockStateWithLocale = (
+    locale: string,
+    perpsEnabled = true,
+  ): ReturnType<typeof createMockState> => ({
+    ...createMockState(perpsEnabled),
+    localeMessages: {
+      ...(createMockState(perpsEnabled).localeMessages ?? {}),
+      currentLocale: locale,
+    },
+  });
+
   beforeEach(() => {
     jest.clearAllMocks();
+    setBackgroundRequestDefaults();
+    priceSubscriptionCallback = undefined;
+    orderBookSubscriptionCallback = undefined;
+    const { isNearLiquidationPrice: realIsNearLiquidation } =
+      jest.requireActual(
+        '../../components/app/perps/order-entry/limit-price-warnings',
+      );
+    mockIsNearLiquidationPrice.mockImplementation(realIsNearLiquidation);
     mockUseParams.mockReturnValue({ symbol: 'ETH' });
     mockSearchParams.delete('direction');
     mockSearchParams.delete('mode');
@@ -168,6 +241,7 @@ describe('PerpsOrderEntryPage', () => {
       markets: [...mockCryptoMarkets, ...mockHip3Markets],
       isInitialLoading: false,
     });
+    mockGetPerpsStreamManager.mockReturnValue(mockStreamManagerBase);
   });
 
   describe('rendering', () => {
@@ -334,11 +408,254 @@ describe('PerpsOrderEntryPage', () => {
 
       expect(screen.getByTestId('submit-order-button')).toBeDisabled();
     });
+
+    it('disables submit when long limit price is above current price', () => {
+      mockSearchParams.set('orderType', 'limit');
+      mockSearchParams.set('direction', 'long');
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '99999' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+    });
+
+    it('disables submit when short limit price is below current price', () => {
+      mockSearchParams.set('orderType', 'limit');
+      mockSearchParams.set('direction', 'short');
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '1' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+    });
+
+    it('does not disable submit for favorable long limit price', () => {
+      mockSearchParams.set('orderType', 'limit');
+      mockSearchParams.set('direction', 'long');
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const amountInput = amountContainer.querySelector('input');
+      fireEvent.change(amountInput as HTMLInputElement, {
+        target: { value: '100' },
+      });
+
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '1000' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).not.toBeDisabled();
+    });
+
+    it('does not disable submit for favorable short limit price', () => {
+      mockSearchParams.set('orderType', 'limit');
+      mockSearchParams.set('direction', 'short');
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const amountInput = amountContainer.querySelector('input');
+      fireEvent.change(amountInput as HTMLInputElement, {
+        target: { value: '100' },
+      });
+
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '99999' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).not.toBeDisabled();
+    });
+
+    it('disables submit when limit order would be near liquidation', async () => {
+      mockIsNearLiquidationPrice.mockReturnValue(true);
+
+      mockSearchParams.set('orderType', 'limit');
+      mockSearchParams.set('direction', 'long');
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const amountInput = amountContainer.querySelector('input');
+      fireEvent.change(amountInput as HTMLInputElement, {
+        target: { value: '1000' },
+      });
+
+      // Favorable limit price (below currentPrice ~$3,025.50) so the
+      // button is NOT disabled by the unfavorable-price guard.
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '3000' },
+      });
+
+      await waitFor(() => {
+        expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+      });
+      expect(
+        screen.queryByTestId('limit-price-warning'),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.getByTestId('limit-price-liquidation-warning'),
+      ).toBeInTheDocument();
+    });
+
+    it('disables submit and shows validation message when amount exceeds available balance', () => {
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.06',
+        },
+        isInitialLoading: false,
+      });
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '20' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+      expect(
+        screen.getByText(getInsufficientBalanceMessage('20.00', '3.06')),
+      ).toBeInTheDocument();
+    });
+
+    it('disables submit in modify mode when add-to-position amount exceeds available balance', () => {
+      mockSearchParams.set('mode', 'modify');
+      mockLivePositions.mockReturnValue({
+        positions: mockPositions,
+        isInitialLoading: false,
+      });
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.06',
+        },
+        isInitialLoading: false,
+      });
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '20' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+      expect(
+        screen.getByText(getInsufficientBalanceMessage('20.00', '3.06')),
+      ).toBeInTheDocument();
+    });
+
+    it('does not disable submit in modify mode when 100% amount is floored to available balance', () => {
+      mockSearchParams.set('mode', 'modify');
+      mockLivePositions.mockReturnValue({
+        positions: mockPositions,
+        isInitialLoading: false,
+      });
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.066',
+        },
+        isInitialLoading: false,
+      });
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const percentContainer = screen.getByTestId('balance-percent-input');
+      const percentInput = percentContainer.querySelector('input');
+      fireEvent.change(percentInput as HTMLInputElement, {
+        target: { value: '100' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).not.toBeDisabled();
+      expect(
+        screen.queryByText(getInsufficientBalanceMessage('3.07', '3.07')),
+      ).not.toBeInTheDocument();
+    });
+
+    it('shows floored available balance in insufficient balance message', () => {
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.066',
+        },
+        isInitialLoading: false,
+      });
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '3.07' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+      expect(
+        screen.getByText(getInsufficientBalanceMessage('3.07', '3.06')),
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByText(getInsufficientBalanceMessage('3.07', '3.07')),
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not disable submit when amount equals available balance', () => {
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.06',
+        },
+        isInitialLoading: false,
+      });
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '3.06' },
+      });
+
+      expect(screen.getByTestId('submit-order-button')).not.toBeDisabled();
+    });
+
+    it('disables submit in close mode when position is missing', () => {
+      mockSearchParams.set('mode', 'close');
+      mockLivePositions.mockReturnValue({
+        positions: [],
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      expect(screen.getByTestId('submit-order-button')).toBeDisabled();
+    });
   });
 
   describe('order submission', () => {
     beforeEach(() => {
-      mockSubmitRequestToBackground.mockResolvedValue({ success: true });
+      setBackgroundRequestDefaults();
     });
 
     it('calls placeOrder on submit for new market order', async () => {
@@ -367,8 +684,72 @@ describe('PerpsOrderEntryPage', () => {
       );
     });
 
+    it('does not call placeOrder when amount exceeds available balance', async () => {
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.06',
+        },
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '20' },
+      });
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      const hasPlaceOrderCall = mockSubmitRequestToBackground.mock.calls.some(
+        (call) => call[0] === 'perpsPlaceOrder',
+      );
+      expect(hasPlaceOrderCall).toBe(false);
+    });
+
+    it('does not call placeOrder in modify mode when add-to-position amount exceeds available balance', async () => {
+      mockSearchParams.set('mode', 'modify');
+      mockLivePositions.mockReturnValue({
+        positions: mockPositions,
+        isInitialLoading: false,
+      });
+      mockLiveAccount.mockReturnValue({
+        account: {
+          ...mockAccountState,
+          availableBalance: '3.06',
+        },
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const input = amountContainer.querySelector('input');
+      fireEvent.change(input as HTMLInputElement, {
+        target: { value: '20' },
+      });
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      const hasPlaceOrderCall = mockSubmitRequestToBackground.mock.calls.some(
+        (call) => call[0] === 'perpsPlaceOrder',
+      );
+      expect(hasPlaceOrderCall).toBe(false);
+    });
+
     it('shows error when order fails', async () => {
       mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsActivateStreaming') {
+          return Promise.resolve(undefined);
+        }
         if (method === 'perpsPlaceOrder') {
           return Promise.resolve({
             success: false,
@@ -391,11 +772,16 @@ describe('PerpsOrderEntryPage', () => {
         fireEvent.click(screen.getByTestId('submit-order-button'));
       });
 
-      expect(screen.getByText('Insufficient margin')).toBeInTheDocument();
+      await waitFor(() => {
+        expect(screen.getByText('Insufficient margin')).toBeInTheDocument();
+      });
     });
 
     it('shows error when controller throws', async () => {
       mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsActivateStreaming') {
+          return Promise.resolve(undefined);
+        }
         if (method === 'perpsPlaceOrder') {
           return Promise.reject(new Error('Network error'));
         }
@@ -415,7 +801,9 @@ describe('PerpsOrderEntryPage', () => {
         fireEvent.click(screen.getByTestId('submit-order-button'));
       });
 
-      expect(screen.getByText('Network error')).toBeInTheDocument();
+      await waitFor(() => {
+        expect(screen.getByText('Network error')).toBeInTheDocument();
+      });
     });
 
     it('calls closePosition when in close mode', async () => {
@@ -499,6 +887,89 @@ describe('PerpsOrderEntryPage', () => {
       expect(mockUseNavigate).toHaveBeenCalledWith('/perps/market/ETH');
     });
 
+    it('submits normalized TP/SL values when modified', async () => {
+      mockSearchParams.set('mode', 'modify');
+      mockLivePositions.mockReturnValue({
+        positions: mockPositions,
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const tpContainer = screen.getByTestId('tp-price-input');
+      const tpInput = tpContainer.querySelector('input');
+      fireEvent.change(tpInput as HTMLInputElement, {
+        target: { value: '3300.1' },
+      });
+      fireEvent.blur(tpInput as HTMLInputElement);
+
+      const slContainer = screen.getByTestId('sl-price-input');
+      const slInput = slContainer.querySelector('input');
+      fireEvent.change(slInput as HTMLInputElement, {
+        target: { value: '2500' },
+      });
+      fireEvent.blur(slInput as HTMLInputElement);
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      expect(mockSubmitRequestToBackground).toHaveBeenCalledWith(
+        'perpsUpdatePositionTPSL',
+        [
+          expect.objectContaining({
+            symbol: 'ETH',
+            takeProfitPrice: '3300.1',
+            stopLossPrice: '2500',
+          }),
+        ],
+      );
+    });
+
+    it('submits undefined TP/SL values when fields are cleared', async () => {
+      mockSearchParams.set('mode', 'modify');
+      mockLivePositions.mockReturnValue({
+        positions: mockPositions,
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const tpContainer = screen.getByTestId('tp-price-input');
+      const tpInput = tpContainer.querySelector('input');
+      fireEvent.change(tpInput as HTMLInputElement, {
+        target: { value: '' },
+      });
+      fireEvent.blur(tpInput as HTMLInputElement);
+
+      const slContainer = screen.getByTestId('sl-price-input');
+      const slInput = slContainer.querySelector('input');
+      fireEvent.change(slInput as HTMLInputElement, {
+        target: { value: '' },
+      });
+      fireEvent.blur(slInput as HTMLInputElement);
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      const updateCall = mockSubmitRequestToBackground.mock.calls.find(
+        ([method]) => method === 'perpsUpdatePositionTPSL',
+      );
+      expect(updateCall).toBeDefined();
+
+      const payload = updateCall?.[1]?.[0] as {
+        symbol?: string;
+        takeProfitPrice?: string;
+        stopLossPrice?: string;
+      };
+      expect(payload.symbol).toBe('ETH');
+      expect(payload.takeProfitPrice).toBeUndefined();
+      expect(payload.stopLossPrice).toBeUndefined();
+    });
+
     it('does not submit when currentPrice is 0', async () => {
       mockLiveMarketData.mockReturnValue({
         markets: mockCryptoMarkets.map((m) => ({
@@ -520,6 +991,30 @@ describe('PerpsOrderEntryPage', () => {
         expect.anything(),
       );
     });
+
+    it('does not fall back to placeOrder in close mode when position is missing', async () => {
+      mockSearchParams.set('mode', 'close');
+      mockLivePositions.mockReturnValue({
+        positions: [],
+        isInitialLoading: false,
+      });
+
+      const store = mockStore(createMockState());
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      expect(mockSubmitRequestToBackground).not.toHaveBeenCalledWith(
+        'perpsPlaceOrder',
+        expect.anything(),
+      );
+      expect(mockSubmitRequestToBackground).not.toHaveBeenCalledWith(
+        'perpsClosePosition',
+        expect.anything(),
+      );
+    });
   });
 
   describe('formStateToOrderParams', () => {
@@ -529,7 +1024,7 @@ describe('PerpsOrderEntryPage', () => {
         positions: mockPositions,
         isInitialLoading: false,
       });
-      mockSubmitRequestToBackground.mockResolvedValue({ success: true });
+      setBackgroundRequestDefaults();
 
       const store = mockStore(createMockState());
       renderWithProvider(<PerpsOrderEntryPage />, store);
@@ -589,6 +1084,7 @@ describe('PerpsOrderEntryPage', () => {
         prices: {
           subscribe: jest.fn((cb: (updates: unknown[]) => void) => {
             priceCallback = cb;
+            priceSubscriptionCallback = cb;
             return jest.fn();
           }) as jest.Mock,
           getCachedData: () => [],
@@ -596,6 +1092,7 @@ describe('PerpsOrderEntryPage', () => {
         orderBook: {
           subscribe: jest.fn((cb: (book: unknown) => void) => {
             orderBookCallback = cb;
+            orderBookSubscriptionCallback = cb;
             return jest.fn();
           }) as jest.Mock,
           getCachedData: () => null,
@@ -612,11 +1109,11 @@ describe('PerpsOrderEntryPage', () => {
       renderWithProvider(<PerpsOrderEntryPage />, store);
 
       await waitFor(() => {
-        expect(typeof priceCallback).toBe('function');
+        expect(typeof priceSubscriptionCallback).toBe('function');
       });
 
       act(() => {
-        priceCallback([
+        priceSubscriptionCallback?.([
           {
             symbol: 'ETH',
             price: '3200.50',
@@ -634,11 +1131,11 @@ describe('PerpsOrderEntryPage', () => {
       renderWithProvider(<PerpsOrderEntryPage />, store);
 
       await waitFor(() => {
-        expect(typeof priceCallback).toBe('function');
+        expect(typeof priceSubscriptionCallback).toBe('function');
       });
 
       act(() => {
-        priceCallback([
+        priceSubscriptionCallback?.([
           {
             symbol: 'ETH',
             price: '3100.00',
@@ -654,11 +1151,11 @@ describe('PerpsOrderEntryPage', () => {
       renderWithProvider(<PerpsOrderEntryPage />, store);
 
       await waitFor(() => {
-        expect(typeof priceCallback).toBe('function');
+        expect(typeof priceSubscriptionCallback).toBe('function');
       });
 
       act(() => {
-        priceCallback([
+        priceSubscriptionCallback?.([
           { symbol: 'BTC', price: '50000.00', markPrice: '50001.00' },
         ]);
       });
@@ -671,11 +1168,11 @@ describe('PerpsOrderEntryPage', () => {
       renderWithProvider(<PerpsOrderEntryPage />, store);
 
       await waitFor(() => {
-        expect(typeof orderBookCallback).toBe('function');
+        expect(typeof orderBookSubscriptionCallback).toBe('function');
       });
 
       act(() => {
-        orderBookCallback({
+        orderBookSubscriptionCallback?.({
           bids: [{ price: '3199', size: '10' }],
           asks: [{ price: '3201', size: '10' }],
           midPrice: '3200.00',
@@ -690,11 +1187,11 @@ describe('PerpsOrderEntryPage', () => {
       renderWithProvider(<PerpsOrderEntryPage />, store);
 
       await waitFor(() => {
-        expect(typeof orderBookCallback).toBe('function');
+        expect(typeof orderBookSubscriptionCallback).toBe('function');
       });
 
       act(() => {
-        orderBookCallback({
+        orderBookSubscriptionCallback?.({
           bids: [],
           asks: [],
           midPrice: null,
@@ -707,7 +1204,7 @@ describe('PerpsOrderEntryPage', () => {
 
   describe('order submission error paths', () => {
     beforeEach(() => {
-      mockSubmitRequestToBackground.mockResolvedValue({ success: true });
+      setBackgroundRequestDefaults();
     });
 
     it('shows error when closePosition fails', async () => {
@@ -717,8 +1214,14 @@ describe('PerpsOrderEntryPage', () => {
         isInitialLoading: false,
       });
       mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsActivateStreaming') {
+          return Promise.resolve(undefined);
+        }
         if (method === 'perpsClosePosition') {
-          return Promise.resolve({ success: false, error: 'Close failed' });
+          return Promise.resolve({
+            success: false,
+            error: 'Close failed',
+          });
         }
         return Promise.resolve({ success: true });
       });
@@ -730,7 +1233,9 @@ describe('PerpsOrderEntryPage', () => {
         fireEvent.click(screen.getByTestId('submit-order-button'));
       });
 
-      expect(screen.getByText('Close failed')).toBeInTheDocument();
+      await waitFor(() => {
+        expect(screen.getByText('Close failed')).toBeInTheDocument();
+      });
     });
 
     it('shows error when updatePositionTPSL fails', async () => {
@@ -740,6 +1245,9 @@ describe('PerpsOrderEntryPage', () => {
         isInitialLoading: false,
       });
       mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsActivateStreaming') {
+          return Promise.resolve(undefined);
+        }
         if (method === 'perpsUpdatePositionTPSL') {
           return Promise.resolve({
             success: false,
@@ -756,14 +1264,19 @@ describe('PerpsOrderEntryPage', () => {
         fireEvent.click(screen.getByTestId('submit-order-button'));
       });
 
-      expect(screen.getByText('TPSL update failed')).toBeInTheDocument();
+      await waitFor(() => {
+        expect(screen.getByText('TPSL update failed')).toBeInTheDocument();
+      });
     });
 
     it('shows generic error for non-Error throws', async () => {
+      const nonErrorReason: unknown = 'string error';
       mockSubmitRequestToBackground.mockImplementation((method: string) => {
+        if (method === 'perpsActivateStreaming') {
+          return Promise.resolve(undefined);
+        }
         if (method === 'perpsPlaceOrder') {
-          // eslint-disable-next-line prefer-promise-reject-errors
-          return Promise.reject('string error');
+          return Promise.reject(nonErrorReason);
         }
         return Promise.resolve({ success: true });
       });
@@ -781,7 +1294,11 @@ describe('PerpsOrderEntryPage', () => {
         fireEvent.click(screen.getByTestId('submit-order-button'));
       });
 
-      expect(screen.getByText('An unknown error occurred')).toBeInTheDocument();
+      await waitFor(() => {
+        expect(
+          screen.getByText('An unknown error occurred'),
+        ).toBeInTheDocument();
+      });
     });
 
     it('navigates back after successful limit order', async () => {
@@ -817,12 +1334,42 @@ describe('PerpsOrderEntryPage', () => {
       );
       expect(mockUseNavigate).toHaveBeenCalledWith('/perps/market/ETH');
     });
+
+    it('does not submit a limit order when locale-formatted limit price is entered', async () => {
+      mockSearchParams.set('orderType', 'limit');
+
+      const store = mockStore(createMockStateWithLocale('de'));
+      renderWithProvider(<PerpsOrderEntryPage />, store);
+
+      const amountContainer = screen.getByTestId('amount-input-field');
+      const amountInput = amountContainer.querySelector('input');
+      fireEvent.change(amountInput as HTMLInputElement, {
+        target: { value: '500' },
+      });
+
+      const limitContainer = screen.getByTestId('limit-price-input');
+      const limitInput = limitContainer.querySelector('input');
+      fireEvent.focus(limitInput as HTMLInputElement);
+      fireEvent.change(limitInput as HTMLInputElement, {
+        target: { value: '45.050,00' },
+      });
+      fireEvent.blur(limitInput as HTMLInputElement);
+
+      await act(async () => {
+        fireEvent.click(screen.getByTestId('submit-order-button'));
+      });
+
+      const placeOrderCalls = mockSubmitRequestToBackground.mock.calls.filter(
+        ([method]) => method === 'perpsPlaceOrder',
+      );
+      expect(placeOrderCalls).toHaveLength(0);
+    });
   });
 
   describe('pending order effects', () => {
     beforeEach(() => {
       jest.useFakeTimers();
-      mockSubmitRequestToBackground.mockResolvedValue({ success: true });
+      setBackgroundRequestDefaults();
     });
 
     afterEach(() => {
diff --git a/ui/pages/perps/perps-order-entry-page.tsx b/ui/pages/perps/perps-order-entry-page.tsx
index d52dfb2c2cc0..8ba02356861a 100644
--- a/ui/pages/perps/perps-order-entry-page.tsx
+++ b/ui/pages/perps/perps-order-entry-page.tsx
@@ -1,11 +1,3 @@
-import React, { useMemo, useCallback, useState, useEffect } from 'react';
-import { useSelector } from 'react-redux';
-import {
-  Navigate,
-  useNavigate,
-  useParams,
-  useSearchParams,
-} from 'react-router-dom';
 import {
   twMerge,
   Box,
@@ -29,34 +21,24 @@ import type {
   OrderParams,
   PriceUpdate,
 } from '@metamask/perps-controller';
-import { getIsPerpsExperienceAvailable } from '../../selectors/perps/feature-flags';
-import { getSelectedInternalAccount } from '../../selectors/accounts';
-import { useI18nContext } from '../../hooks/useI18nContext';
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+import { useSelector } from 'react-redux';
 import {
-  DEFAULT_ROUTE,
-  PERPS_MARKET_DETAIL_ROUTE,
-} from '../../helpers/constants/routes';
+  Navigate,
+  useNavigate,
+  useParams,
+  useSearchParams,
+} from 'react-router-dom';
+
 import {
-  usePerpsLivePositions,
-  usePerpsLiveAccount,
-  usePerpsLiveMarketData,
-  usePerpsLiveCandles,
-} from '../../hooks/perps/stream';
+  selectPerpsTradeConfigurations,
+  selectPerpsIsTestnet,
+} from '../../selectors/perps-controller';
 import {
   CandlePeriod,
   TimeDuration,
 } from '../../components/app/perps/constants/chartConfig';
-import { usePerpsEligibility } from '../../hooks/perps';
-import { useFormatters } from '../../hooks/useFormatters';
 import { usePerpsDepositConfirmation } from '../../components/app/perps/hooks/usePerpsDepositConfirmation';
-import { getPerpsStreamManager } from '../../providers/perps';
-import { submitRequestToBackground } from '../../store/background-connection';
-import {
-  getDisplayName,
-  getChangeColor,
-  safeDecodeURIComponent,
-} from '../../components/app/perps/utils';
-import { PerpsDetailPageSkeleton } from '../../components/app/perps/perps-skeletons';
 import {
   OrderEntry,
   DirectionTabs,
@@ -66,6 +48,43 @@ import {
   type OrderMode,
   type OrderCalculations,
 } from '../../components/app/perps/order-entry';
+import {
+  isLimitPriceUnfavorable as checkLimitPriceUnfavorable,
+  isNearLiquidationPrice as checkNearLiquidationPrice,
+} from '../../components/app/perps/order-entry/limit-price-warnings';
+import { PerpsDetailPageSkeleton } from '../../components/app/perps/perps-skeletons';
+import {
+  getDisplayName,
+  getChangeColor,
+  safeDecodeURIComponent,
+} from '../../components/app/perps/utils';
+import { formatFlooredDecimals } from '../../components/app/perps/utils/number';
+import {
+  DEFAULT_ROUTE,
+  PERPS_MARKET_DETAIL_ROUTE,
+} from '../../helpers/constants/routes';
+import { usePerpsEligibility } from '../../hooks/perps';
+import {
+  usePerpsLivePositions,
+  usePerpsLiveAccount,
+  usePerpsLiveMarketData,
+  usePerpsLiveCandles,
+} from '../../hooks/perps/stream';
+import { useFormatters } from '../../hooks/useFormatters';
+import { useI18nContext } from '../../hooks/useI18nContext';
+import { getPerpsStreamManager } from '../../providers/perps';
+import { getSelectedInternalAccount } from '../../selectors/accounts';
+import { getIsPerpsExperienceAvailable } from '../../selectors/perps/feature-flags';
+import { submitRequestToBackground } from '../../store/background-connection';
+
+function toNormalizedPositivePrice(value?: string): string | undefined {
+  const parsed = Number.parseFloat(value ?? '');
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return undefined;
+  }
+
+  return parsed.toString();
+}
 
 /**
  * Convert UI OrderFormState to PerpsController OrderParams
@@ -82,14 +101,13 @@ function formStateToOrderParams(
   existingPositionSize?: string,
 ): OrderParams {
   const isBuy = formState.direction === 'long';
-  const marginAmount = parseFloat(formState.amount) || 0;
+  const marginAmount = Number.parseFloat(formState.amount) || 0;
   const positionSize =
     currentPrice > 0 ? (marginAmount * formState.leverage) / currentPrice : 0;
   const size =
     mode === 'close' && existingPositionSize
       ? Math.abs(parseFloat(existingPositionSize)).toString()
       : positionSize.toString();
-  const cleanAmount = formState.amount.replace(/,/gu, '');
 
   const params: OrderParams = {
     symbol: formState.asset,
@@ -98,17 +116,19 @@ function formStateToOrderParams(
     orderType: formState.type,
     leverage: formState.leverage,
     currentPrice,
-    usdAmount: cleanAmount,
+    usdAmount: marginAmount > 0 ? marginAmount.toFixed(2) : '0',
   };
 
   if (formState.type === 'limit' && formState.limitPrice) {
-    params.price = formState.limitPrice.replace(/,/gu, '');
+    params.price = toNormalizedPositivePrice(formState.limitPrice);
   }
   if (formState.autoCloseEnabled && formState.takeProfitPrice) {
-    params.takeProfitPrice = formState.takeProfitPrice.replace(/,/gu, '');
+    params.takeProfitPrice = toNormalizedPositivePrice(
+      formState.takeProfitPrice,
+    );
   }
   if (formState.autoCloseEnabled && formState.stopLossPrice) {
-    params.stopLossPrice = formState.stopLossPrice.replace(/,/gu, '');
+    params.stopLossPrice = toNormalizedPositivePrice(formState.stopLossPrice);
   }
   if (mode === 'close') {
     params.reduceOnly = true;
@@ -132,6 +152,8 @@ const PerpsOrderEntryPage: React.FC = () => {
   const selectedAccount = useSelector(getSelectedInternalAccount);
   const selectedAddress = selectedAccount?.address;
   const { isEligible } = usePerpsEligibility();
+  const tradeConfigurations = useSelector(selectPerpsTradeConfigurations);
+  const isTestnet = useSelector(selectPerpsIsTestnet);
   const { trigger: triggerDeposit } = usePerpsDepositConfirmation();
 
   const { positions: allPositions } = usePerpsLivePositions();
@@ -186,9 +208,8 @@ const PerpsOrderEntryPage: React.FC = () => {
     if (orderType !== 'limit' || !orderFormState) {
       return false;
     }
-    const cleaned = orderFormState.limitPrice?.replace(/,/gu, '') ?? '';
-    const parsed = parseFloat(cleaned);
-    return !cleaned || isNaN(parsed) || parsed <= 0;
+    const parsed = Number.parseFloat(orderFormState.limitPrice ?? '');
+    return !Number.isFinite(parsed) || parsed <= 0;
   }, [orderType, orderFormState]);
 
   const market = useMemo(() => {
@@ -309,10 +330,66 @@ const PerpsOrderEntryPage: React.FC = () => {
 
   const currentPrice = chartCurrentPrice > 0 ? chartCurrentPrice : marketPrice;
 
-  const availableBalance = account ? parseFloat(account.availableBalance) : 0;
+  const availableBalance = account
+    ? parseFloat(account.availableBalance) || 0
+    : 0;
+  const parsedAmount = parseFloat(
+    orderFormState?.amount?.replace(/,/gu, '') ?? '',
+  );
+  const requiredMargin = Number.isFinite(parsedAmount) ? parsedAmount : 0;
+  const isOrderPlacementMode = orderMode !== 'close' && orderMode !== 'modify';
+  const isModifyAddToPositionMode =
+    orderMode === 'modify' && Boolean(position) && requiredMargin > 0;
+  const isPositionRequiredMode =
+    orderMode === 'close' || orderMode === 'modify';
+  const isPositionMissing = isPositionRequiredMode && !position;
+  const isInsufficientBalance =
+    (isOrderPlacementMode || isModifyAddToPositionMode) &&
+    requiredMargin > availableBalance;
+  const insufficientBalanceError = isInsufficientBalance
+    ? t('perpsOrderValidationInsufficientBalance', [
+        formatFlooredDecimals(requiredMargin),
+        formatFlooredDecimals(availableBalance),
+      ])
+    : null;
+
+  const isLimitPriceUnfavorable = useMemo(() => {
+    if (orderType !== 'limit' || !orderFormState) {
+      return false;
+    }
+    return checkLimitPriceUnfavorable(
+      orderFormState.limitPrice ?? '',
+      currentPrice,
+      orderDirection,
+    );
+  }, [orderType, orderFormState, orderDirection, currentPrice]);
+
+  const isNearLiquidation = useMemo(() => {
+    if (orderType !== 'limit' || !orderFormState) {
+      return false;
+    }
+    return checkNearLiquidationPrice(
+      currentPrice,
+      orderCalculations?.liquidationPriceRaw,
+      orderDirection,
+    );
+  }, [
+    orderType,
+    orderFormState,
+    orderDirection,
+    currentPrice,
+    orderCalculations,
+  ]);
 
   const isSubmitDisabled =
-    !isEligible || isOrderPending || isLimitPriceInvalid || currentPrice <= 0;
+    !isEligible ||
+    isOrderPending ||
+    isLimitPriceInvalid ||
+    isLimitPriceUnfavorable ||
+    isNearLiquidation ||
+    currentPrice <= 0 ||
+    isPositionMissing ||
+    isInsufficientBalance;
 
   const maxLeverage = useMemo(() => {
     if (!market) {
@@ -321,6 +398,17 @@ const PerpsOrderEntryPage: React.FC = () => {
     return parseInt(market.maxLeverage.replace('x', ''), 10);
   }, [market]);
 
+  const DEFAULT_LEVERAGE = 3;
+  const initialLeverage = useMemo(() => {
+    if (!decodedSymbol || orderMode !== 'new') {
+      return undefined;
+    }
+    const env = isTestnet ? 'testnet' : 'mainnet';
+    const config = tradeConfigurations[env]?.[decodedSymbol];
+    const saved = config?.leverage ?? DEFAULT_LEVERAGE;
+    return Math.min(saved, maxLeverage);
+  }, [decodedSymbol, orderMode, maxLeverage, tradeConfigurations, isTestnet]);
+
   const existingPositionForOrder = useMemo(() => {
     if (!position) {
       return undefined;
@@ -372,7 +460,9 @@ const PerpsOrderEntryPage: React.FC = () => {
       !isEligible ||
       !orderFormState ||
       !selectedAddress ||
-      currentPrice <= 0
+      currentPrice <= 0 ||
+      isPositionMissing ||
+      isInsufficientBalance
     ) {
       return;
     }
@@ -381,7 +471,7 @@ const PerpsOrderEntryPage: React.FC = () => {
     setSubmitError(null);
 
     try {
-      if (orderMode === 'close' && position) {
+      if (orderMode === 'close') {
         const closeParams = {
           symbol: orderFormState.asset,
           orderType: 'market' as const,
@@ -414,6 +504,13 @@ const PerpsOrderEntryPage: React.FC = () => {
             throw new Error(result.error || 'Failed to add to position');
           }
 
+          submitRequestToBackground('perpsSaveTradeConfiguration', [
+            orderFormState.asset,
+            orderFormState.leverage,
+          ]).catch(() => {
+            // Non-critical — silently ignore
+          });
+
           // Existing position is already in `allPositions`, so pending-order
           // confirmation would resolve immediately; navigate like limit orders.
           handleBackClick();
@@ -423,11 +520,11 @@ const PerpsOrderEntryPage: React.FC = () => {
         // Amount is 0: only update TP/SL
         const cleanTp =
           orderFormState.autoCloseEnabled && orderFormState.takeProfitPrice
-            ? orderFormState.takeProfitPrice.replace(/,/gu, '')
+            ? toNormalizedPositivePrice(orderFormState.takeProfitPrice)
             : undefined;
         const cleanSl =
           orderFormState.autoCloseEnabled && orderFormState.stopLossPrice
-            ? orderFormState.stopLossPrice.replace(/,/gu, '')
+            ? toNormalizedPositivePrice(orderFormState.stopLossPrice)
             : undefined;
         const result = await submitRequestToBackground<{
           success: boolean;
@@ -457,6 +554,13 @@ const PerpsOrderEntryPage: React.FC = () => {
           throw new Error(result.error || 'Failed to place order');
         }
 
+        submitRequestToBackground('perpsSaveTradeConfiguration', [
+          orderFormState.asset,
+          orderFormState.leverage,
+        ]).catch(() => {
+          // Non-critical — silently ignore
+        });
+
         if (orderFormState.type === 'limit') {
           handleBackClick();
           return;
@@ -479,6 +583,8 @@ const PerpsOrderEntryPage: React.FC = () => {
     orderMode,
     position,
     currentPrice,
+    isPositionMissing,
+    isInsufficientBalance,
     handleBackClick,
   ]);
 
@@ -663,6 +769,7 @@ const PerpsOrderEntryPage: React.FC = () => {
           midPrice={topOfBook?.midPrice}
           onOrderTypeChange={setOrderType}
           onAddFunds={triggerDeposit}
+          initialLeverage={initialLeverage}
         />
       </Box>
 
@@ -683,7 +790,7 @@ const PerpsOrderEntryPage: React.FC = () => {
             liquidationPrice={orderCalculations.liquidationPrice}
           />
         )}
-        {submitError && (
+        {(insufficientBalanceError || submitError) && (
           <Box
             className="bg-error-muted rounded-lg"
             padding={3}
@@ -697,7 +804,7 @@ const PerpsOrderEntryPage: React.FC = () => {
               color={IconColor.ErrorDefault}
             />
             <Text variant={TextVariant.BodySm} color={TextColor.ErrorDefault}>
-              {submitError}
+              {insufficientBalanceError ?? submitError}
             </Text>
           </Box>
         )}
diff --git a/ui/pages/perps/perps-withdraw-amount-format.test.ts b/ui/pages/perps/perps-withdraw-amount-format.test.ts
new file mode 100644
index 000000000000..5b3d8502772d
--- /dev/null
+++ b/ui/pages/perps/perps-withdraw-amount-format.test.ts
@@ -0,0 +1,33 @@
+import {
+  formatAmountInputFromNumber,
+  stripInsignificantFractionZeros,
+} from './perps-withdraw-amount-format';
+
+describe('stripInsignificantFractionZeros', () => {
+  it('trims trailing zeros after the decimal', () => {
+    expect(stripInsignificantFractionZeros('123.450000')).toBe('123.45');
+    expect(stripInsignificantFractionZeros('0.100000')).toBe('0.1');
+  });
+
+  it('removes the decimal point when the fraction is all zeros', () => {
+    expect(stripInsignificantFractionZeros('123.000000')).toBe('123');
+  });
+
+  it('returns the string unchanged when there is no decimal point', () => {
+    expect(stripInsignificantFractionZeros('42')).toBe('42');
+  });
+});
+
+describe('formatAmountInputFromNumber', () => {
+  it('returns empty string for non-positive or non-finite values', () => {
+    expect(formatAmountInputFromNumber(0)).toBe('');
+    expect(formatAmountInputFromNumber(-1)).toBe('');
+    expect(formatAmountInputFromNumber(Number.NaN)).toBe('');
+  });
+
+  it('floors to six decimals and strips insignificant zeros', () => {
+    expect(formatAmountInputFromNumber(12.3456789)).toBe('12.345678');
+    expect(formatAmountInputFromNumber(100)).toBe('100');
+    expect(formatAmountInputFromNumber(0.5)).toBe('0.5');
+  });
+});
diff --git a/ui/pages/perps/perps-withdraw-amount-format.ts b/ui/pages/perps/perps-withdraw-amount-format.ts
new file mode 100644
index 000000000000..aa31060f1712
--- /dev/null
+++ b/ui/pages/perps/perps-withdraw-amount-format.ts
@@ -0,0 +1,35 @@
+const PERPS_WITHDRAW_AMOUNT_DECIMALS = 6;
+
+/**
+ * Drops trailing fractional zeros and the decimal point when the fraction is empty.
+ * Linear in string length; `toFixed` output is bounded by decimal count (no regex).
+ * @param formatted
+ */
+export function stripInsignificantFractionZeros(formatted: string): string {
+  const dotIndex = formatted.indexOf('.');
+  if (dotIndex === -1) {
+    return formatted;
+  }
+  let end = formatted.length - 1;
+  while (end > dotIndex && formatted[end] === '0') {
+    end -= 1;
+  }
+  if (end === dotIndex) {
+    return formatted.slice(0, dotIndex);
+  }
+  return formatted.slice(0, end + 1);
+}
+
+export function formatAmountInputFromNumber(n: number): string {
+  if (!Number.isFinite(n) || n <= 0) {
+    return '';
+  }
+  const factor = 10 ** PERPS_WITHDRAW_AMOUNT_DECIMALS;
+  const floored = Math.floor(n * factor) / factor;
+  if (floored === Math.floor(floored)) {
+    return String(Math.floor(floored));
+  }
+  return stripInsignificantFractionZeros(
+    floored.toFixed(PERPS_WITHDRAW_AMOUNT_DECIMALS),
+  );
+}
diff --git a/ui/pages/perps/perps-withdraw-page.test.tsx b/ui/pages/perps/perps-withdraw-page.test.tsx
new file mode 100644
index 000000000000..a8103f02a793
--- /dev/null
+++ b/ui/pages/perps/perps-withdraw-page.test.tsx
@@ -0,0 +1,589 @@
+import React from 'react';
+import { act, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { enLocale as messages } from '../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
+import configureStore from '../../store/store';
+import mockState from '../../../test/data/mock-state.json';
+import { usePerpsEligibility } from '../../hooks/perps';
+import * as accountsSelectors from '../../selectors/accounts';
+import { getIsPerpsExperienceAvailable } from '../../selectors/perps/feature-flags';
+import { submitRequestToBackground } from '../../store/background-connection';
+import PerpsWithdrawPage from './perps-withdraw-page';
+
+jest.mock('@metamask/perps-controller', () => ({
+  HYPERLIQUID_ASSET_CONFIGS: {
+    usdc: {
+      mainnet: 'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+      testnet: 'eip155:421614/erc20:0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d',
+    },
+  },
+  HYPERLIQUID_WITHDRAWAL_MINUTES: 30,
+  WITHDRAWAL_CONSTANTS: {
+    DefaultMinAmount: '1.01',
+    DefaultFeeAmount: 1,
+  },
+}));
+
+const mockNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+  Navigate: ({ to }: { to: string }) => (
+    <div data-testid="navigate-to">{to}</div>
+  ),
+}));
+
+jest.mock('../../selectors/perps/feature-flags', () => ({
+  getIsPerpsExperienceAvailable: jest.fn(),
+}));
+
+jest.mock('../../hooks/perps', () => ({
+  usePerpsEligibility: jest.fn(() => ({ isEligible: true })),
+}));
+
+const mockUsePerpsEligibility = usePerpsEligibility as jest.MockedFunction<
+  typeof usePerpsEligibility
+>;
+
+jest.mock('../../hooks/perps/stream', () => ({
+  usePerpsLiveAccount: () => ({
+    account: { availableBalance: '100' },
+  }),
+}));
+
+jest.mock('../../store/background-connection', () => ({
+  submitRequestToBackground: jest.fn(),
+}));
+
+jest.mock('../../components/app/perps/perps-wallet-account-header', () => ({
+  PerpsWalletAccountHeader: () => (
+    <div data-testid="perps-wallet-account-header-mock" />
+  ),
+}));
+
+const mockGetIsPerpsExperienceAvailable =
+  getIsPerpsExperienceAvailable as jest.MockedFunction<
+    typeof getIsPerpsExperienceAvailable
+  >;
+
+const mockSubmit = submitRequestToBackground as jest.MockedFunction<
+  typeof submitRequestToBackground
+>;
+
+/**
+ * Await every promise returned for a given `submitRequestToBackground` method so
+ * `.then()` handlers (e.g. `setWithdrawalRoutes`) run inside `act`. Handles more
+ * than one call (e.g. effect re-run).
+ *
+ * @param method - Background RPC method name passed as the first argument.
+ */
+async function awaitSubmitPromisesForMethod(method: string) {
+  const promises: Promise<unknown>[] = [];
+  mockSubmit.mock.calls.forEach((call, i) => {
+    if (call[0] !== method) {
+      return;
+    }
+    const value = mockSubmit.mock.results[i]?.value;
+    if (value && typeof (value as Promise<unknown>).then === 'function') {
+      promises.push(value as Promise<unknown>);
+    }
+  });
+  if (promises.length === 0) {
+    return;
+  }
+  await act(async () => {
+    await Promise.all(promises);
+  });
+}
+
+/**
+ * Wait for the mount `useEffect` that fetches withdrawal routes, then await those
+ * RPC promises until no new `perpsGetWithdrawalRoutes` calls appear. `waitFor` alone
+ * can pass before `.then(setState)` runs; a routes update can also re-trigger the
+ * effect (dependency `[t]`), queueing another fetch whose promise must be awaited.
+ */
+async function settleInitialWithdrawRoutesFetch() {
+  await waitFor(() => {
+    expect(mockSubmit).toHaveBeenCalledWith('perpsGetWithdrawalRoutes', []);
+  });
+
+  for (let i = 0; i < 10; i += 1) {
+    const countBefore = mockSubmit.mock.calls.filter(
+      (call) => call[0] === 'perpsGetWithdrawalRoutes',
+    ).length;
+    await awaitSubmitPromisesForMethod('perpsGetWithdrawalRoutes');
+    await act(async () => {
+      await Promise.resolve();
+    });
+    const countAfter = mockSubmit.mock.calls.filter(
+      (call) => call[0] === 'perpsGetWithdrawalRoutes',
+    ).length;
+    if (countAfter === countBefore) {
+      return;
+    }
+  }
+}
+
+/** Await rejected `perpsGetWithdrawalRoutes` promises so the effect `catch` runs in `act`. */
+async function flushRejectedWithdrawRoutesPromises() {
+  await act(async () => {
+    for (let i = 0; i < mockSubmit.mock.calls.length; i += 1) {
+      if (mockSubmit.mock.calls[i][0] !== 'perpsGetWithdrawalRoutes') {
+        continue;
+      }
+      const value = mockSubmit.mock.results[i]?.value;
+      if (value && typeof (value as Promise<unknown>).then === 'function') {
+        await (value as Promise<unknown>).catch(() => undefined);
+      }
+    }
+  });
+}
+
+/** `handleWithdraw` is async; `finally` sets `isSubmitting` false after mocks resolve. */
+async function waitForWithdrawHandlerSettled() {
+  await waitFor(() => {
+    expect(screen.getByTestId('perps-withdraw-submit')).not.toBeDisabled();
+  });
+}
+
+describe('PerpsWithdrawPage', () => {
+  const createMockStore = () =>
+    configureStore({
+      metamask: {
+        ...mockState.metamask,
+        isTestnet: false,
+      },
+    });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUsePerpsEligibility.mockReturnValue({ isEligible: true });
+    mockGetIsPerpsExperienceAvailable.mockReturnValue(true);
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.resolve([
+          {
+            assetId:
+              'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+            chainId: 'eip155:42161',
+            contractAddress:
+              '0xaf88d065e77c8cC2239327C5EDb3A432268e5831' as `0x${string}`,
+            constraints: { minAmount: '1.01' },
+          },
+        ]);
+      }
+      if (method === 'perpsValidateWithdrawal') {
+        return Promise.resolve({ isValid: true });
+      }
+      if (method === 'perpsWithdraw') {
+        return Promise.resolve({ success: true, withdrawalId: 'hl_test' });
+      }
+      return Promise.resolve(undefined);
+    });
+  });
+
+  it('renders when perps experience is available', async () => {
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    expect(screen.getByTestId('perps-withdraw-page')).toBeInTheDocument();
+    expect(screen.getByTestId('perps-withdraw-cancel')).toBeInTheDocument();
+    expect(screen.getByTestId('perps-withdraw-submit')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('perps-withdraw-summary-receive-value'),
+    ).toHaveTextContent('—');
+  });
+
+  it('redirects when perps experience is disabled', async () => {
+    mockGetIsPerpsExperienceAvailable.mockReturnValue(false);
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    expect(screen.getByTestId('navigate-to')).toHaveTextContent('/');
+  });
+
+  it('submits withdrawal when amount is valid', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    // `user.click` resolves before the async `handleWithdraw` finishes; await the
+    // same background promises so `setState` / `finally` run inside `act`.
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+    await awaitSubmitPromisesForMethod('perpsWithdraw');
+
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith(
+        'perpsValidateWithdrawal',
+        expect.any(Array),
+      );
+      expect(mockSubmit).toHaveBeenCalledWith(
+        'perpsWithdraw',
+        expect.any(Array),
+      );
+    });
+
+    await waitFor(() => {
+      expect(mockNavigate).toHaveBeenCalledWith('/');
+    });
+
+    await waitForWithdrawHandlerSettled();
+  });
+
+  it('navigates home when cancel is pressed', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    await user.click(screen.getByTestId('perps-withdraw-cancel'));
+
+    expect(mockNavigate).toHaveBeenCalledWith('/');
+  });
+
+  it('does not accept more than six decimal places in the amount field', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '1.1234567');
+
+    expect(amountInput).toHaveValue('1.123456');
+  });
+
+  it('does not call perpsValidateWithdrawal when no account is selected', async () => {
+    const user = userEvent.setup();
+    const spy = jest
+      .spyOn(accountsSelectors, 'getSelectedInternalAccount')
+      .mockReturnValue(undefined as never);
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    expect(
+      await screen.findByText(messages.perpsWithdrawNoAccount.message),
+    ).toBeInTheDocument();
+
+    expect(mockSubmit).not.toHaveBeenCalledWith(
+      'perpsValidateWithdrawal',
+      expect.any(Array),
+    );
+
+    spy.mockRestore();
+  });
+
+  it('accepts six decimal places and submits withdrawal', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '10.123456');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+    await awaitSubmitPromisesForMethod('perpsWithdraw');
+
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith(
+        'perpsValidateWithdrawal',
+        expect.any(Array),
+      );
+    });
+
+    await waitForWithdrawHandlerSettled();
+  });
+
+  it('clears controller withdraw result when withdrawal fails', async () => {
+    const user = userEvent.setup();
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.resolve([
+          {
+            assetId:
+              'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+            chainId: 'eip155:42161',
+            contractAddress:
+              '0xaf88d065e77c8cC2239327C5EDb3A432268e5831' as `0x${string}`,
+            constraints: { minAmount: '1.01' },
+          },
+        ]);
+      }
+      if (method === 'perpsValidateWithdrawal') {
+        return Promise.resolve({ isValid: true });
+      }
+      if (method === 'perpsWithdraw') {
+        return Promise.resolve({ success: false, error: 'provider_error' });
+      }
+      return Promise.resolve(undefined);
+    });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+    await awaitSubmitPromisesForMethod('perpsWithdraw');
+
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith('perpsClearWithdrawResult', []);
+    });
+
+    await waitForWithdrawHandlerSettled();
+    await awaitSubmitPromisesForMethod('perpsClearWithdrawResult');
+  });
+
+  it('shows minimum withdrawal notice when amount is below the route minimum', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '1');
+
+    expect(await screen.findByText(/Minimum withdrawal/iu)).toBeInTheDocument();
+  });
+
+  it('shows insufficient balance when amount exceeds available Perps balance', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '101');
+
+    expect(
+      await screen.findByText(messages.perpsWithdrawInsufficient.message),
+    ).toBeInTheDocument();
+  });
+
+  it('shows geo-blocked copy and disables submit when user is not eligible', async () => {
+    mockUsePerpsEligibility.mockReturnValue({ isEligible: false });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    expect(
+      screen.getByText(messages.perpsGeoBlockedTooltip.message),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByTestId('perps-withdraw-percentage-buttons'),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId('perps-fiat-hero-amount-input')).toBeDisabled();
+    expect(screen.getByTestId('perps-withdraw-submit')).toBeDisabled();
+  });
+
+  it('fills amount from Max and 50% quick actions', async () => {
+    const user = userEvent.setup();
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    await user.click(screen.getByTestId('perps-withdraw-percentage-max'));
+    expect(screen.getByTestId('perps-fiat-hero-amount-input')).toHaveValue(
+      '100',
+    );
+
+    await user.click(screen.getByTestId('perps-withdraw-percentage-50'));
+    expect(screen.getByTestId('perps-fiat-hero-amount-input')).toHaveValue(
+      '50',
+    );
+  });
+
+  it('shows server validation error when perpsValidateWithdrawal returns invalid', async () => {
+    const user = userEvent.setup();
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.resolve([
+          {
+            assetId:
+              'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+            chainId: 'eip155:42161',
+            contractAddress:
+              '0xaf88d065e77c8cC2239327C5EDb3A432268e5831' as `0x${string}`,
+            constraints: { minAmount: '1.01' },
+          },
+        ]);
+      }
+      if (method === 'perpsValidateWithdrawal') {
+        return Promise.resolve({
+          isValid: false,
+          error: 'blocked_by_provider',
+        });
+      }
+      return Promise.resolve(undefined);
+    });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+
+    expect(await screen.findByText('blocked_by_provider')).toBeInTheDocument();
+    expect(mockSubmit).not.toHaveBeenCalledWith(
+      'perpsWithdraw',
+      expect.any(Array),
+    );
+
+    await waitForWithdrawHandlerSettled();
+  });
+
+  it('shows generic invalid message when validation fails without an error string', async () => {
+    const user = userEvent.setup();
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.resolve([
+          {
+            assetId:
+              'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+            chainId: 'eip155:42161',
+            contractAddress:
+              '0xaf88d065e77c8cC2239327C5EDb3A432268e5831' as `0x${string}`,
+            constraints: { minAmount: '1.01' },
+          },
+        ]);
+      }
+      if (method === 'perpsValidateWithdrawal') {
+        return Promise.resolve({ isValid: false });
+      }
+      return Promise.resolve(undefined);
+    });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+
+    expect(
+      await screen.findByText(messages.perpsWithdrawInvalidAmount.message),
+    ).toBeInTheDocument();
+
+    await waitForWithdrawHandlerSettled();
+  });
+
+  it('shows failure message and clears withdraw result when perpsWithdraw throws', async () => {
+    const user = userEvent.setup();
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.resolve([
+          {
+            assetId:
+              'eip155:42161/erc20:0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+            chainId: 'eip155:42161',
+            contractAddress:
+              '0xaf88d065e77c8cC2239327C5EDb3A432268e5831' as `0x${string}`,
+            constraints: { minAmount: '1.01' },
+          },
+        ]);
+      }
+      if (method === 'perpsValidateWithdrawal') {
+        return Promise.resolve({ isValid: true });
+      }
+      if (method === 'perpsWithdraw') {
+        return Promise.reject(new Error('network'));
+      }
+      if (method === 'perpsClearWithdrawResult') {
+        return Promise.resolve(undefined);
+      }
+      return Promise.resolve(undefined);
+    });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await settleInitialWithdrawRoutesFetch();
+
+    const amountInput = screen.getByTestId('perps-fiat-hero-amount-input');
+    await user.clear(amountInput);
+    await user.type(amountInput, '50');
+    await user.click(screen.getByTestId('perps-withdraw-submit'));
+
+    await awaitSubmitPromisesForMethod('perpsValidateWithdrawal');
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith(
+        'perpsWithdraw',
+        expect.any(Array),
+      );
+    });
+    const withdrawCallIndex = mockSubmit.mock.calls.findIndex(
+      (call) => call[0] === 'perpsWithdraw',
+    );
+    await act(async () => {
+      await (
+        mockSubmit.mock.results[withdrawCallIndex].value as Promise<unknown>
+      ).catch(() => undefined);
+    });
+
+    expect(
+      await screen.findByText(messages.perpsWithdrawFailed.message),
+    ).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith('perpsClearWithdrawResult', []);
+    });
+
+    await waitForWithdrawHandlerSettled();
+    await awaitSubmitPromisesForMethod('perpsClearWithdrawResult');
+  });
+
+  it('survives withdrawal routes fetch rejection', async () => {
+    mockSubmit.mockImplementation((method: string) => {
+      if (method === 'perpsGetWithdrawalRoutes') {
+        return Promise.reject(new Error('rpc'));
+      }
+      return Promise.resolve(undefined);
+    });
+
+    renderWithProvider(<PerpsWithdrawPage />, createMockStore());
+
+    await waitFor(() => {
+      expect(mockSubmit).toHaveBeenCalledWith('perpsGetWithdrawalRoutes', []);
+    });
+    await flushRejectedWithdrawRoutesPromises();
+
+    expect(screen.getByTestId('perps-withdraw-page')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/perps/perps-withdraw-page.tsx b/ui/pages/perps/perps-withdraw-page.tsx
new file mode 100644
index 000000000000..fc44de35da5d
--- /dev/null
+++ b/ui/pages/perps/perps-withdraw-page.tsx
@@ -0,0 +1,471 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { Navigate, useNavigate } from 'react-router-dom';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+  AvatarToken,
+  AvatarTokenSize,
+  BadgeWrapper,
+  BadgeWrapperPosition,
+  BadgeWrapperPositionAnchorShape,
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonSize,
+  ButtonVariant,
+  Text,
+  TextAlign,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react';
+import type { AssetRoute, WithdrawResult } from '@metamask/perps-controller';
+import {
+  HYPERLIQUID_ASSET_CONFIGS,
+  HYPERLIQUID_WITHDRAWAL_MINUTES,
+  WITHDRAWAL_CONSTANTS,
+} from '@metamask/perps-controller';
+import { isValidPerpsWithdrawAmount } from '../../components/app/perps/constants';
+import { Content, Footer, Page } from '../../components/multichain/pages/page';
+import { getSelectedInternalAccount } from '../../selectors/accounts';
+import { FlexDirection } from '../../helpers/constants/design-system';
+import { getAvatarNetworkColor } from '../../helpers/utils/accounts';
+import {
+  CHAIN_IDS,
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  NETWORK_TO_NAME_MAP,
+} from '../../../shared/constants/network';
+import { ConfirmInfoRowSize } from '../../components/app/confirm/info/row/row';
+import { PerpsFiatHeroAmountInput } from '../../components/app/perps/perps-fiat-hero-amount-input';
+import { PerpsFiatSummaryRows } from '../../components/app/perps/perps-fiat-summary-rows';
+import { PerpsWithdrawPercentageButtons } from '../../components/app/perps/perps-withdraw-percentage-buttons';
+import { PerpsWalletAccountHeader } from '../../components/app/perps/perps-wallet-account-header';
+import { getIsPerpsExperienceAvailable } from '../../selectors/perps/feature-flags';
+import { selectPerpsIsTestnet } from '../../selectors/perps-controller';
+import { useI18nContext } from '../../hooks/useI18nContext';
+import { useFormatters } from '../../hooks/useFormatters';
+import { usePerpsEligibility } from '../../hooks/perps';
+import { usePerpsLiveAccount } from '../../hooks/perps/stream';
+import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
+import { submitRequestToBackground } from '../../store/background-connection';
+import { formatAmountInputFromNumber } from './perps-withdraw-amount-format';
+
+/** Arbitrum native USDC (matches `ARBITRUM_USDC_TOKEN_OBJECT` in swaps constants). */
+const ARBITRUM_USDC_TOKEN_ICON_URL =
+  'https://static.cx.metamask.io/api/v1/tokenIcons/42161/0xaf88d065e77c8cc2239327c5edb3a432268e5831.png';
+
+function parsePerpsAmountInput(raw: string): number {
+  const normalized = raw.replace(/,/gu, '.');
+  const n = parseFloat(normalized);
+  return Number.isFinite(n) ? n : NaN;
+}
+
+/**
+ * Perps withdraw screen: enter USDC amount, validate against routes and balance,
+ * submit `perpsWithdraw` with HyperLiquid USDC CAIP asset id.
+ *
+ * Layout mirrors deposit confirmations (`CustomAmountInfo` + small summary rows)
+ * while remaining a standalone multichain page (no `TransactionMeta` / pay flow).
+ */
+const PerpsWithdrawPage: React.FC = () => {
+  const t = useI18nContext();
+  const navigate = useNavigate();
+  const { formatCurrency } = useFormatters();
+  const isPerpsExperienceAvailable = useSelector(getIsPerpsExperienceAvailable);
+  const isTestnet = useSelector(selectPerpsIsTestnet);
+  const selectedAccount = useSelector(getSelectedInternalAccount);
+  const { isEligible } = usePerpsEligibility();
+  const { account } = usePerpsLiveAccount();
+
+  const [amount, setAmount] = useState('0');
+  const [withdrawalRoutes, setWithdrawalRoutes] = useState<AssetRoute[]>([]);
+  const [routesError, setRoutesError] = useState<string | null>(null);
+  const [submitError, setSubmitError] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const availableBalance = account?.availableBalance ?? '0';
+  const availableNum = parseFloat(availableBalance) || 0;
+
+  const usdcAssetId = useMemo(
+    () =>
+      isTestnet
+        ? HYPERLIQUID_ASSET_CONFIGS.usdc.testnet
+        : HYPERLIQUID_ASSET_CONFIGS.usdc.mainnet,
+    [isTestnet],
+  );
+
+  const usdcRoute = useMemo(() => {
+    return (
+      withdrawalRoutes.find((r) => r.assetId === usdcAssetId) ??
+      withdrawalRoutes[0]
+    );
+  }, [withdrawalRoutes, usdcAssetId]);
+
+  const minWithdrawAmount = useMemo(() => {
+    const fromRoute = usdcRoute?.constraints?.minAmount;
+    if (fromRoute !== undefined && fromRoute !== '') {
+      return fromRoute;
+    }
+    return WITHDRAWAL_CONSTANTS.DefaultMinAmount;
+  }, [usdcRoute]);
+
+  const minWithdrawNum = parseFloat(minWithdrawAmount) || 0;
+  const defaultFee = WITHDRAWAL_CONSTANTS.DefaultFeeAmount;
+
+  const estimatedMinutes =
+    usdcRoute?.constraints?.estimatedMinutes ?? HYPERLIQUID_WITHDRAWAL_MINUTES;
+
+  useEffect(() => {
+    let cancelled = false;
+    setRoutesError(null);
+
+    submitRequestToBackground<AssetRoute[]>('perpsGetWithdrawalRoutes', [])
+      .then((routes) => {
+        if (!cancelled) {
+          setWithdrawalRoutes(Array.isArray(routes) ? routes : []);
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setRoutesError(t('perpsWithdrawRoutesError'));
+          setWithdrawalRoutes([]);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [t]);
+
+  const amountNum = useMemo(() => parsePerpsAmountInput(amount), [amount]);
+
+  const youReceiveNum = useMemo(() => {
+    if (!Number.isFinite(amountNum) || amountNum <= 0) {
+      return NaN;
+    }
+    return Math.max(0, amountNum - defaultFee);
+  }, [amountNum, defaultFee]);
+
+  const validationMessage = useMemo((): string | null => {
+    const trimmed = amount.trim();
+    if (trimmed === '' || trimmed === '0') {
+      return null;
+    }
+    const normalizedForValidation = trimmed.replace(/,/gu, '.');
+    if (!isValidPerpsWithdrawAmount(normalizedForValidation)) {
+      return t('perpsWithdrawInvalidAmount');
+    }
+    if (!Number.isFinite(amountNum) || amountNum <= 0) {
+      return t('perpsWithdrawInvalidAmount');
+    }
+    if (amountNum < minWithdrawNum) {
+      return t('perpsWithdrawMinNotice', [minWithdrawAmount]);
+    }
+    if (amountNum > availableNum) {
+      return t('perpsWithdrawInsufficient');
+    }
+    return null;
+  }, [amount, amountNum, availableNum, minWithdrawNum, minWithdrawAmount, t]);
+
+  const hasValidInputs =
+    isValidPerpsWithdrawAmount(amount.trim().replace(/,/gu, '.')) &&
+    Number.isFinite(amountNum) &&
+    amountNum >= minWithdrawNum &&
+    amountNum <= availableNum &&
+    isEligible;
+
+  const handleHeroAmountChange = useCallback((value: string) => {
+    const next = value.replace(/,/gu, '.');
+    if (next === '' || isValidPerpsWithdrawAmount(next)) {
+      setAmount(next);
+    }
+    setSubmitError(null);
+  }, []);
+
+  const handlePercentageClick = useCallback(
+    (percentage: number) => {
+      if (percentage === 100) {
+        setAmount(formatAmountInputFromNumber(availableNum) || '0');
+      } else {
+        setAmount(
+          formatAmountInputFromNumber((availableNum * percentage) / 100),
+        );
+      }
+      setSubmitError(null);
+    },
+    [availableNum],
+  );
+
+  const handleCancel = useCallback(() => {
+    navigate(DEFAULT_ROUTE);
+  }, [navigate]);
+
+  const handleContinue = useCallback(async () => {
+    if (!hasValidInputs || isSubmitting) {
+      return;
+    }
+
+    setIsSubmitting(true);
+    setSubmitError(null);
+
+    const cleanAmount = amount.replace(/,/gu, '.').trim();
+
+    if (!selectedAccount?.address) {
+      setSubmitError(t('perpsWithdrawNoAccount'));
+      setIsSubmitting(false);
+      return;
+    }
+
+    if (!isValidPerpsWithdrawAmount(cleanAmount)) {
+      setSubmitError(t('perpsWithdrawInvalidAmount'));
+      setIsSubmitting(false);
+      return;
+    }
+
+    try {
+      const validation = await submitRequestToBackground<{
+        isValid: boolean;
+        error?: string;
+      }>('perpsValidateWithdrawal', [
+        { amount: cleanAmount, assetId: usdcAssetId },
+      ]);
+
+      if (!validation?.isValid) {
+        setSubmitError(validation?.error ?? t('perpsWithdrawInvalidAmount'));
+        return;
+      }
+
+      const result = await submitRequestToBackground<WithdrawResult>(
+        'perpsWithdraw',
+        [{ amount: cleanAmount, assetId: usdcAssetId }],
+      );
+
+      if (result?.success) {
+        navigate(DEFAULT_ROUTE);
+        return;
+      }
+
+      setSubmitError(result?.error ?? t('perpsWithdrawFailed'));
+      submitRequestToBackground('perpsClearWithdrawResult', []).catch(() => {
+        // Non-blocking cleanup of controller toast state
+      });
+    } catch {
+      setSubmitError(t('perpsWithdrawFailed'));
+      submitRequestToBackground('perpsClearWithdrawResult', []).catch(() => {
+        // Non-blocking cleanup of controller toast state
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [
+    amount,
+    hasValidInputs,
+    isSubmitting,
+    navigate,
+    selectedAccount?.address,
+    t,
+    usdcAssetId,
+  ]);
+
+  const arbitrumNetworkName =
+    NETWORK_TO_NAME_MAP[
+      CHAIN_IDS.ARBITRUM as keyof typeof NETWORK_TO_NAME_MAP
+    ] ?? 'Arbitrum';
+  const arbitrumNetworkImageUrl =
+    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+      CHAIN_IDS.ARBITRUM as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+    ] ?? '';
+
+  const receiveAssetRowContent = useMemo(() => {
+    const networkBackgroundKey = getAvatarNetworkColor(arbitrumNetworkName);
+    const networkAvatarStyle = networkBackgroundKey
+      ? {
+          backgroundColor: `var(--color-network-${networkBackgroundKey}-default)`,
+        }
+      : undefined;
+
+    return (
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        alignItems={BoxAlignItems.Center}
+        gap={2}
+        data-testid="perps-withdraw-summary-asset-value"
+      >
+        <BadgeWrapper
+          position={BadgeWrapperPosition.BottomRight}
+          positionAnchorShape={BadgeWrapperPositionAnchorShape.Rectangular}
+          badge={
+            <AvatarNetwork
+              src={arbitrumNetworkImageUrl}
+              name={arbitrumNetworkName}
+              size={AvatarNetworkSize.Xs}
+              className="box-border border-2 border-default"
+              style={networkAvatarStyle}
+            />
+          }
+        >
+          <AvatarToken
+            name="USDC"
+            src={ARBITRUM_USDC_TOKEN_ICON_URL}
+            size={AvatarTokenSize.Sm}
+          />
+        </BadgeWrapper>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextDefault}>
+          USDC
+        </Text>
+      </Box>
+    );
+  }, [arbitrumNetworkImageUrl, arbitrumNetworkName]);
+
+  const summaryRows = useMemo(
+    () => [
+      {
+        label: t('perpsWithdrawReceive'),
+        valueContent: receiveAssetRowContent,
+        'data-testid': 'perps-withdraw-summary-asset',
+      },
+      {
+        label: t('perpsWithdrawFee'),
+        value: formatCurrency(defaultFee, 'USD'),
+        'data-testid': 'perps-withdraw-summary-fee',
+      },
+      {
+        label: t('perpsWithdrawEstimatedTime'),
+        value: t('perpsWithdrawMinutesApprox', [String(estimatedMinutes)]),
+        'data-testid': 'perps-withdraw-summary-time',
+      },
+      {
+        label: t('perpsYouReceive'),
+        value: Number.isFinite(youReceiveNum)
+          ? formatCurrency(youReceiveNum, 'USD')
+          : '—',
+        emphasizeValue: true,
+        valueColor: TextColor.TextDefault,
+        'data-testid': 'perps-withdraw-summary-receive',
+      },
+    ],
+    [
+      defaultFee,
+      estimatedMinutes,
+      formatCurrency,
+      receiveAssetRowContent,
+      t,
+      youReceiveNum,
+    ],
+  );
+
+  if (!isPerpsExperienceAvailable) {
+    return <Navigate to={DEFAULT_ROUTE} replace />;
+  }
+
+  const amountHasAlert = Boolean(validationMessage);
+
+  return (
+    <Page data-testid="perps-withdraw-page">
+      <PerpsWalletAccountHeader />
+      <Content className="min-h-0 flex-1">
+        <Box
+          flexDirection={BoxFlexDirection.Column}
+          gap={4}
+          className="w-full min-h-0 flex-1"
+          style={{ flex: 1, minHeight: 0 }}
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+            gap={4}
+            className="w-full min-h-0 flex-1"
+            style={{ flex: 1, minHeight: 0 }}
+          >
+            <PerpsFiatHeroAmountInput
+              value={amount}
+              onChange={handleHeroAmountChange}
+              disabled={!isEligible || isSubmitting}
+              hasAlert={amountHasAlert}
+            />
+
+            <Text
+              variant={TextVariant.BodySm}
+              color={TextColor.TextAlternative}
+              textAlign={TextAlign.Center}
+            >
+              {t('perpsAvailableBalance')}
+              {formatCurrency(availableNum, 'USD')}
+            </Text>
+
+            {isEligible ? (
+              <PerpsWithdrawPercentageButtons
+                disabled={isSubmitting}
+                onPercentageClick={handlePercentageClick}
+              />
+            ) : null}
+          </Box>
+
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            gap={4}
+            style={{ flexShrink: 0 }}
+          >
+            <PerpsFiatSummaryRows
+              rows={summaryRows}
+              rowVariant={ConfirmInfoRowSize.Small}
+            />
+
+            {validationMessage ? (
+              <Text variant={TextVariant.BodySm} color={TextColor.ErrorDefault}>
+                {validationMessage}
+              </Text>
+            ) : null}
+
+            {submitError ? (
+              <Text variant={TextVariant.BodySm} color={TextColor.ErrorDefault}>
+                {submitError}
+              </Text>
+            ) : null}
+
+            {isEligible ? null : (
+              <Text
+                variant={TextVariant.BodySm}
+                color={TextColor.TextAlternative}
+              >
+                {t('perpsGeoBlockedTooltip')}
+              </Text>
+            )}
+          </Box>
+        </Box>
+      </Content>
+      <Footer
+        className="confirm-footer_page-footer"
+        flexDirection={FlexDirection.Column}
+      >
+        <Box flexDirection={BoxFlexDirection.Row} gap={4} className="w-full">
+          <Button
+            isFullWidth
+            data-testid="perps-withdraw-cancel"
+            variant={ButtonVariant.Secondary}
+            size={ButtonSize.Lg}
+            onClick={handleCancel}
+          >
+            {t('cancel')}
+          </Button>
+          <Button
+            isFullWidth
+            data-testid="perps-withdraw-submit"
+            variant={ButtonVariant.Primary}
+            size={ButtonSize.Lg}
+            onClick={handleContinue}
+            isLoading={isSubmitting}
+            isDisabled={!hasValidInputs || isSubmitting}
+          >
+            {t('perpsWithdraw')}
+          </Button>
+        </Box>
+      </Footer>
+    </Page>
+  );
+};
+
+export default PerpsWithdrawPage;
diff --git a/ui/pages/remove-snap-account/snap-account-card.test.tsx b/ui/pages/remove-snap-account/snap-account-card.test.tsx
index fac4f705cfd7..b3830d8cddea 100644
--- a/ui/pages/remove-snap-account/snap-account-card.test.tsx
+++ b/ui/pages/remove-snap-account/snap-account-card.test.tsx
@@ -49,7 +49,6 @@ const mockAccountTree = {
       },
     },
   },
-  selectedAccountGroup: mockGroupId,
 };
 
 const mockBalanceForAllWallets = {
@@ -81,6 +80,7 @@ const mockDefaultState = {
         [mockSnapAccount.id]: mockSnapAccount,
       },
     },
+    selectedAccountGroup: mockGroupId,
     accountTree: mockAccountTree,
     keyrings: [
       {
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index 062630f8e43b..a279ffdf9135 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -359,6 +359,7 @@ describe('toast display', () => {
           },
         },
       },
+      selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       accountTree: {
         wallets: {
           'entropy:01JKAF3DSGM3AB87EM9N0K41AJ': {
@@ -376,6 +377,7 @@ describe('toast display', () => {
                   },
                   hidden: false,
                   pinned: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -387,7 +389,6 @@ describe('toast display', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       },
       internalAccounts: {
         accounts: {
diff --git a/ui/pages/routes/routes.component.tsx b/ui/pages/routes/routes.component.tsx
index 1e4eac02a52d..48d7f91eab31 100644
--- a/ui/pages/routes/routes.component.tsx
+++ b/ui/pages/routes/routes.component.tsx
@@ -4,15 +4,8 @@
 import classnames from 'clsx';
 import React, { Suspense, useEffect, useRef } from 'react';
 import { useDispatch } from 'react-redux';
-import {
-  useLocation,
-  useNavigationType,
-  Navigate,
-  Outlet,
-} from 'react-router-dom';
+import { useLocation, Navigate, Outlet } from 'react-router-dom';
 import IdleTimer from 'react-idle-timer';
-import type { ApprovalType } from '@metamask/controller-utils';
-import { TransactionMeta } from '@metamask/transaction-controller';
 
 import { useAppSelector } from '../../store/store';
 import Loading from '../../components/ui/loading-screen';
@@ -36,6 +29,7 @@ import {
   RESTORE_VAULT_ROUTE,
   REVEAL_SEED_ROUTE,
   SEND_ROUTE,
+  LEGACY_SETTINGS_V2_ROUTE,
   SETTINGS_ROUTE,
   UNLOCK_ROUTE,
   CONFIRMATION_V_NEXT_ROUTE,
@@ -71,6 +65,7 @@ import {
   PERPS_MARKET_DETAIL_ROUTE,
   PERPS_ORDER_ENTRY_ROUTE,
   PERPS_ACTIVITY_ROUTE,
+  PERPS_WITHDRAW_ROUTE,
   CONTACTS_ROUTE,
   SETTINGS_V2_ROUTE,
 } from '../../helpers/constants/routes';
@@ -83,11 +78,9 @@ import {
   getShowExtensionInFullSizeView,
   getNetworkToAutomaticallySwitchTo,
   getNumberOfAllUnapprovedTransactionsAndMessages,
-  oldestPendingConfirmationSelector,
-  getUnapprovedTransactions,
-  getPendingApprovals,
 } from '../../selectors';
 import { useTheme } from '../../hooks/useTheme';
+import { useIsRedesignedConfirmationType } from '../../hooks/useIsRedesignedTransactionType';
 
 import {
   hideImportNftsModal,
@@ -112,6 +105,7 @@ import {
   ENVIRONMENT_TYPE_SIDEPANEL,
   SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES,
 } from '../../../shared/constants/app';
+import { isInteractiveUI } from '../../../shared/lib/environment-type';
 // TODO: Remove restricted import
 // eslint-disable-next-line import-x/no-restricted-paths
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
@@ -125,10 +119,6 @@ import NetworkConfirmationPopover from '../../components/multichain/network-list
 import { ToastMaster } from '../../components/app/toast-master/toast-master';
 import { mmLazy } from '../../helpers/utils/mm-lazy';
 import CrossChainSwapTxDetails from '../bridge/transaction-details/transaction-details';
-import {
-  isCorrectDeveloperTransactionType,
-  isCorrectSignatureApprovalType,
-} from '../../../shared/lib/confirmation.utils';
 import { type Confirmation } from '../confirmations/types/confirm';
 import { MultichainAccountAddressListPage } from '../multichain-accounts/multichain-account-address-list-page';
 import { MultichainAccountPrivateKeyListPage } from '../multichain-accounts/multichain-account-private-key-list-page';
@@ -144,6 +134,8 @@ import { RequireOnboarded } from '../../layouts/require-onboarded';
 import { contactsRoutes } from '../contacts';
 import RequireBasicFunctionality from '../../helpers/higher-order-components/require-basic-functionality/require-basic-functionality';
 import { getCurrencyRateControllerCurrentCurrency } from '../../../shared/lib/selectors/assets-migration';
+import { Toaster } from '../../components/ui/toast/toast';
+import { ToastListener } from '../../components/ui/toast/toast-listener';
 import { getConnectingLabel, setTheme } from './utils';
 import { ConfirmationHandler } from './confirmation-handler';
 import { Modals } from './modals';
@@ -157,7 +149,6 @@ const ImportSrpPage = mmLazy(() => import('../multi-srp/import-srp/index.ts'));
 const RevealSeedConfirmation = mmLazy(
   () => import('../keychains/reveal-seed.tsx'),
 );
-const Settings = mmLazy(() => import('../settings/index.js'));
 const SettingsV2 = mmLazy(() => import('../settings-v2/index.ts'));
 const NotificationDetails = mmLazy(
   () => import('../notification-details/index.js'),
@@ -243,6 +234,9 @@ const MarketListView = mmLazy(() => import('../perps/market-list/index.tsx'));
 const PerpsActivityPage = mmLazy(
   () => import('../perps/perps-activity-page.tsx'),
 );
+const PerpsWithdrawPage = mmLazy(
+  () => import('../perps/perps-withdraw-page.tsx'),
+);
 const PerpsOrderEntryPage = mmLazy(
   () => import('../perps/perps-order-entry-page.tsx'),
 );
@@ -250,6 +244,16 @@ const MusdConversionPage = mmLazy(() => import('../musd/index.tsx'));
 const PerpsLayout = mmLazy(() => import('../perps/perps-layout.tsx'));
 // End Lazy Routes
 
+const SettingsV2LegacyRedirect = () => {
+  const { pathname, search, hash } = useLocation();
+  const canonicalPath = pathname.replace(
+    LEGACY_SETTINGS_V2_ROUTE,
+    SETTINGS_ROUTE,
+  );
+
+  return <Navigate to={`${canonicalPath}${search}${hash}`} replace />;
+};
+
 export const routeConfig = [
   {
     element: <LegacyLayout />,
@@ -298,11 +302,11 @@ export const routeConfig = [
       },
       {
         path: `${SETTINGS_ROUTE}/*`,
-        element: <Settings />,
+        element: <SettingsV2 />,
       },
       {
-        path: `${SETTINGS_V2_ROUTE}/*`,
-        element: <SettingsV2 />,
+        path: `${LEGACY_SETTINGS_V2_ROUTE}/*`,
+        element: <SettingsV2LegacyRedirect />,
       },
       {
         path: `${SEND_ROUTE}/:page?`,
@@ -474,6 +478,10 @@ export const routeConfig = [
                 path: PERPS_MARKET_LIST_ROUTE,
                 element: <MarketListView />,
               },
+              {
+                path: PERPS_WITHDRAW_ROUTE,
+                element: <PerpsWithdrawPage />,
+              },
             ],
           },
         ],
@@ -486,7 +494,6 @@ export const routeConfig = [
 export default function Routes() {
   const dispatch = useDispatch();
   const location = useLocation();
-  const navType = useNavigationType();
 
   const alertOpen = useAppSelector((state) => state.appState.alertOpen);
   const alertMessage = useAppSelector((state) => state.appState.alertMessage);
@@ -501,13 +508,6 @@ export default function Routes() {
   const networkToAutomaticallySwitchTo = useAppSelector(
     getNetworkToAutomaticallySwitchTo,
   );
-  const oldestPendingApproval = useAppSelector(
-    oldestPendingConfirmationSelector,
-  );
-  const pendingApprovals = useAppSelector(getPendingApprovals);
-  const transactionsMetadata = useAppSelector(
-    getUnapprovedTransactions,
-  ) as Record<string, TransactionMeta>;
 
   const textDirection = useAppSelector((state) => state.metamask.textDirection);
   const isUnlocked = useAppSelector(getIsUnlocked);
@@ -558,6 +558,8 @@ export default function Routes() {
   const { showMultichainIntroModal, setShowMultichainIntroModal } =
     useMultichainAccountsIntroModal(isUnlocked, location);
 
+  const isUsingRedesignedConfirmationType = useIsRedesignedConfirmationType();
+
   const prevPropsRef = useRef({
     isUnlocked,
     totalUnapprovedConfirmationCount,
@@ -619,10 +621,8 @@ export default function Routes() {
 
   // Track location changes for metrics
   useEffect(() => {
-    if (navType === 'PUSH') {
-      dispatch(pageChanged(location.pathname));
-    }
-  }, [location.pathname, navType, dispatch]);
+    dispatch(pageChanged(location.pathname));
+  }, [location.pathname, dispatch]);
 
   useEffect(() => {
     setTheme(theme);
@@ -661,20 +661,6 @@ export default function Routes() {
     ? getConnectingLabel(loadingMessage, { providerType, providerId }, { t })
     : null;
 
-  const paramsConfirmationId: string = location.pathname.split(
-    '/confirm-transaction/',
-  )[1];
-  const confirmationId = paramsConfirmationId ?? oldestPendingApproval?.id;
-  const pendingApproval = pendingApprovals.find(
-    (approval) => approval.id === confirmationId,
-  );
-  const isCorrectApprovalType = isCorrectSignatureApprovalType(
-    pendingApproval?.type as ApprovalType | undefined,
-  );
-  const isCorrectTransactionType = isCorrectDeveloperTransactionType(
-    transactionsMetadata[confirmationId]?.type,
-  );
-
   const isShowingDeepLinkRoute = location.pathname === DEEP_LINK_ROUTE;
 
   const isLoadingShown =
@@ -687,13 +673,13 @@ export default function Routes() {
     ) &&
     // In the redesigned screens, we hide the general loading spinner and the
     // loading states are on a component by component basis.
-    !isCorrectApprovalType &&
-    !isCorrectTransactionType &&
+    !isUsingRedesignedConfirmationType &&
     // We don't want to show the loading screen on the deep link route, as it
     // is already a fullscreen interface.
     !isShowingDeepLinkRoute;
 
-  const isSidepanel = getEnvironmentType() === ENVIRONMENT_TYPE_SIDEPANEL;
+  const environmentType = getEnvironmentType();
+  const isSidepanel = environmentType === ENVIRONMENT_TYPE_SIDEPANEL;
 
   return (
     <div
@@ -705,6 +691,8 @@ export default function Routes() {
       dir={textDirection}
     >
       <ConfirmationHandler />
+      {isInteractiveUI() && <ToastListener />}
+
       <QRHardwarePopover />
       <Modal />
       <Alert visible={alertOpen} msg={alertMessage} />
@@ -745,6 +733,8 @@ export default function Routes() {
 
       {isUnlocked ? <Alerts /> : null}
       <ToastMaster />
+
+      <Toaster />
       <Modals />
     </div>
   );
diff --git a/ui/pages/settings-v2/about-tab/about-tab.tsx b/ui/pages/settings-v2/about-tab/about-tab.tsx
new file mode 100644
index 000000000000..b15fdb367c74
--- /dev/null
+++ b/ui/pages/settings-v2/about-tab/about-tab.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import InfoTab from '../../settings/info-tab/info-tab';
+import { SettingsTab } from '../shared';
+import { SettingItemConfig } from '../types';
+
+const ABOUT_US_SETTING_ITEMS: SettingItemConfig[] = [
+  { id: 'about-us', component: InfoTab },
+];
+
+const AboutTab = () => {
+  return <SettingsTab items={ABOUT_US_SETTING_ITEMS} />;
+};
+
+export default AboutTab;
diff --git a/ui/pages/settings-v2/about-tab/index.ts b/ui/pages/settings-v2/about-tab/index.ts
new file mode 100644
index 000000000000..4d8306aa2df3
--- /dev/null
+++ b/ui/pages/settings-v2/about-tab/index.ts
@@ -0,0 +1 @@
+export { default } from './about-tab';
diff --git a/ui/pages/settings-v2/assets-tab/__snapshots__/assets-tab.test.tsx.snap b/ui/pages/settings-v2/assets-tab/__snapshots__/assets-tab.test.tsx.snap
index 4388acef7554..511ed54d0f2c 100644
--- a/ui/pages/settings-v2/assets-tab/__snapshots__/assets-tab.test.tsx.snap
+++ b/ui/pages/settings-v2/assets-tab/__snapshots__/assets-tab.test.tsx.snap
@@ -3,29 +3,29 @@
 exports[`Assets Tab snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <div>
-      <div
-        class="flex flex-row items-center justify-between py-3"
+      <a
+        class="block hover:bg-background-default-hover"
+        href="/settings/assets/currency"
       >
-        <p
-          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-        >
-          Local currency
-        </p>
         <div
-          class="flex flex-row gap-1 items-center"
+          class="flex flex-row items-center justify-between px-4 py-3"
         >
           <p
-            class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+            class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
           >
-            USD
+            Local currency
           </p>
-          <a
-            class="flex ml-1"
-            href="/settings-v2/assets/currency"
+          <div
+            class="flex flex-row gap-1 items-center"
           >
+            <p
+              class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+            >
+              USD
+            </p>
             <svg
               class="inline-block w-4 h-4 text-icon-alternative"
               fill="currentColor"
@@ -36,13 +36,13 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
                 d="m8.887 22-1.775-1.775L15.337 12 7.112 3.775 8.887 2l10 10z"
               />
             </svg>
-          </a>
+          </div>
         </div>
-      </div>
+      </a>
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -52,7 +52,9 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
           >
             Show native token as main balance
           </p>
-          <div>
+          <div
+            data-testid="show-native-token-as-main-balance-toggle"
+          >
             <label
               class="toggle-button toggle-button--on"
               tabindex="0"
@@ -90,11 +92,11 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -142,11 +144,11 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -200,7 +202,7 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -210,7 +212,9 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
           >
             Autodetect NFTs
           </p>
-          <div>
+          <div
+            data-testid="use-nft-detection"
+          >
             <label
               class="toggle-button toggle-button--on"
               tabindex="0"
@@ -236,7 +240,7 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
                   />
                 </div>
                 <input
-                  data-testid="use-nft-detection"
+                  data-testid="use-nft-detection-input"
                   style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                   type="checkbox"
                   value="true"
@@ -254,7 +258,7 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -264,7 +268,9 @@ exports[`Assets Tab snapshot matches snapshot 1`] = `
           >
             Autodetect tokens
           </p>
-          <div>
+          <div
+            data-testid="autodetect-tokens"
+          >
             <label
               class="toggle-button toggle-button--on"
               tabindex="0"
diff --git a/ui/pages/settings-v2/assets-tab/assets-tab.tsx b/ui/pages/settings-v2/assets-tab/assets-tab.tsx
index 71707fe8e50e..4d51ce67649b 100644
--- a/ui/pages/settings-v2/assets-tab/assets-tab.tsx
+++ b/ui/pages/settings-v2/assets-tab/assets-tab.tsx
@@ -23,6 +23,7 @@ const ShowNetworkTokenToggleItem = createToggleItem({
   selector: getShowNativeTokenAsMainBalance,
   action: setShowNativeTokenAsMainBalancePreference,
   dataTestId: 'show-native-token-as-main-balance',
+  containerDataTestId: 'show-native-token-as-main-balance-toggle',
   trackEvent: {
     event: MetaMetricsEventName.SettingsUpdated,
     properties: (newValue) => ({
@@ -47,6 +48,7 @@ const AutodetectTokensToggleItem = createToggleItem({
   selector: getUseTokenDetection,
   action: setUseTokenDetection,
   dataTestId: 'autodetect-tokens',
+  containerDataTestId: 'autodetect-tokens',
 });
 
 /** Registry of setting items for the Assets page. Add new items here */
@@ -67,6 +69,8 @@ const ASSET_SETTING_ITEMS: SettingItemConfig[] = [
   { id: 'autodetect-tokens', component: AutodetectTokensToggleItem },
 ];
 
-const AssetsTab = () => <SettingsTab items={ASSET_SETTING_ITEMS} />;
+const AssetsTab = () => {
+  return <SettingsTab items={ASSET_SETTING_ITEMS} />;
+};
 
 export default AssetsTab;
diff --git a/ui/pages/settings-v2/assets-tab/currency-sub-page.tsx b/ui/pages/settings-v2/assets-tab/currency-sub-page.tsx
index 6dca818aec85..db6f45f35afc 100644
--- a/ui/pages/settings-v2/assets-tab/currency-sub-page.tsx
+++ b/ui/pages/settings-v2/assets-tab/currency-sub-page.tsx
@@ -13,7 +13,6 @@ import {
   IconColor,
   Text,
   TextVariant,
-  BoxBackgroundColor,
 } from '@metamask/design-system-react';
 import availableCurrencies from '../../../helpers/constants/available-conversions.json';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -55,7 +54,10 @@ const CurrencySubPage = () => {
   };
 
   return (
-    <Box>
+    <Box
+      data-testid="currency-select-list"
+      className="h-full min-h-0 overflow-y-auto"
+    >
       {currencyOptions.map(({ value, label }) => {
         const isSelected = value.toLowerCase() === currentCurrency;
         return (
@@ -64,12 +66,11 @@ const CurrencySubPage = () => {
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             alignItems={BoxAlignItems.Center}
-            backgroundColor={
+            className={`w-full cursor-pointer border-0 p-4 ${
               isSelected
-                ? BoxBackgroundColor.BackgroundMuted
-                : BoxBackgroundColor.BackgroundDefault
-            }
-            className="w-full cursor-pointer border-0 p-4"
+                ? 'bg-muted hover:bg-muted-hover'
+                : 'bg-background-default hover:bg-background-default-hover'
+            }`}
             onClick={() => handleSelect(value)}
           >
             <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
diff --git a/ui/pages/settings-v2/debug-tab/debug-tab.tsx b/ui/pages/settings-v2/debug-tab/debug-tab.tsx
new file mode 100644
index 000000000000..09b3f352a0f3
--- /dev/null
+++ b/ui/pages/settings-v2/debug-tab/debug-tab.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { SettingsTab } from '../shared';
+import { SettingItemConfig } from '../types';
+import DebugTabContent from '../../settings/developer-options-tab/developer-options-tab';
+
+const DEBUG_SETTING_ITEMS: SettingItemConfig[] = [
+  { id: 'debug', component: DebugTabContent },
+];
+
+const DebugTab = () => {
+  return <SettingsTab items={DEBUG_SETTING_ITEMS} />;
+};
+
+export default DebugTab;
diff --git a/ui/pages/settings-v2/debug-tab/index.ts b/ui/pages/settings-v2/debug-tab/index.ts
new file mode 100644
index 000000000000..6c3fa74cdf11
--- /dev/null
+++ b/ui/pages/settings-v2/debug-tab/index.ts
@@ -0,0 +1 @@
+export { default } from './debug-tab';
diff --git a/ui/pages/settings-v2/developer-options-tab/auto-reset-account-item.tsx b/ui/pages/settings-v2/developer-options-tab/auto-reset-account-item.tsx
deleted file mode 100644
index d648fa1300ce..000000000000
--- a/ui/pages/settings-v2/developer-options-tab/auto-reset-account-item.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { useContext } from 'react';
-import { useDispatch } from 'react-redux';
-import {
-  Box,
-  Button,
-  ButtonVariant,
-  Text,
-  TextColor,
-  TextVariant,
-  FontWeight,
-  BoxFlexDirection,
-} from '@metamask/design-system-react';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../shared/constants/metametrics';
-import { showModal } from '../../../store/actions';
-import { DEVELOPER_OPTIONS_ITEMS } from '../search-config';
-
-export const AutoResetAccountItem = () => {
-  const t = useI18nContext();
-  const dispatch = useDispatch();
-  const { trackEvent } = useContext(MetaMetricsContext);
-
-  const handleClearActivity = () => {
-    trackEvent({
-      category: MetaMetricsEventCategory.Settings,
-      event: MetaMetricsEventName.AccountReset,
-      properties: {},
-    });
-    dispatch(showModal({ name: 'CONFIRM_RESET_ACCOUNT' }));
-  };
-
-  return (
-    <Box
-      flexDirection={BoxFlexDirection.Column}
-      gap={1}
-      paddingVertical={3}
-      data-testid="developer-options-auto-reset-account"
-    >
-      <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-        {t(DEVELOPER_OPTIONS_ITEMS['auto-reset-account'])}
-      </Text>
-      <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
-        {t('clearActivityDescription')}
-      </Text>
-      <Box paddingTop={2}>
-        <Button
-          variant={ButtonVariant.Primary}
-          onClick={handleClearActivity}
-          data-testid="developer-options-auto-reset-account-button"
-        >
-          {t('clearActivityButton')}
-        </Button>
-      </Box>
-    </Box>
-  );
-};
diff --git a/ui/pages/settings-v2/developer-options-tab/index.ts b/ui/pages/settings-v2/developer-options-tab/index.ts
deleted file mode 100644
index c3014579a848..000000000000
--- a/ui/pages/settings-v2/developer-options-tab/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './developer-options-tab';
diff --git a/ui/pages/settings-v2/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap b/ui/pages/settings-v2/developer-tools-tab/__snapshots__/developer-tools-tab.test.tsx.snap
similarity index 68%
rename from ui/pages/settings-v2/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
rename to ui/pages/settings-v2/developer-tools-tab/__snapshots__/developer-tools-tab.test.tsx.snap
index 0f97a1b6cc15..132176521a77 100644
--- a/ui/pages/settings-v2/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
+++ b/ui/pages/settings-v2/developer-tools-tab/__snapshots__/developer-tools-tab.test.tsx.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DeveloperOptionsTab snapshot matches snapshot 1`] = `
+exports[`DeveloperToolsTab snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -73,36 +73,17 @@ exports[`DeveloperOptionsTab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div>
-      <div
-        class="flex flex-col gap-1 py-3"
-        data-testid="developer-options-auto-reset-account"
+      <button
+        class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-bg !bg-transparent px-4 py-0 text-left"
+        data-testid="developer-options-delete-activity-and-nonce-data"
+        role="button"
       >
-        <p
-          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-        >
-          Clear activity and nonce data
-        </p>
-        <p
-          class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default"
-        >
-          This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.
-        </p>
-        <div
-          class="pt-2"
+        <span
+          class="text-inherit text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
         >
-          <button
-            class="inline-flex items-center justify-center rounded-xl px-4 font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default text-primary-inverse hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default"
-            data-testid="developer-options-auto-reset-account-button"
-            role="button"
-          >
-            <span
-              class="text-inherit text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-            >
-              Clear activity tab data
-            </span>
-          </button>
-        </div>
-      </div>
+          Delete activity and nonce data
+        </span>
+      </button>
     </div>
   </div>
 </div>
diff --git a/ui/pages/settings-v2/developer-tools-tab/delete-activity-item.tsx b/ui/pages/settings-v2/developer-tools-tab/delete-activity-item.tsx
new file mode 100644
index 000000000000..30b8f68a393c
--- /dev/null
+++ b/ui/pages/settings-v2/developer-tools-tab/delete-activity-item.tsx
@@ -0,0 +1,40 @@
+import React, { useContext, useState } from 'react';
+import { Button } from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { DEVELOPER_TOOLS_ITEMS } from '../search-config';
+import DeleteActivityModal from './delete-activity-modal';
+
+export const DeleteActivityItem = () => {
+  const t = useI18nContext();
+  const { trackEvent } = useContext(MetaMetricsContext);
+  const [showDeleteModal, setShowDeleteModal] = useState(false);
+
+  const handleDeleteActivity = () => {
+    trackEvent({
+      category: MetaMetricsEventCategory.Settings,
+      event: MetaMetricsEventName.AccountReset,
+      properties: {},
+    });
+    setShowDeleteModal(true);
+  };
+
+  return (
+    <>
+      <Button
+        data-testid="developer-options-delete-activity-and-nonce-data"
+        onClick={handleDeleteActivity}
+        className="text-bg !bg-transparent px-4 py-0 text-left"
+      >
+        {t(DEVELOPER_TOOLS_ITEMS['delete-activity-and-nonce-data'])}
+      </Button>
+      {showDeleteModal && (
+        <DeleteActivityModal onClose={() => setShowDeleteModal(false)} />
+      )}
+    </>
+  );
+};
diff --git a/ui/pages/settings-v2/developer-tools-tab/delete-activity-modal.tsx b/ui/pages/settings-v2/developer-tools-tab/delete-activity-modal.tsx
new file mode 100644
index 000000000000..f6c2c9d354e0
--- /dev/null
+++ b/ui/pages/settings-v2/developer-tools-tab/delete-activity-modal.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+  BoxJustifyContent,
+  Button,
+  ButtonVariant,
+  Text,
+  TextVariant,
+  TextColor,
+  FontWeight,
+} from '@metamask/design-system-react';
+import {
+  Modal,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from '../../../components/component-library';
+import {
+  AlignItems,
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { resetAccount } from '../../../store/actions';
+
+type DeleteActivityModalProps = {
+  onClose: () => void;
+};
+
+export default function DeleteActivityModal({
+  onClose,
+}: Readonly<DeleteActivityModalProps>) {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+
+  const deleteActivityData = async () => {
+    await dispatch(resetAccount());
+    onClose();
+  };
+
+  return (
+    <Modal
+      isOpen
+      onClose={onClose}
+      data-testid="delete-activity-and-nonce-data-modal"
+    >
+      <ModalOverlay />
+      <ModalContent
+        alignItems={AlignItems.center}
+        modalDialogProps={{
+          display: Display.Flex,
+          flexDirection: FlexDirection.Column,
+        }}
+      >
+        <ModalHeader onClose={onClose}>
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+          >
+            <Text
+              variant={TextVariant.HeadingSm}
+              fontWeight={FontWeight.Medium}
+            >
+              {t('deleteActivityAndNonceData')}
+            </Text>
+          </Box>
+        </ModalHeader>
+        <Box
+          marginHorizontal={4}
+          marginBottom={3}
+          flexDirection={BoxFlexDirection.Column}
+          gap={4}
+        >
+          <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+            {t('clearActivityDescription')}
+          </Text>
+        </Box>
+        <ModalFooter>
+          <Box className="flex gap-4">
+            <Button
+              className="flex-1"
+              variant={ButtonVariant.Secondary}
+              onClick={onClose}
+            >
+              {t('cancel')}
+            </Button>
+            <Button
+              data-testid="delete-activity-and-nonce-data-button"
+              className="flex-1"
+              variant={ButtonVariant.Primary}
+              isDanger
+              onClick={deleteActivityData}
+            >
+              {t('delete')}
+            </Button>
+          </Box>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/pages/settings-v2/developer-options-tab/developer-options-tab.test.tsx b/ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.test.tsx
similarity index 86%
rename from ui/pages/settings-v2/developer-options-tab/developer-options-tab.test.tsx
rename to ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.test.tsx
index 7b6b7a06dc21..bf8aa7d1e11b 100644
--- a/ui/pages/settings-v2/developer-options-tab/developer-options-tab.test.tsx
+++ b/ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.test.tsx
@@ -4,14 +4,14 @@ import thunk from 'redux-thunk';
 import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
 import { setBackgroundConnection } from '../../../store/background-connection';
-import DeveloperOptionsTab from './developer-options-tab';
+import DeveloperToolsTab from './developer-tools-tab';
 
 const backgroundConnectionMock = new Proxy(
   {},
   { get: () => jest.fn().mockResolvedValue(undefined) },
 );
 
-describe('DeveloperOptionsTab', () => {
+describe('DeveloperToolsTab', () => {
   const mockStore = configureMockStore([thunk])(mockState);
 
   beforeEach(() => {
@@ -22,7 +22,7 @@ describe('DeveloperOptionsTab', () => {
   describe('snapshot', () => {
     it('matches snapshot', () => {
       const { container } = renderWithProvider(
-        <DeveloperOptionsTab />,
+        <DeveloperToolsTab />,
         mockStore,
       );
 
diff --git a/ui/pages/settings-v2/developer-options-tab/developer-options-tab.tsx b/ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.tsx
similarity index 77%
rename from ui/pages/settings-v2/developer-options-tab/developer-options-tab.tsx
rename to ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.tsx
index cb884cff510a..5c96b8d817f4 100644
--- a/ui/pages/settings-v2/developer-options-tab/developer-options-tab.tsx
+++ b/ui/pages/settings-v2/developer-tools-tab/developer-tools-tab.tsx
@@ -8,12 +8,12 @@ import {
 import { TESTNET_ETH_SCAMS_LEARN_MORE_LINK } from '../../../../shared/lib/ui-utils';
 import { getShowFiatInTestnets } from '../../../selectors';
 import { setShowFiatConversionOnTestnetsPreference } from '../../../store/actions';
-import { DEVELOPER_OPTIONS_ITEMS } from '../search-config';
-import { AutoResetAccountItem } from './auto-reset-account-item';
+import { DEVELOPER_TOOLS_ITEMS } from '../search-config';
+import { DeleteActivityItem } from './delete-activity-item';
 
 const ShowConversionInTestnetsItem = createToggleItem({
   name: 'ShowConversionInTestnetsItem',
-  titleKey: DEVELOPER_OPTIONS_ITEMS['show-fiat-in-testnets'],
+  titleKey: DEVELOPER_TOOLS_ITEMS['show-fiat-in-testnets'],
   formatDescription: createDescriptionWithLearnMore(
     'showFiatConversionInTestnetsDescriptionV2',
     TESTNET_ETH_SCAMS_LEARN_MORE_LINK,
@@ -26,11 +26,11 @@ const ShowConversionInTestnetsItem = createToggleItem({
 /** Registry of setting items for the Developer Options page. Add new items here */
 const DEVELOPER_OPTIONS_SETTING_ITEMS: SettingItemConfig[] = [
   { id: 'show-fiat-in-testnets', component: ShowConversionInTestnetsItem },
-  { id: 'auto-reset-account', component: AutoResetAccountItem },
+  { id: 'delete-activity-and-nonce-data', component: DeleteActivityItem },
 ];
 
-const DeveloperOptionsTab = () => (
+const DeveloperToolsTab = () => (
   <SettingsTab items={DEVELOPER_OPTIONS_SETTING_ITEMS} />
 );
 
-export default DeveloperOptionsTab;
+export default DeveloperToolsTab;
diff --git a/ui/pages/settings-v2/developer-tools-tab/index.ts b/ui/pages/settings-v2/developer-tools-tab/index.ts
new file mode 100644
index 000000000000..18c778a0034d
--- /dev/null
+++ b/ui/pages/settings-v2/developer-tools-tab/index.ts
@@ -0,0 +1 @@
+export { default } from './developer-tools-tab';
diff --git a/ui/pages/settings-v2/notifications-tab/index.ts b/ui/pages/settings-v2/notifications-tab/index.ts
new file mode 100644
index 000000000000..5b22fa449a1b
--- /dev/null
+++ b/ui/pages/settings-v2/notifications-tab/index.ts
@@ -0,0 +1 @@
+export { default } from './notifications-tab';
diff --git a/ui/pages/settings-v2/notifications-tab/notifications-tab.tsx b/ui/pages/settings-v2/notifications-tab/notifications-tab.tsx
new file mode 100644
index 000000000000..8ef8b5d382d4
--- /dev/null
+++ b/ui/pages/settings-v2/notifications-tab/notifications-tab.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import NotificationsSettingsContent from '../../notifications-settings/notifications-settings';
+import { SettingsTab } from '../shared';
+import { SettingItemConfig } from '../types';
+
+const NOTIFICATIONS_SETTING_ITEMS: SettingItemConfig[] = [
+  { id: 'notifications', component: NotificationsSettingsContent },
+];
+
+const NotificationsTab = () => {
+  return <SettingsTab items={NOTIFICATIONS_SETTING_ITEMS} />;
+};
+
+export default NotificationsTab;
diff --git a/ui/pages/settings-v2/preferences-and-display-tab/__snapshots__/preferences-and-display-tab.test.tsx.snap b/ui/pages/settings-v2/preferences-and-display-tab/__snapshots__/preferences-and-display-tab.test.tsx.snap
index 31251cc5aa35..079a8f3583e4 100644
--- a/ui/pages/settings-v2/preferences-and-display-tab/__snapshots__/preferences-and-display-tab.test.tsx.snap
+++ b/ui/pages/settings-v2/preferences-and-display-tab/__snapshots__/preferences-and-display-tab.test.tsx.snap
@@ -3,29 +3,29 @@
 exports[`PreferencesAndDisplayTab snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <div>
-      <div
-        class="flex flex-row items-center justify-between py-3"
+      <a
+        class="block hover:bg-background-default-hover"
+        href="/settings/preferences-and-display/theme"
       >
-        <p
-          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-        >
-          Theme
-        </p>
         <div
-          class="flex flex-row gap-1 items-center"
+          class="flex flex-row items-center justify-between px-4 py-3"
         >
           <p
-            class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+            class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
           >
-            System
+            Theme
           </p>
-          <a
-            class="flex ml-1"
-            href="/settings-v2/preferences-and-display/theme"
+          <div
+            class="flex flex-row gap-1 items-center"
           >
+            <p
+              class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+            >
+              System
+            </p>
             <svg
               class="inline-block w-4 h-4 text-icon-alternative"
               fill="currentColor"
@@ -36,25 +36,25 @@ exports[`PreferencesAndDisplayTab snapshot matches snapshot 1`] = `
                 d="m8.887 22-1.775-1.775L15.337 12 7.112 3.775 8.887 2l10 10z"
               />
             </svg>
-          </a>
+          </div>
         </div>
-      </div>
+      </a>
     </div>
     <div>
-      <div
-        class="flex flex-row items-center justify-between py-3"
+      <a
+        class="block hover:bg-background-default-hover"
+        href="/settings/preferences-and-display/language"
       >
-        <p
-          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-        >
-          Language
-        </p>
         <div
-          class="flex flex-row gap-1 items-center"
+          class="flex flex-row items-center justify-between px-4 py-3"
         >
-          <a
-            class="flex ml-1"
-            href="/settings-v2/preferences-and-display/language"
+          <p
+            class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+          >
+            Language
+          </p>
+          <div
+            class="flex flex-row gap-1 items-center"
           >
             <svg
               class="inline-block w-4 h-4 text-icon-alternative"
@@ -66,45 +66,45 @@ exports[`PreferencesAndDisplayTab snapshot matches snapshot 1`] = `
                 d="m8.887 22-1.775-1.775L15.337 12 7.112 3.775 8.887 2l10 10z"
               />
             </svg>
-          </a>
+          </div>
         </div>
-      </div>
+      </a>
     </div>
     <div>
-      <div
-        class="flex flex-row items-center justify-between py-3"
+      <a
+        class="block hover:bg-background-default-hover"
+        href="/settings/preferences-and-display/account-identicon"
       >
-        <p
-          class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-        >
-          Account icon
-        </p>
         <div
-          class="flex flex-row gap-1 items-center"
+          class="flex flex-row items-center justify-between px-4 py-3"
         >
+          <p
+            class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+          >
+            Account icon
+          </p>
           <div
-            class="flex flex-row gap-2 items-center"
+            class="flex flex-row gap-1 items-center"
           >
             <div
-              class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-md h-6 w-6"
+              class="flex flex-row gap-2 items-center"
             >
-              <img
-                alt="maskicon"
-                height="24"
-                src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E"
-                width="24"
-              />
+              <div
+                class="inline-flex shrink-0 items-center justify-center overflow-hidden bg-section rounded-md h-6 w-6"
+              >
+                <img
+                  alt="maskicon"
+                  height="24"
+                  src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E"
+                  width="24"
+                />
+              </div>
+              <p
+                class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+              >
+                Polycons
+              </p>
             </div>
-            <p
-              class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-            >
-              Polycons
-            </p>
-          </div>
-          <a
-            class="flex ml-1"
-            href="/settings-v2/preferences-and-display/account-identicon"
-          >
             <svg
               class="inline-block w-4 h-4 text-icon-alternative"
               fill="currentColor"
@@ -115,17 +115,17 @@ exports[`PreferencesAndDisplayTab snapshot matches snapshot 1`] = `
                 d="m8.887 22-1.775-1.775L15.337 12 7.112 3.775 8.887 2l10 10z"
               />
             </svg>
-          </a>
+          </div>
         </div>
-      </div>
+      </a>
     </div>
     <div />
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -179,7 +179,7 @@ exports[`PreferencesAndDisplayTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
diff --git a/ui/pages/settings-v2/preferences-and-display-tab/account-identicon-sub-page.tsx b/ui/pages/settings-v2/preferences-and-display-tab/account-identicon-sub-page.tsx
index 31901515d208..e5d2ff12d544 100644
--- a/ui/pages/settings-v2/preferences-and-display-tab/account-identicon-sub-page.tsx
+++ b/ui/pages/settings-v2/preferences-and-display-tab/account-identicon-sub-page.tsx
@@ -15,7 +15,6 @@ import {
   IconColor,
   Text,
   TextVariant,
-  BoxBackgroundColor,
   AvatarAccountSize,
 } from '@metamask/design-system-react';
 import { setAvatarType } from '../../../store/actions';
@@ -51,12 +50,11 @@ const AccountIdenticonSubPage = () => {
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             alignItems={BoxAlignItems.Center}
-            backgroundColor={
+            className={`w-full cursor-pointer border-0 p-4 ${
               isSelected
-                ? BoxBackgroundColor.BackgroundMuted
-                : BoxBackgroundColor.BackgroundDefault
-            }
-            className="w-full cursor-pointer border-0 p-4"
+                ? 'bg-muted hover:bg-muted-hover'
+                : 'bg-background-default hover:bg-background-default-hover'
+            }`}
             onClick={() => handleSelect(value)}
           >
             <Box
diff --git a/ui/pages/settings-v2/preferences-and-display-tab/language-sub-page.tsx b/ui/pages/settings-v2/preferences-and-display-tab/language-sub-page.tsx
index 8cce8bd630c5..61ea335a03d1 100644
--- a/ui/pages/settings-v2/preferences-and-display-tab/language-sub-page.tsx
+++ b/ui/pages/settings-v2/preferences-and-display-tab/language-sub-page.tsx
@@ -13,7 +13,6 @@ import {
   IconColor,
   Text,
   TextVariant,
-  BoxBackgroundColor,
 } from '@metamask/design-system-react';
 import { updateCurrentLocale } from '../../../store/actions';
 import { PREFERENCES_AND_DISPLAY_ROUTE } from '../../../helpers/constants/routes';
@@ -50,12 +49,11 @@ const LanguageSubPage = () => {
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             alignItems={BoxAlignItems.Center}
-            backgroundColor={
+            className={`w-full cursor-pointer border-0 p-4 ${
               isSelected
-                ? BoxBackgroundColor.BackgroundMuted
-                : BoxBackgroundColor.BackgroundDefault
-            }
-            className="w-full cursor-pointer border-0 p-4"
+                ? 'bg-muted hover:bg-muted-hover'
+                : 'bg-background-default hover:bg-background-default-hover'
+            }`}
             onClick={() => handleSelect(value)}
           >
             <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
diff --git a/ui/pages/settings-v2/preferences-and-display-tab/show-default-address-item.tsx b/ui/pages/settings-v2/preferences-and-display-tab/show-default-address-item.tsx
index e556f74971d6..a3b583dd63e3 100644
--- a/ui/pages/settings-v2/preferences-and-display-tab/show-default-address-item.tsx
+++ b/ui/pages/settings-v2/preferences-and-display-tab/show-default-address-item.tsx
@@ -89,6 +89,7 @@ export const ShowDefaultAddressItem = () => {
         selectedOption={defaultAddressScope}
         onChange={handleDropdownChange}
         data-testid="default-address-scope-dropdown"
+        className="mx-4"
       />
     </Box>
   );
diff --git a/ui/pages/settings-v2/preferences-and-display-tab/theme-sub-page.tsx b/ui/pages/settings-v2/preferences-and-display-tab/theme-sub-page.tsx
index 3d02ffd17ccd..160529cb1358 100644
--- a/ui/pages/settings-v2/preferences-and-display-tab/theme-sub-page.tsx
+++ b/ui/pages/settings-v2/preferences-and-display-tab/theme-sub-page.tsx
@@ -13,7 +13,6 @@ import {
   IconColor,
   Text,
   TextVariant,
-  BoxBackgroundColor,
 } from '@metamask/design-system-react';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { setTheme } from '../../../store/actions';
@@ -57,12 +56,11 @@ const ThemeSubPage = () => {
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             alignItems={BoxAlignItems.Center}
-            backgroundColor={
+            className={`w-full cursor-pointer border-0 p-4 ${
               isSelected
-                ? BoxBackgroundColor.BackgroundMuted
-                : BoxBackgroundColor.BackgroundDefault
-            }
-            className="w-full cursor-pointer border-0 p-4"
+                ? 'bg-muted hover:bg-muted-hover'
+                : 'bg-background-default hover:bg-background-default-hover'
+            }`}
             onClick={() => handleSelect(value)}
           >
             <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
diff --git a/ui/pages/settings-v2/privacy-tab/__snapshots__/privacy-tab.test.tsx.snap b/ui/pages/settings-v2/privacy-tab/__snapshots__/privacy-tab.test.tsx.snap
index f965750279c8..6e15a681a1b8 100644
--- a/ui/pages/settings-v2/privacy-tab/__snapshots__/privacy-tab.test.tsx.snap
+++ b/ui/pages/settings-v2/privacy-tab/__snapshots__/privacy-tab.test.tsx.snap
@@ -3,11 +3,11 @@
 exports[`PrivacyTab snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -59,7 +59,7 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
              
             Includes basic features like token details and gas settings. Keep this feature on for the best experience.  Read our 
             <a
-              class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed"
+              class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed"
               href="https://consensys.io/privacy-policy/"
               rel="noopener noreferrer"
               target="_blank"
@@ -73,20 +73,20 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div>
-      <div
-        class="flex flex-col gap-1 py-3"
+      <a
+        href="/settings/privacy/third-party-apis"
       >
         <div
-          class="flex flex-row items-center justify-between"
+          class="flex flex-col gap-1 px-4 py-3 rounded-none hover:bg-background-default-hover"
         >
-          <p
-            class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
-          >
-            Third-party APIs
-          </p>
-          <a
-            href="/settings-v2/privacy/third-party-apis"
+          <div
+            class="flex flex-row items-center justify-between"
           >
+            <p
+              class="text-default text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+            >
+              Third-party APIs
+            </p>
             <svg
               class="inline-block w-4 h-4 text-icon-alternative"
               fill="currentColor"
@@ -97,18 +97,18 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
                 d="m8.887 22-1.775-1.775L15.337 12 7.112 3.775 8.887 2l10 10z"
               />
             </svg>
-          </a>
+          </div>
+          <p
+            class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default"
+          >
+            Choose how you share your IP address or Ethereum address with third-party APIs. Changes will impact your MetaMask experience.
+          </p>
         </div>
-        <p
-          class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default"
-        >
-          Choose how you share your IP address or Ethereum address with third-party APIs. Changes will impact your MetaMask experience.
-        </p>
-      </div>
+      </a>
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -162,7 +162,7 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -215,11 +215,11 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -229,7 +229,9 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
           >
             Participate in MetaMetrics
           </p>
-          <div>
+          <div
+            data-testid="participate-in-meta-metrics-toggle"
+          >
             <label
               class="toggle-button toggle-button--off toggle-button--disabled"
               tabindex="0"
@@ -255,7 +257,7 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
                   />
                 </div>
                 <input
-                  data-testid="participate-in-meta-metrics-toggle"
+                  data-testid="participate-in-meta-metrics-input"
                   style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                   type="checkbox"
                   value="false"
@@ -273,7 +275,7 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -283,7 +285,9 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
           >
             Data collection for marketing
           </p>
-          <div>
+          <div
+            data-testid="data-collection-for-marketing-toggle"
+          >
             <label
               class="toggle-button toggle-button--off toggle-button--disabled"
               tabindex="0"
@@ -309,7 +313,7 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
                   />
                 </div>
                 <input
-                  data-testid="data-collection-for-marketing-toggle"
+                  data-testid="data-collection-for-marketing-input"
                   style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                   type="checkbox"
                   value="false"
@@ -327,8 +331,8 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <button
-        class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-error-default !bg-transparent p-0 text-left"
-        data-testid="delete-metametrics-button"
+        class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-error-default !bg-transparent p-0 text-left mx-4"
+        data-testid="delete-metametrics-data-button"
         disabled=""
         role="button"
       >
@@ -340,12 +344,12 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
       </button>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <button
-        class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-text-default !bg-transparent p-0 text-left"
-        data-testid="download-state-logs-button"
+        class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-text-default !bg-transparent p-0 text-left mx-4"
+        data-testid="advanced-setting-state-logs-button"
         role="button"
       >
         <span
@@ -355,6 +359,23 @@ exports[`PrivacyTab snapshot matches snapshot 1`] = `
         </span>
       </button>
     </div>
+    <div>
+      <div
+        class="mx-4 mt-2"
+      >
+        <button
+          class="inline-flex items-center justify-center rounded-xl font-medium min-w-20 overflow-hidden relative h-12 transition-all duration-100 ease-linear active:scale-[0.97] active:ease-[cubic-bezier(0.3,0.8,0.3,1)] bg-icon-default hover:bg-icon-default-hover active:bg-icon-default-pressed focus-visible:ring-0 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-default text-text-default !bg-transparent p-0 text-left"
+          data-testid="privacy-tab-export-your-data-button"
+          role="button"
+        >
+          <span
+            class="text-inherit text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-medium font-default"
+          >
+            Export your data
+          </span>
+        </button>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/ui/pages/settings-v2/privacy-tab/__snapshots__/third-party-apis-sub-page.test.tsx.snap b/ui/pages/settings-v2/privacy-tab/__snapshots__/third-party-apis-sub-page.test.tsx.snap
index e89a9acc6058..6fa4654dd5a2 100644
--- a/ui/pages/settings-v2/privacy-tab/__snapshots__/third-party-apis-sub-page.test.tsx.snap
+++ b/ui/pages/settings-v2/privacy-tab/__snapshots__/third-party-apis-sub-page.test.tsx.snap
@@ -3,16 +3,16 @@
 exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <p
-      class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default py-2"
+      class="text-alternative text-s-body-md leading-s-body-md tracking-s-body-md md:text-l-body-md md:leading-l-body-md md:tracking-l-body-md font-regular font-default py-2 px-4"
     >
       Choose how you share your IP address or Ethereum address with third-party APIs. Changes will impact your MetaMask experience.
     </p>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -22,7 +22,9 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
           >
             Network details check
           </p>
-          <div>
+          <div
+            data-testid="useSafeChainsListValidation"
+          >
             <label
               class="toggle-button toggle-button--off"
               tabindex="0"
@@ -74,7 +76,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -84,7 +86,9 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
           >
             Show ENS domains in address bar
           </p>
-          <div>
+          <div
+            data-testid="ipfs-gateway-resolution-container"
+          >
             <label
               class="toggle-button toggle-button--off"
               tabindex="0"
@@ -139,7 +143,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -196,7 +200,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
         class="mb-4"
       >
         <div
-          class="flex flex-col gap-1 py-3"
+          class="flex flex-col gap-1 px-4 py-3"
         >
           <div
             class="flex flex-row items-center justify-between"
@@ -206,7 +210,9 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
             >
               IPFS gateway
             </p>
-            <div>
+            <div
+              data-testid="ipfsToggle"
+            >
               <label
                 class="toggle-button toggle-button--on"
                 tabindex="0"
@@ -248,7 +254,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
           </p>
         </div>
         <div
-          class="flex flex-col gap-1"
+          class="flex flex-col gap-1 mx-4"
         >
           <div
             class="mm-box mm-form-text-field mm-box--display-flex mm-box--flex-direction-column"
@@ -270,11 +276,11 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -328,7 +334,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -338,7 +344,9 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
           >
             Autodetect NFTs
           </p>
-          <div>
+          <div
+            data-testid="use-nft-detection"
+          >
             <label
               class="toggle-button toggle-button--on"
               tabindex="0"
@@ -364,7 +372,7 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
                   />
                 </div>
                 <input
-                  data-testid="use-nft-detection"
+                  data-testid="use-nft-detection-input"
                   style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
                   type="checkbox"
                   value="true"
@@ -381,11 +389,11 @@ exports[`ThirdPartyApisSubPage snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
diff --git a/ui/pages/settings-v2/privacy-tab/data-collection-item.test.tsx b/ui/pages/settings-v2/privacy-tab/data-collection-item.test.tsx
index 0f880524e91c..70b6b6772143 100644
--- a/ui/pages/settings-v2/privacy-tab/data-collection-item.test.tsx
+++ b/ui/pages/settings-v2/privacy-tab/data-collection-item.test.tsx
@@ -1,14 +1,26 @@
-import { fireEvent, screen } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import mockState from '../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { getIsSocialLoginFlow } from '../../../selectors/first-time-flow';
 import { setBackgroundConnection } from '../../../store/background-connection';
 import { DataCollectionToggleItem } from './data-collection-item';
 
 const mockSetDataCollectionForMarketing = jest.fn();
+const mockGetMarketingConsent = jest.fn().mockResolvedValue(true);
+
+jest.mock('../../../selectors/first-time-flow', () => {
+  const actual = jest.requireActual<
+    typeof import('../../../selectors/first-time-flow')
+  >('../../../selectors/first-time-flow');
+  return {
+    ...actual,
+    getIsSocialLoginFlow: jest.fn().mockReturnValue(false),
+  };
+});
 
 jest.mock('../../../store/actions', () => ({
   ...jest.requireActual('../../../store/actions'),
@@ -17,6 +29,7 @@ jest.mock('../../../store/actions', () => ({
     return { type: 'MOCK_ACTION' };
   },
   setMarketingConsent: jest.fn().mockResolvedValue(undefined),
+  getMarketingConsent: () => mockGetMarketingConsent(),
 }));
 
 const backgroundConnectionMock = new Proxy(
@@ -40,6 +53,7 @@ describe('DataCollectionToggleItem', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     setBackgroundConnection(backgroundConnectionMock as never);
+    (getIsSocialLoginFlow as jest.Mock).mockReturnValue(false);
   });
 
   it('renders title', () => {
@@ -65,7 +79,7 @@ describe('DataCollectionToggleItem', () => {
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
     expect(
-      screen.getByTestId('data-collection-for-marketing-toggle'),
+      screen.getByTestId('data-collection-for-marketing-input'),
     ).toHaveAttribute('value', 'true');
   });
 
@@ -74,7 +88,7 @@ describe('DataCollectionToggleItem', () => {
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
     expect(
-      screen.getByTestId('data-collection-for-marketing-toggle'),
+      screen.getByTestId('data-collection-for-marketing-input'),
     ).toHaveAttribute('value', 'false');
   });
 
@@ -82,7 +96,7 @@ describe('DataCollectionToggleItem', () => {
     const mockStore = createMockStore({ dataCollectionForMarketing: false });
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('data-collection-for-marketing-toggle'));
+    fireEvent.click(screen.getByTestId('data-collection-for-marketing-input'));
 
     expect(mockSetDataCollectionForMarketing).toHaveBeenCalledWith(true);
   });
@@ -91,7 +105,7 @@ describe('DataCollectionToggleItem', () => {
     const mockStore = createMockStore({ dataCollectionForMarketing: true });
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('data-collection-for-marketing-toggle'));
+    fireEvent.click(screen.getByTestId('data-collection-for-marketing-input'));
 
     expect(mockSetDataCollectionForMarketing).toHaveBeenCalledWith(false);
   });
@@ -100,7 +114,7 @@ describe('DataCollectionToggleItem', () => {
     const mockStore = createMockStore({ useExternalServices: false });
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
-    const toggle = screen.getByTestId('data-collection-for-marketing-toggle');
+    const toggle = screen.getByRole('checkbox');
     expect(toggle.closest('.toggle-button--disabled')).toBeInTheDocument();
   });
 
@@ -108,7 +122,18 @@ describe('DataCollectionToggleItem', () => {
     const mockStore = createMockStore({ participateInMetaMetrics: false });
     renderWithProvider(<DataCollectionToggleItem />, mockStore);
 
-    const toggle = screen.getByTestId('data-collection-for-marketing-toggle');
+    const toggle = screen.getByRole('checkbox');
     expect(toggle.closest('.toggle-button--disabled')).toBeInTheDocument();
   });
+
+  it('fetches remote marketing consent on mount when social login flow is active', async () => {
+    (getIsSocialLoginFlow as jest.Mock).mockReturnValue(true);
+    const mockStore = createMockStore();
+    renderWithProvider(<DataCollectionToggleItem />, mockStore);
+
+    await waitFor(() => {
+      expect(mockGetMarketingConsent).toHaveBeenCalled();
+    });
+    expect(mockSetDataCollectionForMarketing).toHaveBeenCalledWith(true);
+  });
 });
diff --git a/ui/pages/settings-v2/privacy-tab/data-collection-item.tsx b/ui/pages/settings-v2/privacy-tab/data-collection-item.tsx
index d2b34423eb49..6c51952a91c1 100644
--- a/ui/pages/settings-v2/privacy-tab/data-collection-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/data-collection-item.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
@@ -10,6 +10,7 @@ import {
   getIsSocialLoginFlow,
 } from '../../../selectors';
 import {
+  getMarketingConsent,
   setDataCollectionForMarketing,
   setMarketingConsent,
 } from '../../../store/actions';
@@ -19,6 +20,7 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../shared/constants/metametrics';
 
 export const DataCollectionToggleItem = () => {
@@ -31,6 +33,25 @@ export const DataCollectionToggleItem = () => {
   const socialLoginEnabled = useSelector(getIsSocialLoginFlow);
   const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
+  // Match legacy Security tab: fetch remote marketing consent when the user is in
+  // a social login flow (firstTimeFlowType stays set after seedless import completes).
+  useEffect(() => {
+    if (!socialLoginEnabled) {
+      return;
+    }
+    let cancelled = false;
+    const fetchConsent = async () => {
+      const marketingConsentFromRemote = await getMarketingConsent();
+      if (!cancelled) {
+        dispatch(setDataCollectionForMarketing(marketingConsentFromRemote));
+      }
+    };
+    fetchConsent();
+    return () => {
+      cancelled = true;
+    };
+  }, [socialLoginEnabled, dispatch]);
+
   const isDisabled = !useExternalServices || !participateInMetaMetrics;
 
   const handleToggle = (currentValue: boolean) => {
@@ -47,8 +68,8 @@ export const DataCollectionToggleItem = () => {
       event: MetaMetricsEventName.AnalyticsPreferenceSelected,
       properties: {
         /* eslint-disable @typescript-eslint/naming-convention */
-        is_metrics_opted_in: true,
-        has_marketing_consent: Boolean(newValue),
+        [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+        [MetaMetricsUserTrait.HasMarketingConsent]: Boolean(newValue),
         /* eslint-enable @typescript-eslint/naming-convention */
         location: 'Settings',
       },
@@ -65,7 +86,8 @@ export const DataCollectionToggleItem = () => {
       description={description}
       value={dataCollectionForMarketing}
       onToggle={handleToggle}
-      dataTestId="data-collection-for-marketing-toggle"
+      dataTestId="data-collection-for-marketing-input"
+      containerDataTestId="data-collection-for-marketing-toggle"
       disabled={isDisabled}
     />
   );
diff --git a/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.test.tsx b/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.test.tsx
index 0c2be71fcb87..22391f86935b 100644
--- a/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.test.tsx
+++ b/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.test.tsx
@@ -51,7 +51,9 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    expect(screen.getByTestId('delete-metametrics-button')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('delete-metametrics-data-button'),
+    ).toBeInTheDocument();
   });
 
   it('button is disabled when metametrics is not enabled', () => {
@@ -68,7 +70,7 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    expect(screen.getByTestId('delete-metametrics-button')).toBeDisabled();
+    expect(screen.getByTestId('delete-metametrics-data-button')).toBeDisabled();
   });
 
   it('button is disabled when metaMetricsId is null', () => {
@@ -85,21 +87,21 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    expect(screen.getByTestId('delete-metametrics-button')).toBeDisabled();
+    expect(screen.getByTestId('delete-metametrics-data-button')).toBeDisabled();
   });
 
   it('button is enabled when metametrics is enabled and has ID', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    expect(screen.getByTestId('delete-metametrics-button')).toBeEnabled();
+    expect(screen.getByTestId('delete-metametrics-data-button')).toBeEnabled();
   });
 
   it('opens delete modal when button is clicked', async () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    fireEvent.click(screen.getByTestId('delete-metametrics-button'));
+    fireEvent.click(screen.getByTestId('delete-metametrics-data-button'));
 
     await waitFor(() => {
       expect(
@@ -132,7 +134,7 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    fireEvent.click(screen.getByTestId('delete-metametrics-button'));
+    fireEvent.click(screen.getByTestId('delete-metametrics-data-button'));
 
     await waitFor(() => {
       expect(
@@ -165,7 +167,7 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    fireEvent.click(screen.getByTestId('delete-metametrics-button'));
+    fireEvent.click(screen.getByTestId('delete-metametrics-data-button'));
 
     await waitFor(() => {
       expect(
@@ -198,7 +200,7 @@ describe('DeleteMetametricsDataItem', () => {
     const store = configureStore({});
     renderWithProvider(<DeleteMetametricsDataItem />, store);
 
-    fireEvent.click(screen.getByTestId('delete-metametrics-button'));
+    fireEvent.click(screen.getByTestId('delete-metametrics-data-button'));
 
     await waitFor(() => {
       expect(
diff --git a/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.tsx b/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.tsx
index 64b3de452773..141db30259d2 100644
--- a/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/delete-metametrics-data-item.tsx
@@ -59,14 +59,14 @@ export const DeleteMetametricsDataItem = () => {
   return (
     <>
       <Button
-        data-testid="delete-metametrics-button"
+        data-testid="delete-metametrics-data-button"
         onClick={() =>
           isDataDeletionInProgress
             ? setShowDeletionInProgressModal(true)
             : setShowDeleteModal(true)
         }
         disabled={!isMetaMetricsEnabled}
-        className="text-error-default !bg-transparent p-0 text-left"
+        className="text-error-default !bg-transparent p-0 text-left mx-4"
       >
         {t(PRIVACY_ITEMS['delete-metametrics-data'])}
       </Button>
diff --git a/ui/pages/settings-v2/privacy-tab/download-state-logs-item.test.tsx b/ui/pages/settings-v2/privacy-tab/download-state-logs-item.test.tsx
index 9f431d0eac83..5d195ddf6c10 100644
--- a/ui/pages/settings-v2/privacy-tab/download-state-logs-item.test.tsx
+++ b/ui/pages/settings-v2/privacy-tab/download-state-logs-item.test.tsx
@@ -40,7 +40,7 @@ describe('DownloadStateLogsItem', () => {
     renderWithProvider(<DownloadStateLogsItem />, mockStore);
 
     expect(
-      screen.getByTestId('download-state-logs-button'),
+      screen.getByTestId('advanced-setting-state-logs-button'),
     ).toBeInTheDocument();
     expect(
       screen.getByText(messages.downloadStateLogs.message),
@@ -50,7 +50,7 @@ describe('DownloadStateLogsItem', () => {
   it('opens modal when button is clicked', async () => {
     renderWithProvider(<DownloadStateLogsItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('download-state-logs-button'));
+    fireEvent.click(screen.getByTestId('advanced-setting-state-logs-button'));
 
     await waitFor(() => {
       expect(
@@ -65,7 +65,7 @@ describe('DownloadStateLogsItem', () => {
 
     renderWithProvider(<DownloadStateLogsItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('download-state-logs-button'));
+    fireEvent.click(screen.getByTestId('advanced-setting-state-logs-button'));
 
     await waitFor(() => {
       expect(screen.getByText(messages.download.message)).toBeInTheDocument();
@@ -90,7 +90,7 @@ describe('DownloadStateLogsItem', () => {
 
     renderWithProvider(<DownloadStateLogsItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('download-state-logs-button'));
+    fireEvent.click(screen.getByTestId('advanced-setting-state-logs-button'));
 
     await waitFor(() => {
       expect(screen.getByText(messages.download.message)).toBeInTheDocument();
@@ -116,7 +116,7 @@ describe('DownloadStateLogsItem', () => {
 
     renderWithProvider(<DownloadStateLogsItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('download-state-logs-button'));
+    fireEvent.click(screen.getByTestId('advanced-setting-state-logs-button'));
 
     await waitFor(() => {
       expect(screen.getByText(messages.download.message)).toBeInTheDocument();
diff --git a/ui/pages/settings-v2/privacy-tab/download-state-logs-item.tsx b/ui/pages/settings-v2/privacy-tab/download-state-logs-item.tsx
index 0d36a581ccf9..b920bfeb7e69 100644
--- a/ui/pages/settings-v2/privacy-tab/download-state-logs-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/download-state-logs-item.tsx
@@ -19,9 +19,9 @@ export const DownloadStateLogsItem = () => {
   return (
     <>
       <Button
-        data-testid="download-state-logs-button"
+        data-testid="advanced-setting-state-logs-button"
         onClick={() => setShowModal(true)}
-        className="text-text-default !bg-transparent p-0 text-left"
+        className="text-text-default !bg-transparent p-0 text-left mx-4"
       >
         {t(PRIVACY_ITEMS['download-state-logs'])}
       </Button>
diff --git a/ui/pages/settings-v2/privacy-tab/download-state-logs-modal.tsx b/ui/pages/settings-v2/privacy-tab/download-state-logs-modal.tsx
index 5c8b43d673da..0251015bb7dc 100644
--- a/ui/pages/settings-v2/privacy-tab/download-state-logs-modal.tsx
+++ b/ui/pages/settings-v2/privacy-tab/download-state-logs-modal.tsx
@@ -56,7 +56,7 @@ export default function DownloadStateLogsModal({
   };
 
   return (
-    <Modal isOpen onClose={onClose}>
+    <Modal isOpen onClose={onClose} data-testid="download-state-logs-modal">
       <ModalOverlay />
       <ModalContent
         alignItems={AlignItems.center}
diff --git a/ui/pages/settings-v2/privacy-tab/export-your-data-item.test.tsx b/ui/pages/settings-v2/privacy-tab/export-your-data-item.test.tsx
new file mode 100644
index 000000000000..ec7ff841ac85
--- /dev/null
+++ b/ui/pages/settings-v2/privacy-tab/export-your-data-item.test.tsx
@@ -0,0 +1,192 @@
+import { fireEvent, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import mockState from '../../../../test/data/mock-state.json';
+import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
+import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { captureException } from '../../../../shared/lib/sentry';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import * as exportUtils from '../../../helpers/utils/export-utils';
+import { backupUserData } from '../../../store/actions';
+import { ExportYourDataItem } from './export-your-data-item';
+
+jest.mock('../../../helpers/utils/export-utils', () => ({
+  ...jest.requireActual('../../../helpers/utils/export-utils'),
+  exportAsFile: jest.fn(),
+}));
+
+jest.mock('../../../store/actions', () => ({
+  ...jest.requireActual('../../../store/actions'),
+  backupUserData: jest.fn(),
+}));
+
+jest.mock('../../../../shared/lib/sentry', () => ({
+  ...jest.requireActual('../../../../shared/lib/sentry'),
+  captureException: jest.fn(),
+}));
+
+const mockExportAsFile = exportUtils.exportAsFile as jest.Mock;
+const mockBackupUserData = backupUserData as jest.MockedFunction<
+  typeof backupUserData
+>;
+const mockCaptureException = captureException as jest.MockedFunction<
+  typeof captureException
+>;
+
+const metricsProvider = (children: React.ReactNode) => (
+  <MetaMetricsContext.Provider
+    value={{
+      trackEvent: jest.fn().mockResolvedValue(undefined),
+      bufferedTrace: jest.fn(),
+      bufferedEndTrace: jest.fn(),
+      onboardingParentContext: { current: null },
+    }}
+  >
+    {children}
+  </MetaMetricsContext.Provider>
+);
+
+describe('ExportYourDataItem', () => {
+  const mockStore = configureMockStore([thunk])(mockState);
+  const trackEvent = jest.fn().mockResolvedValue(undefined);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the button with correct text', () => {
+    renderWithProvider(<ExportYourDataItem />, mockStore);
+
+    expect(
+      screen.getByTestId('privacy-tab-export-your-data-button'),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(messages.exportYourData.message),
+    ).toBeInTheDocument();
+  });
+
+  it('opens the export modal when the row is clicked', () => {
+    renderWithProvider(metricsProvider(<ExportYourDataItem />), mockStore);
+
+    fireEvent.click(screen.getByTestId('privacy-tab-export-your-data-button'));
+
+    expect(
+      screen.getByText(messages.exportYourDataDescription.message),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId('export-your-data-modal-download-button'),
+    ).toBeInTheDocument();
+  });
+
+  it('backs up and exports the user data when Download is clicked in the modal', async () => {
+    mockBackupUserData.mockResolvedValue({
+      fileName: 'MetaMaskUserData.json',
+      data: '{"accounts":[]}',
+    } as never);
+    mockExportAsFile.mockResolvedValue(undefined);
+
+    renderWithProvider(
+      <MetaMetricsContext.Provider
+        value={{
+          trackEvent,
+          bufferedTrace: jest.fn(),
+          bufferedEndTrace: jest.fn(),
+          onboardingParentContext: { current: null },
+        }}
+      >
+        <ExportYourDataItem />
+      </MetaMetricsContext.Provider>,
+      mockStore,
+    );
+
+    fireEvent.click(screen.getByTestId('privacy-tab-export-your-data-button'));
+    fireEvent.click(
+      screen.getByTestId('export-your-data-modal-download-button'),
+    );
+
+    await waitFor(() => {
+      expect(mockBackupUserData).toHaveBeenCalled();
+    });
+
+    expect(mockExportAsFile).toHaveBeenCalledWith(
+      'MetaMaskUserData.json',
+      '{"accounts":[]}',
+      exportUtils.ExportableContentType.JSON,
+    );
+    expect(trackEvent).toHaveBeenCalledWith({
+      event: 'User Data Exported',
+      category: 'Backup',
+      properties: {},
+    });
+  });
+
+  it('supports filename responses from the typed action', async () => {
+    mockBackupUserData.mockResolvedValue({
+      filename: 'MetaMaskUserData.typed.json',
+      data: '{"accounts":[]}',
+    });
+    mockExportAsFile.mockResolvedValue(undefined);
+
+    renderWithProvider(
+      <MetaMetricsContext.Provider
+        value={{
+          trackEvent,
+          bufferedTrace: jest.fn(),
+          bufferedEndTrace: jest.fn(),
+          onboardingParentContext: { current: null },
+        }}
+      >
+        <ExportYourDataItem />
+      </MetaMetricsContext.Provider>,
+      mockStore,
+    );
+
+    fireEvent.click(screen.getByTestId('privacy-tab-export-your-data-button'));
+    fireEvent.click(
+      screen.getByTestId('export-your-data-modal-download-button'),
+    );
+
+    await waitFor(() => {
+      expect(mockExportAsFile).toHaveBeenCalledWith(
+        'MetaMaskUserData.typed.json',
+        '{"accounts":[]}',
+        exportUtils.ExportableContentType.JSON,
+      );
+    });
+  });
+
+  it('closes the modal and captures the error when backup fails', async () => {
+    mockBackupUserData.mockRejectedValue(new Error('backup failed'));
+
+    renderWithProvider(
+      <MetaMetricsContext.Provider
+        value={{
+          trackEvent,
+          bufferedTrace: jest.fn(),
+          bufferedEndTrace: jest.fn(),
+          onboardingParentContext: { current: null },
+        }}
+      >
+        <ExportYourDataItem />
+      </MetaMetricsContext.Provider>,
+      mockStore,
+    );
+
+    fireEvent.click(screen.getByTestId('privacy-tab-export-your-data-button'));
+    fireEvent.click(
+      screen.getByTestId('export-your-data-modal-download-button'),
+    );
+
+    await waitFor(() => {
+      expect(mockCaptureException).toHaveBeenCalledWith(
+        expect.objectContaining({ message: 'backup failed' }),
+      );
+    });
+
+    expect(
+      screen.queryByTestId('export-your-data-modal-download-button'),
+    ).not.toBeInTheDocument();
+    expect(trackEvent).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/pages/settings-v2/privacy-tab/export-your-data-item.tsx b/ui/pages/settings-v2/privacy-tab/export-your-data-item.tsx
new file mode 100644
index 000000000000..03376cf153d9
--- /dev/null
+++ b/ui/pages/settings-v2/privacy-tab/export-your-data-item.tsx
@@ -0,0 +1,25 @@
+import React, { useState } from 'react';
+import { Box, Button } from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { PRIVACY_ITEMS } from '../search-config';
+import ExportYourDataModal from './export-your-data-modal';
+
+export const ExportYourDataItem = () => {
+  const t = useI18nContext();
+  const [showModal, setShowModal] = useState(false);
+
+  return (
+    <>
+      <Box className="mt-2" marginHorizontal={4}>
+        <Button
+          data-testid="privacy-tab-export-your-data-button"
+          onClick={() => setShowModal(true)}
+          className="text-text-default !bg-transparent p-0 text-left"
+        >
+          {t(PRIVACY_ITEMS['export-your-data'])}
+        </Button>
+      </Box>
+      {showModal && <ExportYourDataModal onClose={() => setShowModal(false)} />}
+    </>
+  );
+};
diff --git a/ui/pages/settings-v2/privacy-tab/export-your-data-modal.tsx b/ui/pages/settings-v2/privacy-tab/export-your-data-modal.tsx
new file mode 100644
index 000000000000..d501ee945812
--- /dev/null
+++ b/ui/pages/settings-v2/privacy-tab/export-your-data-modal.tsx
@@ -0,0 +1,109 @@
+import React, { useContext } from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  BoxJustifyContent,
+  Button,
+  ButtonVariant,
+  Text,
+  TextVariant,
+  TextColor,
+} from '@metamask/design-system-react';
+import {
+  Modal,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from '../../../components/component-library';
+import {
+  AlignItems,
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  exportAsFile,
+  ExportableContentType,
+} from '../../../helpers/utils/export-utils';
+import { captureException } from '../../../../shared/lib/sentry';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { backupUserData } from '../../../store/actions';
+
+type BackupUserDataResponse = {
+  data: string;
+  fileName?: string;
+  filename?: string;
+};
+
+type ExportYourDataModalProps = {
+  onClose: () => void;
+};
+
+export default function ExportYourDataModal({
+  onClose,
+}: Readonly<ExportYourDataModalProps>) {
+  const t = useI18nContext();
+  const { trackEvent } = useContext(MetaMetricsContext);
+
+  const handleDownload = async () => {
+    try {
+      const { data, fileName, filename } =
+        (await backupUserData()) as BackupUserDataResponse;
+
+      await exportAsFile(
+        fileName ?? filename ?? 'MetaMaskUserData.json',
+        data,
+        ExportableContentType.JSON,
+      );
+
+      await trackEvent({
+        event: 'User Data Exported',
+        category: 'Backup',
+        properties: {},
+      });
+    } catch (error) {
+      captureException(error);
+    }
+    onClose();
+  };
+
+  return (
+    <Modal isOpen onClose={onClose}>
+      <ModalOverlay />
+      <ModalContent
+        alignItems={AlignItems.center}
+        modalDialogProps={{
+          display: Display.Flex,
+          flexDirection: FlexDirection.Column,
+        }}
+      >
+        <ModalHeader onClose={onClose}>
+          <Box
+            flexDirection={BoxFlexDirection.Column}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Center}
+          >
+            <Text variant={TextVariant.HeadingSm}>{t('exportYourData')}</Text>
+          </Box>
+        </ModalHeader>
+        <Box marginHorizontal={4} marginBottom={3}>
+          <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+            {t('exportYourDataDescription')}
+          </Text>
+        </Box>
+        <ModalFooter>
+          <Button
+            data-testid="export-your-data-modal-download-button"
+            className="w-full"
+            variant={ButtonVariant.Primary}
+            onClick={handleDownload}
+          >
+            {t('exportYourDataButton')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/ui/pages/settings-v2/privacy-tab/ipfs-gateway-item.tsx b/ui/pages/settings-v2/privacy-tab/ipfs-gateway-item.tsx
index f991ce686bb7..5228c121c83a 100644
--- a/ui/pages/settings-v2/privacy-tab/ipfs-gateway-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/ipfs-gateway-item.tsx
@@ -77,9 +77,14 @@ export const IpfsGatewayItem = () => {
         value={ipfsToggle}
         onToggle={handleToggle}
         dataTestId="ipfs-gateway-toggle"
+        containerDataTestId="ipfsToggle"
       />
       {ipfsToggle && (
-        <Box flexDirection={BoxFlexDirection.Column} gap={1}>
+        <Box
+          flexDirection={BoxFlexDirection.Column}
+          gap={1}
+          marginHorizontal={4}
+        >
           <FormTextField
             value={ipfsGatewayValue}
             onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
diff --git a/ui/pages/settings-v2/privacy-tab/metametrics-item.test.tsx b/ui/pages/settings-v2/privacy-tab/metametrics-item.test.tsx
index 54a7a296644b..e4845449dece 100644
--- a/ui/pages/settings-v2/privacy-tab/metametrics-item.test.tsx
+++ b/ui/pages/settings-v2/privacy-tab/metametrics-item.test.tsx
@@ -77,7 +77,7 @@ describe('MetametricsToggleItem', () => {
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
     expect(
-      screen.getByTestId('participate-in-meta-metrics-toggle'),
+      screen.getByTestId('participate-in-meta-metrics-input'),
     ).toHaveAttribute('value', 'true');
   });
 
@@ -86,7 +86,7 @@ describe('MetametricsToggleItem', () => {
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
     expect(
-      screen.getByTestId('participate-in-meta-metrics-toggle'),
+      screen.getByTestId('participate-in-meta-metrics-input'),
     ).toHaveAttribute('value', 'false');
   });
 
@@ -94,7 +94,7 @@ describe('MetametricsToggleItem', () => {
     const mockStore = createMockStore({ participateInMetaMetrics: false });
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-toggle'));
+    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-input'));
 
     await waitFor(() => {
       expect(mockEnableMetametrics).toHaveBeenCalled();
@@ -105,7 +105,7 @@ describe('MetametricsToggleItem', () => {
     const mockStore = createMockStore({ participateInMetaMetrics: true });
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-toggle'));
+    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-input'));
 
     await waitFor(() => {
       expect(mockDisableMetametrics).toHaveBeenCalled();
@@ -119,7 +119,7 @@ describe('MetametricsToggleItem', () => {
     });
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
-    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-toggle'));
+    fireEvent.click(screen.getByTestId('participate-in-meta-metrics-input'));
 
     await waitFor(() => {
       expect(mockSetDataCollectionForMarketing).toHaveBeenCalledWith(false);
@@ -130,7 +130,7 @@ describe('MetametricsToggleItem', () => {
     const mockStore = createMockStore({ useExternalServices: false });
     renderWithProvider(<MetametricsToggleItem />, mockStore);
 
-    const toggle = screen.getByTestId('participate-in-meta-metrics-toggle');
+    const toggle = screen.getByTestId('participate-in-meta-metrics-input');
     expect(toggle.closest('.toggle-button--disabled')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/settings-v2/privacy-tab/metametrics-item.tsx b/ui/pages/settings-v2/privacy-tab/metametrics-item.tsx
index 1898ddb6d6cc..7d266799ebc6 100644
--- a/ui/pages/settings-v2/privacy-tab/metametrics-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/metametrics-item.tsx
@@ -21,6 +21,7 @@ import {
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../shared/constants/metametrics';
 import { SettingsToggleItem } from '../../settings/settings-toggle-item';
 import { PRIVACY_ITEMS } from '../search-config';
@@ -79,8 +80,8 @@ export const MetametricsToggleItem = () => {
         event: MetaMetricsEventName.AnalyticsPreferenceSelected,
         properties: {
           /* eslint-disable @typescript-eslint/naming-convention */
-          is_metrics_opted_in: false,
-          has_marketing_consent: false,
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: false,
+          [MetaMetricsUserTrait.HasMarketingConsent]: false,
           /* eslint-enable @typescript-eslint/naming-convention */
           location: 'Settings',
         },
@@ -95,7 +96,8 @@ export const MetametricsToggleItem = () => {
         description={t('participateInMetaMetricsDescription')}
         value={participateInMetaMetrics}
         onToggle={handleToggle}
-        dataTestId="participate-in-meta-metrics-toggle"
+        dataTestId="participate-in-meta-metrics-input"
+        containerDataTestId="participate-in-meta-metrics-toggle"
         disabled={!useExternalServices}
       />
       {error && (
diff --git a/ui/pages/settings-v2/privacy-tab/privacy-tab.tsx b/ui/pages/settings-v2/privacy-tab/privacy-tab.tsx
index 44dff967f971..53e286bbfb5d 100644
--- a/ui/pages/settings-v2/privacy-tab/privacy-tab.tsx
+++ b/ui/pages/settings-v2/privacy-tab/privacy-tab.tsx
@@ -14,6 +14,7 @@ import { MetametricsToggleItem } from './metametrics-item';
 import { DataCollectionToggleItem } from './data-collection-item';
 import { DeleteMetametricsDataItem } from './delete-metametrics-data-item';
 import { DownloadStateLogsItem } from './download-state-logs-item';
+import { ExportYourDataItem } from './export-your-data-item';
 
 const BatchAccountBalanceRequestsToggleItem = createToggleItem({
   name: 'BatchAccountBalanceRequestsToggleItem',
@@ -56,6 +57,10 @@ const PRIVACY_SETTING_ITEMS: SettingItemConfig[] = [
     component: DownloadStateLogsItem,
     hasDividerBefore: true,
   },
+  {
+    id: 'export-your-data',
+    component: ExportYourDataItem,
+  },
 ];
 
 const PrivacyTab = () => <SettingsTab items={PRIVACY_SETTING_ITEMS} />;
diff --git a/ui/pages/settings-v2/privacy-tab/third-party-apis-item.tsx b/ui/pages/settings-v2/privacy-tab/third-party-apis-item.tsx
index f41b7da3b4f9..5982f871aaba 100644
--- a/ui/pages/settings-v2/privacy-tab/third-party-apis-item.tsx
+++ b/ui/pages/settings-v2/privacy-tab/third-party-apis-item.tsx
@@ -21,26 +21,33 @@ export const ThirdPartyApisItem = () => {
   const t = useI18nContext();
 
   return (
-    <Box flexDirection={BoxFlexDirection.Column} paddingVertical={3} gap={1}>
+    <Link to={THIRD_PARTY_APIS_ROUTE}>
       <Box
-        flexDirection={BoxFlexDirection.Row}
-        justifyContent={BoxJustifyContent.Between}
-        alignItems={BoxAlignItems.Center}
+        flexDirection={BoxFlexDirection.Column}
+        paddingVertical={3}
+        gap={1}
+        paddingHorizontal={4}
+        className="rounded-none hover:bg-background-default-hover"
       >
-        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-          {t(PRIVACY_ITEMS['third-party-apis'])}
-        </Text>
-        <Link to={THIRD_PARTY_APIS_ROUTE}>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          justifyContent={BoxJustifyContent.Between}
+          alignItems={BoxAlignItems.Center}
+        >
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+            {t(PRIVACY_ITEMS['third-party-apis'])}
+          </Text>
+
           <Icon
             name={IconName.ArrowRight}
             size={IconSize.Sm}
             className="text-icon-alternative"
           />
-        </Link>
+        </Box>
+        <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
+          {t('thirdPartyApisDescription')}
+        </Text>
       </Box>
-      <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
-        {t('thirdPartyApisDescription')}
-      </Text>
-    </Box>
+    </Link>
   );
 };
diff --git a/ui/pages/settings-v2/privacy-tab/third-party-apis-sub-page.tsx b/ui/pages/settings-v2/privacy-tab/third-party-apis-sub-page.tsx
index e2f58ff10489..24d0c5b8245a 100644
--- a/ui/pages/settings-v2/privacy-tab/third-party-apis-sub-page.tsx
+++ b/ui/pages/settings-v2/privacy-tab/third-party-apis-sub-page.tsx
@@ -27,6 +27,7 @@ const NetworkDetailsCheckToggleItem = createToggleItem({
     state.metamask.useSafeChainsListValidation,
   action: setUseSafeChainsListValidation,
   dataTestId: 'network-details-check-toggle',
+  containerDataTestId: 'useSafeChainsListValidation',
 });
 
 const ShowENSDomainsToggleItem = createToggleItem({
@@ -46,6 +47,7 @@ const ShowENSDomainsToggleItem = createToggleItem({
     state.metamask.useAddressBarEnsResolution,
   action: setUseAddressBarEnsResolution,
   dataTestId: 'ens-domains-toggle',
+  containerDataTestId: 'ipfs-gateway-resolution-container',
 });
 
 const MakeSmartContractsEasierToggleItem = createToggleItem({
diff --git a/ui/pages/settings-v2/search-config.ts b/ui/pages/settings-v2/search-config.ts
index 9a2a8bd8c382..6f94d9a6b7e5 100644
--- a/ui/pages/settings-v2/search-config.ts
+++ b/ui/pages/settings-v2/search-config.ts
@@ -63,6 +63,7 @@ export const PRIVACY_ITEMS = {
   'data-collection': 'dataCollectionForMarketing',
   'delete-metametrics-data': 'deleteMetaMetricsData',
   'download-state-logs': 'downloadStateLogs',
+  'export-your-data': 'exportYourData',
 } as const;
 
 export const THIRD_PARTY_API_ITEMS = {
@@ -89,7 +90,6 @@ export const BACKUP_AND_SYNC_ITEMS = {
 } as const;
 
 export const EXPERIMENTAL_ITEMS = {
-  notifications: 'notificationsFeatureToggle',
   'keyring-snaps': 'addSnapAccountToggle',
   'watch-account': 'watchEthereumAccountsToggle',
 } as const;
@@ -99,9 +99,16 @@ export const NOTIFICATIONS_ITEMS = {
   'account-activity': 'accountActivity',
 } as const;
 
-export const DEVELOPER_OPTIONS_ITEMS = {
+export const DEVELOPER_TOOLS_ITEMS = {
   'show-fiat-in-testnets': 'showFiatConversionInTestnets',
-  'auto-reset-account': 'clearActivity',
+  'delete-activity-and-nonce-data': 'deleteActivityAndNonceData',
+} as const;
+
+export const ABOUT_ITEMS = {
+  'terms-of-use': 'terms',
+  'privacy-policy': 'privacyMsg',
+  'support-center': 'supportCenter',
+  'contact-us': 'contactUs',
 } as const;
 
 // ── Registry (auto-derived) ─────────────────────────────────────────────
@@ -134,7 +141,8 @@ export const SETTINGS_V2_SEARCH_CONFIG: TabSearchConfig[] = [
   { tabId: 'experimental', items: createSearchItemMeta(EXPERIMENTAL_ITEMS) },
   { tabId: 'notifications', items: createSearchItemMeta(NOTIFICATIONS_ITEMS) },
   {
-    tabId: 'developer-options',
-    items: createSearchItemMeta(DEVELOPER_OPTIONS_ITEMS),
+    tabId: 'developer-tools',
+    items: createSearchItemMeta(DEVELOPER_TOOLS_ITEMS),
   },
+  { tabId: 'about-us', items: createSearchItemMeta(ABOUT_ITEMS) },
 ];
diff --git a/ui/pages/settings-v2/security-and-password-tab/auto-lock-item.test.tsx b/ui/pages/settings-v2/security-and-password-tab/auto-lock-item.test.tsx
index 575f3e561458..dc9d4b6c43f5 100644
--- a/ui/pages/settings-v2/security-and-password-tab/auto-lock-item.test.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/auto-lock-item.test.tsx
@@ -72,7 +72,7 @@ describe('AutoLockItem', () => {
     const link = screen.getByRole('link');
     expect(link).toHaveAttribute(
       'href',
-      '/settings-v2/security-and-password/auto-lock',
+      '/settings/security-and-password/auto-lock',
     );
   });
 });
diff --git a/ui/pages/settings-v2/security-and-password-tab/auto-lock-sub-page.tsx b/ui/pages/settings-v2/security-and-password-tab/auto-lock-sub-page.tsx
index b37aa1ece058..f0fb5305f5c6 100644
--- a/ui/pages/settings-v2/security-and-password-tab/auto-lock-sub-page.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/auto-lock-sub-page.tsx
@@ -6,7 +6,6 @@ import {
   BoxFlexDirection,
   BoxJustifyContent,
   BoxAlignItems,
-  BoxBackgroundColor,
   FontWeight,
   Icon,
   IconName,
@@ -45,12 +44,11 @@ const AutoLockSubPage = () => {
             flexDirection={BoxFlexDirection.Row}
             justifyContent={BoxJustifyContent.Between}
             alignItems={BoxAlignItems.Center}
-            backgroundColor={
+            className={`w-full cursor-pointer border-0 p-4 ${
               isSelected
-                ? BoxBackgroundColor.BackgroundMuted
-                : BoxBackgroundColor.BackgroundDefault
-            }
-            className="w-full cursor-pointer border-0 p-4"
+                ? 'bg-muted hover:bg-muted-hover'
+                : 'bg-background-default hover:bg-background-default-hover'
+            }`}
             onClick={() => handleSelect(value)}
           >
             <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
diff --git a/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.test.tsx b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.test.tsx
index 503ccbca6ec8..c1897039e070 100644
--- a/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.test.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.test.tsx
@@ -5,6 +5,7 @@ import thunk from 'redux-thunk';
 import mockState from '../../../../test/data/mock-state.json';
 import { enLocale as messages } from '../../../../test/lib/i18n-helpers';
 import { renderWithProvider } from '../../../../test/lib/render-helpers-navigate';
+import { MANAGE_WALLET_RECOVERY_V2_ROUTE } from '../../../helpers/constants/routes';
 import ManageWalletRecoveryItem from './manage-wallet-recovery-item';
 
 const createMockStore = (overrides = {}) =>
@@ -19,7 +20,10 @@ const createMockStore = (overrides = {}) =>
 describe('ManageWalletRecoveryItem', () => {
   it('renders the label', () => {
     const store = createMockStore();
-    renderWithProvider(<ManageWalletRecoveryItem />, store);
+    renderWithProvider(
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />,
+      store,
+    );
 
     expect(
       screen.getByText(messages.manageWalletRecovery.message),
@@ -28,13 +32,13 @@ describe('ManageWalletRecoveryItem', () => {
 
   it('renders the arrow link to reveal SRP page', () => {
     const store = createMockStore();
-    renderWithProvider(<ManageWalletRecoveryItem />, store);
+    renderWithProvider(
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />,
+      store,
+    );
 
     const link = screen.getByRole('link');
-    expect(link).toHaveAttribute(
-      'href',
-      '/settings/security-and-privacy/reveal-srp-list',
-    );
+    expect(link).toHaveAttribute('href', MANAGE_WALLET_RECOVERY_V2_ROUTE);
   });
 
   it('shows "Back up incomplete" tag when SRP is not backed up', () => {
@@ -42,7 +46,10 @@ describe('ManageWalletRecoveryItem', () => {
       firstTimeFlowType: 'create',
       seedPhraseBackedUp: false,
     });
-    renderWithProvider(<ManageWalletRecoveryItem />, store);
+    renderWithProvider(
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />,
+      store,
+    );
 
     expect(screen.getByTestId('backup-incomplete-tag')).toBeInTheDocument();
     expect(
@@ -55,7 +62,10 @@ describe('ManageWalletRecoveryItem', () => {
       firstTimeFlowType: 'create',
       seedPhraseBackedUp: true,
     });
-    renderWithProvider(<ManageWalletRecoveryItem />, store);
+    renderWithProvider(
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />,
+      store,
+    );
 
     expect(
       screen.queryByTestId('backup-incomplete-tag'),
@@ -67,7 +77,10 @@ describe('ManageWalletRecoveryItem', () => {
       firstTimeFlowType: 'import',
       seedPhraseBackedUp: false,
     });
-    renderWithProvider(<ManageWalletRecoveryItem />, store);
+    renderWithProvider(
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />,
+      store,
+    );
 
     expect(
       screen.queryByTestId('backup-incomplete-tag'),
diff --git a/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.tsx b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.tsx
index e064da62981b..7b625ca103dc 100644
--- a/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-item.tsx
@@ -14,59 +14,67 @@ import {
 } from '@metamask/design-system-react';
 import { Link } from 'react-router-dom';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { REVEAL_SRP_LIST_ROUTE } from '../../../helpers/constants/routes';
 import { getIsPrimarySeedPhraseBackedUp } from '../../../ducks/metamask/metamask';
 import { SECURITY_ITEMS } from '../search-config';
 
-const ManageWalletRecoveryItem = () => {
+type ManageWalletRecoveryItemProps = {
+  route: string;
+};
+
+const ManageWalletRecoveryItem = ({ route }: ManageWalletRecoveryItemProps) => {
   const t = useI18nContext();
   const isSRPBackedUp = useSelector(getIsPrimarySeedPhraseBackedUp);
 
   return (
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      justifyContent={BoxJustifyContent.Between}
-      alignItems={BoxAlignItems.Start}
-      paddingVertical={3}
+    <Link
+      to={route}
+      data-testid="reveal-seed-words"
+      className="block rounded-none text-inherit no-underline hover:bg-background-default-hover"
     >
-      <Box flexDirection={BoxFlexDirection.Column} gap={1}>
-        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-          {t(SECURITY_ITEMS['manage-wallet-recovery'])}
-        </Text>
-        {!isSRPBackedUp && (
-          <Box
-            className="inline-flex self-start items-center gap-1 rounded-md bg-error-muted px-2 py-0.5"
-            data-testid="backup-incomplete-tag"
-          >
-            <Icon
-              name={IconName.Danger}
-              size={IconSize.Xs}
-              className="text-error-default"
-            />
-            <Text
-              variant={TextVariant.BodyXs}
-              fontWeight={FontWeight.Medium}
-              className="text-error-default"
-            >
-              {t('backUpIncomplete')}
-            </Text>
-          </Box>
-        )}
-      </Box>
       <Box
         flexDirection={BoxFlexDirection.Row}
-        alignItems={BoxAlignItems.Center}
-        className="shrink-0"
+        justifyContent={BoxJustifyContent.Between}
+        alignItems={BoxAlignItems.Start}
+        paddingVertical={3}
+        paddingHorizontal={4}
       >
-        <Link to={REVEAL_SRP_LIST_ROUTE} className="flex ml-1">
+        <Box flexDirection={BoxFlexDirection.Column} gap={1}>
+          <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+            {t(SECURITY_ITEMS['manage-wallet-recovery'])}
+          </Text>
+          {!isSRPBackedUp && (
+            <Box
+              className="inline-flex self-start items-center gap-1 rounded-md bg-error-muted px-2 py-0.5"
+              data-testid="backup-incomplete-tag"
+            >
+              <Icon
+                name={IconName.Danger}
+                size={IconSize.Xs}
+                className="text-error-default"
+              />
+              <Text
+                variant={TextVariant.BodyXs}
+                fontWeight={FontWeight.Medium}
+                className="text-error-default"
+              >
+                {t('backUpIncomplete')}
+              </Text>
+            </Box>
+          )}
+        </Box>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          className="shrink-0"
+        >
           <Icon
             name={IconName.ArrowRight}
             size={IconSize.Sm}
             className="text-icon-alternative"
           />
-        </Link>
+        </Box>
       </Box>
-    </Box>
+    </Link>
   );
 };
 
diff --git a/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-sub-page.tsx b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-sub-page.tsx
new file mode 100644
index 000000000000..73259f77d2d4
--- /dev/null
+++ b/ui/pages/settings-v2/security-and-password-tab/manage-wallet-recovery-sub-page.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { RevealSrpList } from '../../settings/security-tab/reveal-srp-list';
+
+const ManageWalletRecoverySubPage = () => {
+  return <RevealSrpList />;
+};
+
+export default ManageWalletRecoverySubPage;
diff --git a/ui/pages/settings-v2/security-and-password-tab/password-sub-page.tsx b/ui/pages/settings-v2/security-and-password-tab/password-sub-page.tsx
new file mode 100644
index 000000000000..7bfd24595c80
--- /dev/null
+++ b/ui/pages/settings-v2/security-and-password-tab/password-sub-page.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import ChangePassword from '../../settings/security-tab/change-password/change-password';
+import { SECURITY_AND_PASSWORD_ROUTE } from '../../../helpers/constants/routes';
+
+const PasswordSubPage = () => {
+  return <ChangePassword redirectRoute={SECURITY_AND_PASSWORD_ROUTE} />;
+};
+
+export default PasswordSubPage;
diff --git a/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.test.tsx b/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.test.tsx
index 709495460622..2e3321346ef5 100644
--- a/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.test.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.test.tsx
@@ -32,5 +32,6 @@ describe('SecurityAndPasswordTab', () => {
     expect(
       screen.getByTestId('security-phishing-detection-toggle'),
     ).toBeInTheDocument();
+    expect(screen.getByTestId('auto-lock-button')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.tsx b/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.tsx
index c02833aa3211..201106ac29c6 100644
--- a/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.tsx
+++ b/ui/pages/settings-v2/security-and-password-tab/security-and-password-tab.tsx
@@ -5,7 +5,8 @@ import { getPreferences, getUsePhishDetect } from '../../../selectors';
 import { setUsePhishDetect } from '../../../store/actions';
 import {
   AUTO_LOCK_ROUTE,
-  SECURITY_PASSWORD_CHANGE_ROUTE,
+  MANAGE_WALLET_RECOVERY_V2_ROUTE,
+  SECURITY_PASSWORD_CHANGE_V2_ROUTE,
 } from '../../../helpers/constants/routes';
 import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../../shared/constants/preferences';
 import { SECURITY_ITEMS } from '../search-config';
@@ -25,7 +26,8 @@ const PasswordItem = createSelectItem({
   name: 'PasswordItem',
   titleKey: SECURITY_ITEMS.password,
   valueSelector: () => '',
-  route: SECURITY_PASSWORD_CHANGE_ROUTE,
+  route: SECURITY_PASSWORD_CHANGE_V2_ROUTE,
+  dataTestId: 'change-password-button',
 });
 
 export const AutoLockItem = createSelectItem({
@@ -42,10 +44,16 @@ export const AutoLockItem = createSelectItem({
       t as (key: string, substitutions?: string[]) => string,
     ),
   route: AUTO_LOCK_ROUTE,
+  dataTestId: 'auto-lock-button',
 });
 
 const SECURITY_AND_PASSWORD_SETTING_ITEMS: SettingItemConfig[] = [
-  { id: 'manage-wallet-recovery', component: ManageWalletRecoveryItem },
+  {
+    id: 'manage-wallet-recovery',
+    component: () => (
+      <ManageWalletRecoveryItem route={MANAGE_WALLET_RECOVERY_V2_ROUTE} />
+    ),
+  },
   { id: 'password', component: PasswordItem },
   { id: 'auto-lock', component: AutoLockItem },
   { id: 'phishing-detection', component: PhishingDetectionItem },
diff --git a/ui/pages/settings-v2/settings-registry.test.ts b/ui/pages/settings-v2/settings-registry.test.ts
index e05f426aff5b..02d65035130e 100644
--- a/ui/pages/settings-v2/settings-registry.test.ts
+++ b/ui/pages/settings-v2/settings-registry.test.ts
@@ -1,10 +1,17 @@
 import {
+  DEVELOPER_OPTIONS_ROUTE,
   ASSETS_ROUTE,
   CURRENCY_ROUTE,
+  MANAGE_WALLET_RECOVERY_V2_ROUTE,
   PRIVACY_ROUTE,
+  SECURITY_PASSWORD_CHANGE_V2_ROUTE,
   SETTINGS_V2_ROUTE,
   THEME_ROUTE,
   THIRD_PARTY_APIS_ROUTE,
+  TRANSACTION_SHIELD_CLAIM_ROUTES,
+  TRANSACTION_SHIELD_MANAGE_PAST_PLAN_ROUTE,
+  TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE,
+  TRANSACTION_SHIELD_ROUTE,
 } from '../../helpers/constants/routes';
 import {
   getSettingsV2RouteMeta,
@@ -29,6 +36,86 @@ describe('settings-registry', () => {
       );
       expect(meta?.parentPath).toBeUndefined();
     });
+
+    it('adds a separate debug route in test builds', () => {
+      const meta = getSettingsV2RouteMeta(DEVELOPER_OPTIONS_ROUTE);
+
+      expect(meta).toEqual(
+        expect.objectContaining({
+          labelKey: 'debug',
+        }),
+      );
+    });
+
+    it('matches transaction shield sub-pages', () => {
+      expect(
+        getSettingsV2RouteMeta(TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldManagePlan',
+          parentPath: TRANSACTION_SHIELD_ROUTE,
+        }),
+      );
+
+      expect(
+        getSettingsV2RouteMeta(TRANSACTION_SHIELD_MANAGE_PAST_PLAN_ROUTE),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldPastPlansTitle',
+          parentPath: TRANSACTION_SHIELD_ROUTE,
+        }),
+      );
+    });
+
+    it('matches dynamic transaction shield claim routes', () => {
+      expect(
+        getSettingsV2RouteMeta(TRANSACTION_SHIELD_CLAIM_ROUTES.BASE),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldClaimsListTitle',
+          parentPath: TRANSACTION_SHIELD_ROUTE,
+        }),
+      );
+
+      expect(
+        getSettingsV2RouteMeta(TRANSACTION_SHIELD_CLAIM_ROUTES.NEW.FULL),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldClaim',
+          parentPath: TRANSACTION_SHIELD_CLAIM_ROUTES.BASE,
+        }),
+      );
+
+      expect(
+        getSettingsV2RouteMeta(
+          `${TRANSACTION_SHIELD_CLAIM_ROUTES.EDIT_DRAFT.FULL}/draft-id`,
+        ),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldClaimsListTitle',
+        }),
+      );
+
+      expect(
+        getSettingsV2RouteMeta(
+          `${TRANSACTION_SHIELD_CLAIM_ROUTES.VIEW_PENDING.FULL}/claim-id`,
+        ),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldClaimsListTitle',
+        }),
+      );
+
+      expect(
+        getSettingsV2RouteMeta(
+          `${TRANSACTION_SHIELD_CLAIM_ROUTES.VIEW_HISTORY.FULL}/claim-id`,
+        ),
+      ).toEqual(
+        expect.objectContaining({
+          labelKey: 'shieldClaimsListTitle',
+        }),
+      );
+    });
   });
 
   describe('SETTINGS_V2_TABS', () => {
@@ -62,6 +149,11 @@ describe('settings-registry', () => {
       // Sub-pages
       expect(paths).toContain(CURRENCY_ROUTE);
       expect(paths).toContain(THEME_ROUTE);
+      expect(paths).toContain(MANAGE_WALLET_RECOVERY_V2_ROUTE);
+      expect(paths).toContain(SECURITY_PASSWORD_CHANGE_V2_ROUTE);
+      expect(paths).toContain(TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE);
+      expect(paths).toContain(TRANSACTION_SHIELD_MANAGE_PAST_PLAN_ROUTE);
+      expect(paths).toContain(`${TRANSACTION_SHIELD_CLAIM_ROUTES.BASE}/*`);
     });
 
     it('does not include settings root', () => {
diff --git a/ui/pages/settings-v2/settings-registry.ts b/ui/pages/settings-v2/settings-registry.ts
index 307499950e96..dc5ec2c9fd6a 100644
--- a/ui/pages/settings-v2/settings-registry.ts
+++ b/ui/pages/settings-v2/settings-registry.ts
@@ -2,25 +2,36 @@
 /* eslint-disable import-x/extensions */
 import { type ComponentType } from 'react';
 import { IconName } from '@metamask/design-system-react';
+import { matchPath } from 'react-router-dom';
 import {
   ACCOUNT_IDENTICON_ROUTE,
+  ABOUT_US_ROUTE,
   ASSETS_ROUTE,
   AUTO_LOCK_ROUTE,
   BACKUPANDSYNC_ROUTE,
   CURRENCY_ROUTE,
-  DEVELOPER_OPTIONS_V2_ROUTE,
+  DEVELOPER_OPTIONS_ROUTE,
+  DEVELOPER_TOOLS_ROUTE,
+  MANAGE_WALLET_RECOVERY_V2_ROUTE,
   EXPERIMENTAL_ROUTE,
   LANGUAGE_ROUTE,
   NOTIFICATIONS_SETTINGS_ROUTE,
   PREFERENCES_AND_DISPLAY_ROUTE,
   SECURITY_AND_PASSWORD_ROUTE,
+  SECURITY_PASSWORD_CHANGE_V2_ROUTE,
   SETTINGS_V2_ROUTE,
+  SNAP_SETTINGS_ROUTE,
+  TRANSACTION_SHIELD_CLAIM_ROUTES,
+  TRANSACTION_SHIELD_MANAGE_PAST_PLAN_ROUTE,
+  TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE,
+  TRANSACTION_SHIELD_ROUTE,
   TRANSACTIONS_ROUTE,
   THEME_ROUTE,
   PRIVACY_ROUTE,
   THIRD_PARTY_APIS_ROUTE,
 } from '../../helpers/constants/routes';
 import { mmLazy } from '../../helpers/utils/mm-lazy';
+import { CLAIMS_TAB_KEYS } from '../settings/transaction-shield-tab/types';
 
 /**
  * Route definition for a Settings V2 page.
@@ -38,6 +49,42 @@ export type SettingsV2RouteMeta = {
   iconName?: IconName;
 };
 
+export const SETTINGS_V2_ROOT_SECTIONS: readonly {
+  titleKeys: readonly string[];
+  paths: readonly string[];
+}[] = [
+  {
+    titleKeys: ['general'],
+    paths: [PREFERENCES_AND_DISPLAY_ROUTE, NOTIFICATIONS_SETTINGS_ROUTE],
+  },
+  {
+    titleKeys: ['securityAndPrivacy'],
+    paths: [SECURITY_AND_PASSWORD_ROUTE, PRIVACY_ROUTE, BACKUPANDSYNC_ROUTE],
+  },
+  {
+    titleKeys: ['transactionsAndAssets'],
+    paths: [TRANSACTION_SHIELD_ROUTE, ASSETS_ROUTE, TRANSACTIONS_ROUTE],
+  },
+  {
+    titleKeys: ['moreCapital'],
+    paths: [
+      EXPERIMENTAL_ROUTE,
+      DEVELOPER_OPTIONS_ROUTE,
+      DEVELOPER_TOOLS_ROUTE,
+      ABOUT_US_ROUTE,
+    ],
+  },
+] as const;
+
+const SHOW_DEBUG_SETTINGS = Boolean(
+  process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS || process.env.IN_TEST,
+);
+
+const TRANSACTION_SHIELD_CLAIMS_WILDCARD_ROUTE = `${TRANSACTION_SHIELD_CLAIM_ROUTES.BASE}/*`;
+const TRANSACTION_SHIELD_EDIT_DRAFT_ROUTE = `${TRANSACTION_SHIELD_CLAIM_ROUTES.EDIT_DRAFT.FULL}/:draftId`;
+const TRANSACTION_SHIELD_VIEW_PENDING_ROUTE = `${TRANSACTION_SHIELD_CLAIM_ROUTES.VIEW_PENDING.FULL}/:claimId`;
+const TRANSACTION_SHIELD_VIEW_HISTORY_ROUTE = `${TRANSACTION_SHIELD_CLAIM_ROUTES.VIEW_HISTORY.FULL}/:claimId`;
+
 /**
  * Single source of truth for all Settings V2 routes.
  * Order of tabs in the TabBar is determined by declaration order of isTab entries.
@@ -83,9 +130,7 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
   [NOTIFICATIONS_SETTINGS_ROUTE]: {
     labelKey: 'notifications',
     parentPath: SETTINGS_V2_ROUTE,
-    component: mmLazy(
-      () => import('../notifications-settings/notifications-settings.tsx'),
-    ),
+    component: mmLazy(() => import('./notifications-tab/index.ts')),
     isTab: true,
     iconName: IconName.Notification,
   },
@@ -105,6 +150,23 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
       () => import('./security-and-password-tab/auto-lock-sub-page.tsx'),
     ),
   },
+  [MANAGE_WALLET_RECOVERY_V2_ROUTE]: {
+    labelKey: 'manageWalletRecovery',
+    parentPath: SECURITY_AND_PASSWORD_ROUTE,
+    component: mmLazy(
+      () =>
+        import(
+          './security-and-password-tab/manage-wallet-recovery-sub-page.tsx'
+        ),
+    ),
+  },
+  [SECURITY_PASSWORD_CHANGE_V2_ROUTE]: {
+    labelKey: 'password',
+    parentPath: SECURITY_AND_PASSWORD_ROUTE,
+    component: mmLazy(
+      () => import('./security-and-password-tab/password-sub-page.tsx'),
+    ),
+  },
 
   // --- Privacy tab ---
   [PRIVACY_ROUTE]: {
@@ -133,6 +195,58 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
     iconName: IconName.SecurityTime,
   },
 
+  // --- Transaction Shield tab ---
+  [TRANSACTION_SHIELD_ROUTE]: {
+    labelKey: 'shieldTx',
+    parentPath: SETTINGS_V2_ROUTE,
+    component: mmLazy(
+      () => import('../settings/transaction-shield-tab/index.ts'),
+    ),
+    isTab: true,
+    iconName: IconName.ShieldLock,
+  },
+  [TRANSACTION_SHIELD_MANAGE_PLAN_ROUTE]: {
+    labelKey: 'shieldManagePlan',
+    parentPath: TRANSACTION_SHIELD_ROUTE,
+    component: mmLazy(
+      () => import('./transaction-shield-tab/manage-plan-sub-page.tsx'),
+    ),
+  },
+  [TRANSACTION_SHIELD_MANAGE_PAST_PLAN_ROUTE]: {
+    labelKey: 'shieldPastPlansTitle',
+    parentPath: TRANSACTION_SHIELD_ROUTE,
+    component: mmLazy(
+      () => import('./transaction-shield-tab/manage-past-plan-sub-page.tsx'),
+    ),
+  },
+  [TRANSACTION_SHIELD_CLAIM_ROUTES.BASE]: {
+    labelKey: 'shieldClaimsListTitle',
+    parentPath: TRANSACTION_SHIELD_ROUTE,
+  },
+  [TRANSACTION_SHIELD_CLAIMS_WILDCARD_ROUTE]: {
+    labelKey: 'shieldClaimsListTitle',
+    parentPath: TRANSACTION_SHIELD_ROUTE,
+    component: mmLazy(
+      () => import('../settings/transaction-shield-tab/claims-area/index.ts'),
+    ),
+  },
+  [TRANSACTION_SHIELD_CLAIM_ROUTES.NEW.FULL]: {
+    labelKey: 'shieldClaim',
+    parentPath: TRANSACTION_SHIELD_CLAIM_ROUTES.BASE,
+  },
+  [TRANSACTION_SHIELD_EDIT_DRAFT_ROUTE]: {
+    labelKey: 'shieldClaimsListTitle',
+    parentPath: `${TRANSACTION_SHIELD_CLAIM_ROUTES.BASE}?tab=${CLAIMS_TAB_KEYS.PENDING}`,
+  },
+  [TRANSACTION_SHIELD_VIEW_PENDING_ROUTE]: {
+    labelKey: 'shieldClaimsListTitle',
+    parentPath: `${TRANSACTION_SHIELD_CLAIM_ROUTES.BASE}?tab=${CLAIMS_TAB_KEYS.PENDING}`,
+  },
+  [TRANSACTION_SHIELD_VIEW_HISTORY_ROUTE]: {
+    labelKey: 'shieldClaimsListTitle',
+    parentPath: `${TRANSACTION_SHIELD_CLAIM_ROUTES.BASE}?tab=${CLAIMS_TAB_KEYS.HISTORY}`,
+  },
+
   // --- Assets tab ---
   [ASSETS_ROUTE]: {
     labelKey: 'assets',
@@ -167,14 +281,42 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
     iconName: IconName.Flask,
   },
 
-  // --- Developer Options tab ---
-  [DEVELOPER_OPTIONS_V2_ROUTE]: {
-    labelKey: 'developerOptions',
+  // --- Debug (internal) tab ---
+  ...(SHOW_DEBUG_SETTINGS
+    ? {
+        [DEVELOPER_OPTIONS_ROUTE]: {
+          labelKey: 'debug',
+          parentPath: SETTINGS_V2_ROUTE,
+          component: mmLazy(() => import('./debug-tab/index.ts')),
+          isTab: true,
+          iconName: IconName.Sparkle,
+        },
+      }
+    : {}),
+
+  // --- Developer Tools tab ---
+  [DEVELOPER_TOOLS_ROUTE]: {
+    labelKey: 'developerTools',
     parentPath: SETTINGS_V2_ROUTE,
-    component: mmLazy(() => import('./developer-options-tab/index.ts')),
+    component: mmLazy(() => import('./developer-tools-tab/index.ts')),
     isTab: true,
     iconName: IconName.Code,
   },
+
+  // --- About tab ---
+  [ABOUT_US_ROUTE]: {
+    labelKey: 'aboutMetaMask',
+    parentPath: SETTINGS_V2_ROUTE,
+    component: mmLazy(() => import('./about-tab/index.ts')),
+    isTab: true,
+    iconName: IconName.Info,
+  },
+
+  // --- Snap settings (navigated via URL, not shown as a tab) ---
+  [SNAP_SETTINGS_ROUTE]: {
+    labelKey: 'snaps',
+    parentPath: SETTINGS_V2_ROUTE,
+  },
 };
 
 /**
@@ -185,7 +327,31 @@ export const SETTINGS_V2_ROUTES: Record<string, SettingsV2RouteMeta> = {
 export function getSettingsV2RouteMeta(
   pathname: string,
 ): SettingsV2RouteMeta | null {
-  return SETTINGS_V2_ROUTES[pathname] ?? null;
+  if (!pathname) {
+    return null;
+  }
+
+  const exactMeta = SETTINGS_V2_ROUTES[pathname];
+  if (exactMeta) {
+    return exactMeta;
+  }
+
+  const matchingRoute = Object.keys(SETTINGS_V2_ROUTES)
+    .filter((routePath) => routePath.includes('*') || routePath.includes(':'))
+    .sort((routeA, routeB) => routeB.length - routeA.length)
+    .find((routePath) =>
+      Boolean(
+        matchPath(
+          {
+            path: routePath,
+            end: true,
+          },
+          pathname,
+        ),
+      ),
+    );
+
+  return matchingRoute ? SETTINGS_V2_ROUTES[matchingRoute] : null;
 }
 
 type TabRouteMeta = SettingsV2RouteMeta &
diff --git a/ui/pages/settings-v2/settings-v2.test.tsx b/ui/pages/settings-v2/settings-v2.test.tsx
index 4e359aaaa1f5..e3018a34fb89 100644
--- a/ui/pages/settings-v2/settings-v2.test.tsx
+++ b/ui/pages/settings-v2/settings-v2.test.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import mockState from '../../../test/data/mock-state.json';
+import { enLocale as messages } from '../../../test/lib/i18n-helpers';
 import { renderWithProvider } from '../../../test/lib/render-helpers-navigate';
 import { setBackgroundConnection } from '../../store/background-connection';
 import {
@@ -10,16 +11,35 @@ import {
   CURRENCY_ROUTE,
   DEFAULT_ROUTE,
   SETTINGS_V2_ROUTE,
+  TRANSACTION_SHIELD_ROUTE,
 } from '../../helpers/constants/routes';
+import {
+  ENVIRONMENT_TYPE_FULLSCREEN,
+  ENVIRONMENT_TYPE_POPUP,
+} from '../../../shared/constants/app';
 import SettingsV2 from './settings-v2';
 
 const mockNavigate = jest.fn();
+const mockGetEnvironmentType = jest.fn(() => ENVIRONMENT_TYPE_POPUP);
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockNavigate,
 }));
 
+jest.mock('../../../app/scripts/lib/util', () => ({
+  getEnvironmentType: () => mockGetEnvironmentType(),
+}));
+
+jest.mock(
+  '../../components/app/shield-entry-modal/shield-illustration-animation',
+  () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: () => <div data-testid="shield-illustration-animation" />,
+  }),
+);
+
 let mockPathname = SETTINGS_V2_ROUTE;
 
 const backgroundConnectionMock = new Proxy(
@@ -40,10 +60,87 @@ describe('SettingsV2', () => {
     jest.clearAllMocks();
     setBackgroundConnection(backgroundConnectionMock as never);
     mockPathname = SETTINGS_V2_ROUTE;
+    mockGetEnvironmentType.mockReturnValue(ENVIRONMENT_TYPE_POPUP);
   });
 
   describe('navigation', () => {
-    it('navigates to home when back is clicked at settings root', async () => {
+    it('renders transaction shield on the settings root page', () => {
+      renderSettingsV2(mockStore);
+
+      expect(
+        screen.getByTestId('settings-v2-root-item-transaction-shield'),
+      ).toBeInTheDocument();
+    });
+
+    it('shows grouped tabs in fullscreen at the settings root', async () => {
+      mockGetEnvironmentType.mockReturnValue(ENVIRONMENT_TYPE_FULLSCREEN);
+
+      renderSettingsV2(mockStore);
+
+      expect(
+        screen.getByTestId('settings-v2-tab-bar-grouped'),
+      ).toBeInTheDocument();
+      expect(screen.getByText(messages.general.message)).toBeInTheDocument();
+      expect(
+        screen.getByTestId('settings-v2-tab-item-transaction-shield'),
+      ).toBeInTheDocument();
+      expect(screen.queryByTestId('settings-v2-root')).not.toBeInTheDocument();
+      expect(
+        await screen.findByText(messages.theme.message),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.securityAndPrivacy.message),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(messages.transactionsAndAssets.message),
+      ).toBeInTheDocument();
+    });
+
+    it('treats trailing-slash fullscreen settings route as the root route', async () => {
+      mockGetEnvironmentType.mockReturnValue(ENVIRONMENT_TYPE_FULLSCREEN);
+      mockPathname = `${SETTINGS_V2_ROUTE}/`;
+
+      renderSettingsV2(mockStore);
+
+      expect(
+        screen.getByTestId('settings-v2-tab-bar-grouped'),
+      ).toBeInTheDocument();
+      expect(screen.queryByTestId('settings-v2-root')).not.toBeInTheDocument();
+      expect(
+        await screen.findByText(messages.theme.message),
+      ).toBeInTheDocument();
+    });
+
+    it('navigates to transaction shield from the root page', async () => {
+      renderSettingsV2(mockStore);
+
+      fireEvent.click(
+        screen.getByTestId('settings-v2-root-item-transaction-shield'),
+      );
+
+      await waitFor(() => {
+        expect(mockNavigate).toHaveBeenCalledWith(TRANSACTION_SHIELD_ROUTE);
+      });
+    });
+
+    it('navigates to home with the global menu drawer open when back is clicked at settings root', async () => {
+      renderSettingsV2(mockStore);
+
+      const backButton = await screen.findByTestId(
+        'settings-v2-header-back-button',
+      );
+
+      fireEvent.click(backButton);
+
+      await waitFor(() => {
+        expect(mockNavigate).toHaveBeenCalledWith(
+          `${DEFAULT_ROUTE}?drawerOpen=true`,
+        );
+      });
+    });
+
+    it('navigates to home with the drawer open when back is clicked at settings root regardless of settings URL query', async () => {
+      mockPathname = `${SETTINGS_V2_ROUTE}?drawerOpen=true`;
       renderSettingsV2(mockStore);
 
       const backButton = await screen.findByTestId(
@@ -53,7 +150,9 @@ describe('SettingsV2', () => {
       fireEvent.click(backButton);
 
       await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith(DEFAULT_ROUTE);
+        expect(mockNavigate).toHaveBeenCalledWith(
+          `${DEFAULT_ROUTE}?drawerOpen=true`,
+        );
       });
     });
 
diff --git a/ui/pages/settings-v2/settings-v2.tsx b/ui/pages/settings-v2/settings-v2.tsx
index bdda2e56a537..3459ea8598e1 100644
--- a/ui/pages/settings-v2/settings-v2.tsx
+++ b/ui/pages/settings-v2/settings-v2.tsx
@@ -1,5 +1,12 @@
 /* eslint-disable import-x/extensions */
-import React, { Fragment, Suspense, useMemo, useState } from 'react';
+import React, {
+  Fragment,
+  Suspense,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
 import {
   Routes as RouterRoutes,
   Route,
@@ -14,6 +21,7 @@ import {
   BoxFlexDirection,
   FontWeight,
   Icon,
+  IconColor,
   IconName,
   IconSize,
   Text,
@@ -21,11 +29,15 @@ import {
   TextVariant,
 } from '@metamask/design-system-react';
 import classnames from 'clsx';
+import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import {
   DEFAULT_ROUTE,
   SETTINGS_V2_ROUTE,
+  SNAP_SETTINGS_ROUTE,
+  TRANSACTION_SHIELD_ROUTE,
 } from '../../helpers/constants/routes';
+import { SnapSettingsRenderer } from '../../components/app/snaps/snap-settings-page';
 // TODO: Remove restricted import
 // eslint-disable-next-line import-x/no-restricted-paths
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
@@ -33,18 +45,42 @@ import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_SIDEPANEL,
 } from '../../../shared/constants/app';
+import {
+  getUseExternalServices,
+  getSettingsPageSnapsIds,
+  getSnapsMetadata,
+} from '../../selectors';
+import { getSnapName } from '../../helpers/utils/util';
+import { getHasSubscribedToShield } from '../../selectors/subscription/subscription';
+// TODO: Remove restricted import
+// eslint-disable-next-line import-x/no-restricted-paths
+import { getIsMetaMaskShieldFeatureEnabled } from '../../../shared/lib/environment';
+import ShieldEntryModal from '../../components/app/shield-entry-modal';
+// TODO: Remove restricted import
+// eslint-disable-next-line import-x/no-restricted-paths
+import { SHIELD_QUERY_PARAMS } from '../../../shared/lib/deep-links/routes/shield';
 import { toRelativeRoutePath } from '../routes/utils';
 import TabBar from './tab-bar';
 import {
+  SETTINGS_V2_ROOT_SECTIONS,
   SETTINGS_V2_TABS,
   SETTINGS_V2_RENDERABLE_ROUTES,
   getSettingsV2RouteMeta,
 } from './settings-registry';
-import { SettingsV2Header, SettingsV2SearchResults } from './shared';
+import {
+  SettingsV2Header,
+  SettingsV2Root,
+  SettingsV2SearchResults,
+} from './shared';
 import { useSettingsV2Search, MIN_SEARCH_LENGTH } from './useSettingsV2Search';
 
-const FirstTabComponent = SETTINGS_V2_TABS[0]?.component;
 const FIRST_TAB_PATH = SETTINGS_V2_TABS[0]?.path;
+const FirstTabComponent = SETTINGS_V2_TABS[0]?.component;
+
+const normalizeSettingsPath = (path: string) =>
+  path !== '/' && path.endsWith('/') ? path.slice(0, -1) : path;
+
+const getRoutePathname = (path: string) => path.split('?')[0];
 
 /**
  * Layout for Settings V2: header, tab bar, and content area.
@@ -56,24 +92,57 @@ const SettingsV2Layout = ({ children }: { children: React.ReactNode }) => {
   const navigate = useNavigate();
   const location = useLocation();
   const t = useI18nContext();
-  const { pathname } = location;
-  const meta = getSettingsV2RouteMeta(pathname);
+  const normalizedPathname = normalizeSettingsPath(location.pathname);
+  const meta = getSettingsV2RouteMeta(normalizedPathname);
   const environmentType = getEnvironmentType();
 
   const isPopupOrSidepanel =
     environmentType === ENVIRONMENT_TYPE_POPUP ||
     environmentType === ENVIRONMENT_TYPE_SIDEPANEL;
   const isSidepanel = environmentType === ENVIRONMENT_TYPE_SIDEPANEL;
-
-  const isOnSettingsRoot = pathname === SETTINGS_V2_ROUTE;
+  const isOnSettingsRoot = normalizedPathname === SETTINGS_V2_ROUTE;
+  const showRootLandingPage = isOnSettingsRoot && isPopupOrSidepanel;
   const backRoute = isOnSettingsRoot
-    ? DEFAULT_ROUTE
+    ? `${DEFAULT_ROUTE}?drawerOpen=true`
     : (meta?.parentPath ?? SETTINGS_V2_ROUTE);
 
   const [isSearchOpen, setIsSearchOpen] = useState(false);
   const [searchValue, setSearchValue] = useState('');
   const searchResults = useSettingsV2Search(searchValue);
 
+  // --- Shield entry modal interception ---
+  const hasSubscribedToShield = useSelector(getHasSubscribedToShield);
+  const useExternalServices = Boolean(useSelector(getUseExternalServices));
+  const isShieldFeatureEnabled = getIsMetaMaskShieldFeatureEnabled();
+  const [showShieldEntryModal, setShowShieldEntryModal] = useState(false);
+
+  const shouldInterceptShieldTab =
+    isShieldFeatureEnabled && useExternalServices && !hasSubscribedToShield;
+
+  // Handle ?showShieldEntryModal=true query param (e.g. from deep links)
+  useEffect(() => {
+    const searchParams = new URLSearchParams(location.search);
+    if (searchParams.get(SHIELD_QUERY_PARAMS.showShieldEntryModal) === 'true') {
+      if (hasSubscribedToShield) {
+        navigate(TRANSACTION_SHIELD_ROUTE, { replace: true });
+      } else {
+        setShowShieldEntryModal(true);
+      }
+    }
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps -- mount only
+
+  // Intercept Transaction Shield tab click for non-subscribed users
+  const handleTabClick = useCallback(
+    (key: string): boolean | void => {
+      if (key === TRANSACTION_SHIELD_ROUTE && shouldInterceptShieldTab) {
+        setShowShieldEntryModal(true);
+        return true; // prevent Link navigation
+      }
+      return undefined;
+    },
+    [shouldInterceptShieldTab],
+  );
+
   const currentPageLabelKey = meta?.labelKey;
 
   // Header: "Settings" on fullscreen; tab or sub-page name on popup/sidepanel
@@ -88,11 +157,11 @@ const SettingsV2Layout = ({ children }: { children: React.ReactNode }) => {
       return [];
     }
     const crumbs: { labelKey: string; path: string }[] = [];
-    let currentPath: string | undefined = pathname;
+    let currentPath: string | undefined = normalizedPathname;
 
     // Walk up the parent chain to build breadcrumbs
-    while (currentPath && currentPath !== SETTINGS_V2_ROUTE) {
-      const routeMeta = getSettingsV2RouteMeta(currentPath);
+    while (currentPath && getRoutePathname(currentPath) !== SETTINGS_V2_ROUTE) {
+      const routeMeta = getSettingsV2RouteMeta(getRoutePathname(currentPath));
       if (!routeMeta) {
         break;
       }
@@ -101,10 +170,18 @@ const SettingsV2Layout = ({ children }: { children: React.ReactNode }) => {
     }
 
     return crumbs;
-  }, [pathname, meta?.parentPath]);
+  }, [normalizedPathname, meta?.parentPath]);
 
   const showBreadcrumbs = breadcrumbs.length > 1 && !isPopupOrSidepanel;
 
+  // --- Dynamic snap settings tabs ---
+  const settingsPageSnapIds = useSelector(getSettingsPageSnapsIds);
+  const snapsMetadata = useSelector(getSnapsMetadata);
+  const snapNameGetter = useMemo(
+    () => getSnapName(snapsMetadata),
+    [snapsMetadata],
+  );
+
   const itemTabs = useMemo(
     () =>
       SETTINGS_V2_TABS.map((item) => ({
@@ -114,18 +191,210 @@ const SettingsV2Layout = ({ children }: { children: React.ReactNode }) => {
       })),
     [t],
   );
+  const groupedItemTabs = useMemo(() => {
+    const sections = SETTINGS_V2_ROOT_SECTIONS.map(({ titleKeys, paths }) => {
+      const items = SETTINGS_V2_TABS.filter((item) =>
+        paths.includes(item.path),
+      ).map((item) => ({
+        key: item.path,
+        content: t(item.labelKey),
+        iconName: item.iconName,
+        dataTestId: `settings-v2-tab-item-${item.id}`,
+      }));
+
+      return {
+        key: titleKeys.join('-'),
+        title: titleKeys.map((key) => t(key)).join(' & '),
+        items,
+      };
+    }).filter(({ items }) => items.length > 0);
+
+    if (settingsPageSnapIds.length > 0) {
+      sections.push({
+        key: 'snaps',
+        title: t('snaps') as string,
+        items: settingsPageSnapIds.map((snapId: string) => ({
+          key: `${SNAP_SETTINGS_ROUTE}?snapId=${encodeURIComponent(snapId)}`,
+          content: snapNameGetter(snapId),
+          iconName: IconName.Snaps,
+          dataTestId: `settings-v2-tab-item-snap-${snapId}`,
+        })),
+      });
+    }
+
+    return sections;
+  }, [t, settingsPageSnapIds, snapNameGetter]);
 
   const handleCloseSearch = () => {
     setIsSearchOpen(false);
     setSearchValue('');
   };
 
+  const showSearchResults =
+    isSearchOpen && searchValue.trim().length >= MIN_SEARCH_LENGTH;
+
+  let mainContent: React.ReactNode;
+
+  if (showSearchResults) {
+    mainContent = (
+      <Box className="flex-1 overflow-y-auto">
+        <SettingsV2SearchResults
+          results={searchResults}
+          onClickResult={(item) => {
+            navigate(`${item.tabRoute}#${item.settingId}`);
+            handleCloseSearch();
+          }}
+        />
+      </Box>
+    );
+  } else if (showRootLandingPage) {
+    mainContent = (
+      <Box className="flex-1 overflow-y-auto">
+        <SettingsV2Root onBeforeNavigate={handleTabClick} />
+      </Box>
+    );
+  } else {
+    mainContent = (
+      <Box
+        flexDirection={BoxFlexDirection.Row}
+        // 64px is the header height
+        className={classnames(`h-[calc(100%-64px)]`, {
+          'sm:border-t sm:border-border-muted': !isSidepanel,
+        })}
+      >
+        <Box
+          className={classnames(
+            'w-full h-full sm:max-w-[262px] sm:bg-background-muted',
+            {
+              flex: isOnSettingsRoot,
+              'hidden sm:flex': !isOnSettingsRoot && !isSidepanel,
+              hidden: !isOnSettingsRoot && isSidepanel,
+              'sm:max-w-full sm:bg-background-default':
+                isOnSettingsRoot && isSidepanel,
+            },
+          )}
+        >
+          <TabBar
+            tabs={isPopupOrSidepanel ? itemTabs : []}
+            sections={isPopupOrSidepanel ? [] : groupedItemTabs}
+            isActive={(key) => {
+              // First tab is active when at settings root
+              if (
+                key === FIRST_TAB_PATH &&
+                normalizedPathname === SETTINGS_V2_ROUTE
+              ) {
+                return true;
+              }
+              // Snap tabs: key includes ?snapId=, match against current URL
+              if (
+                normalizedPathname === SNAP_SETTINGS_ROUTE &&
+                key.startsWith(`${SNAP_SETTINGS_ROUTE}?`)
+              ) {
+                const keySnapId = new URLSearchParams(key.split('?')[1]).get(
+                  'snapId',
+                );
+                const currentSnapId = new URLSearchParams(location.search).get(
+                  'snapId',
+                );
+                return keySnapId === currentSnapId;
+              }
+              return (
+                normalizedPathname === key ||
+                normalizedPathname.startsWith(`${key}/`)
+              );
+            }}
+            removeFullscreenStyles={isPopupOrSidepanel}
+            onTabClick={handleTabClick}
+          />
+        </Box>
+        <Box
+          className={classnames('flex-auto flex-col w-full pt-2', {
+            flex: !isOnSettingsRoot,
+            'hidden sm:flex': isOnSettingsRoot && !isSidepanel,
+            hidden: isOnSettingsRoot && isSidepanel,
+          })}
+        >
+          {showBreadcrumbs && (
+            <Box
+              className="hidden sm:flex"
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+              gap={2}
+              paddingHorizontal={4}
+              paddingVertical={3}
+            >
+              {breadcrumbs.map((crumb, index) => {
+                const isFirst = index === 0;
+                const isLast = index === breadcrumbs.length - 1;
+                return (
+                  <Fragment key={crumb.path}>
+                    {!isFirst && (
+                      <Text
+                        variant={TextVariant.BodyMd}
+                        fontWeight={FontWeight.Medium}
+                        color={TextColor.TextAlternative}
+                      >
+                        {'>'}
+                      </Text>
+                    )}
+                    {isLast ? (
+                      <Text
+                        variant={TextVariant.BodyMd}
+                        fontWeight={FontWeight.Medium}
+                        color={TextColor.TextDefault}
+                      >
+                        {t(crumb.labelKey)}
+                      </Text>
+                    ) : (
+                      <Link
+                        to={crumb.path}
+                        className="flex items-center gap-2 cursor-pointer"
+                      >
+                        {isFirst && (
+                          <Icon
+                            name={IconName.ArrowLeft}
+                            size={IconSize.Sm}
+                            color={IconColor.IconDefault}
+                          />
+                        )}
+                        <Text
+                          variant={TextVariant.BodyMd}
+                          fontWeight={FontWeight.Medium}
+                          color={TextColor.TextAlternative}
+                        >
+                          {t(crumb.labelKey)}
+                        </Text>
+                      </Link>
+                    )}
+                  </Fragment>
+                );
+              })}
+            </Box>
+          )}
+          <Suspense fallback={null}>
+            {isOnSettingsRoot && !isPopupOrSidepanel && FirstTabComponent ? (
+              <FirstTabComponent />
+            ) : (
+              children
+            )}
+          </Suspense>
+        </Box>
+      </Box>
+    );
+  }
+
   return (
     <Box
       flexDirection={BoxFlexDirection.Column}
       backgroundColor={BoxBackgroundColor.BackgroundDefault}
       className="h-full w-full shadow-xs"
     >
+      {showShieldEntryModal && (
+        <ShieldEntryModal
+          skipEventSubmission
+          onClose={() => setShowShieldEntryModal(false)}
+        />
+      )}
       <SettingsV2Header
         title={headerTitle}
         isPopupOrSidepanel={isPopupOrSidepanel}
@@ -138,116 +407,7 @@ const SettingsV2Layout = ({ children }: { children: React.ReactNode }) => {
         onSearchChange={setSearchValue}
         onSearchClear={() => setSearchValue('')}
       />
-      {isSearchOpen && searchValue.trim().length >= MIN_SEARCH_LENGTH ? (
-        <div className="settings-page__content flex-1 overflow-y-auto">
-          <SettingsV2SearchResults
-            results={searchResults}
-            onClickResult={(item) => {
-              navigate(`${item.tabRoute}#${item.settingId}`);
-              handleCloseSearch();
-            }}
-          />
-        </div>
-      ) : (
-        <Box
-          flexDirection={BoxFlexDirection.Row}
-          // 64px is the header height
-          className={classnames(`h-[calc(100%-64px)]`, {
-            'sm:border-t sm:border-border-muted': !isSidepanel,
-          })}
-        >
-          <Box
-            className={classnames(
-              'w-full h-full sm:max-w-[262px] sm:bg-background-muted',
-              {
-                flex: isOnSettingsRoot,
-                'hidden sm:flex': !isOnSettingsRoot && !isSidepanel,
-                hidden: !isOnSettingsRoot && isSidepanel,
-                'sm:max-w-full sm:bg-background-default':
-                  isOnSettingsRoot && isSidepanel,
-              },
-            )}
-          >
-            <TabBar
-              tabs={itemTabs}
-              isActive={(key) => {
-                // First tab is active when at settings root
-                if (key === FIRST_TAB_PATH && pathname === SETTINGS_V2_ROUTE) {
-                  return true;
-                }
-                return pathname === key || pathname.startsWith(`${key}/`);
-              }}
-              removeFullscreenStyles={isPopupOrSidepanel}
-            />
-          </Box>
-          <Box
-            className={classnames('flex-auto flex-col w-full', {
-              flex: !isOnSettingsRoot,
-              'hidden sm:flex': isOnSettingsRoot && !isSidepanel,
-              hidden: isOnSettingsRoot && isSidepanel,
-            })}
-          >
-            {showBreadcrumbs && (
-              <Box
-                className="hidden sm:flex"
-                flexDirection={BoxFlexDirection.Row}
-                alignItems={BoxAlignItems.Center}
-                gap={2}
-                paddingHorizontal={4}
-                paddingVertical={3}
-              >
-                {breadcrumbs.map((crumb, index) => {
-                  const isFirst = index === 0;
-                  const isLast = index === breadcrumbs.length - 1;
-                  return (
-                    <Fragment key={crumb.path}>
-                      {!isFirst && (
-                        <Text
-                          variant={TextVariant.BodyMd}
-                          fontWeight={FontWeight.Medium}
-                          color={TextColor.TextAlternative}
-                        >
-                          {'>'}
-                        </Text>
-                      )}
-                      {isLast ? (
-                        <Text
-                          variant={TextVariant.BodyMd}
-                          fontWeight={FontWeight.Medium}
-                          color={TextColor.TextDefault}
-                        >
-                          {t(crumb.labelKey)}
-                        </Text>
-                      ) : (
-                        <Link
-                          to={crumb.path}
-                          className="flex items-center gap-2 cursor-pointer"
-                        >
-                          {isFirst && (
-                            <Icon
-                              name={IconName.ArrowLeft}
-                              size={IconSize.Sm}
-                              className="text-icon-alternative"
-                            />
-                          )}
-                          <Text
-                            variant={TextVariant.BodyMd}
-                            fontWeight={FontWeight.Medium}
-                            color={TextColor.TextAlternative}
-                          >
-                            {t(crumb.labelKey)}
-                          </Text>
-                        </Link>
-                      )}
-                    </Fragment>
-                  );
-                })}
-              </Box>
-            )}
-            <Suspense fallback={null}>{children}</Suspense>
-          </Box>
-        </Box>
-      )}
+      {mainContent}
     </Box>
   );
 };
@@ -270,7 +430,15 @@ const SettingsV2 = () => {
           }
         />
       ))}
-      {/* Catch-all and root: show first tab content */}
+      <Route
+        path={toRelativeRoutePath(SNAP_SETTINGS_ROUTE, SETTINGS_V2_ROUTE)}
+        element={
+          <SettingsV2Layout>
+            <SnapSettingsRenderer />
+          </SettingsV2Layout>
+        }
+      />
+      {/* Catch-all and root: layout handles popup root and fullscreen first-tab rendering */}
       <Route
         path="*"
         element={
diff --git a/ui/pages/settings-v2/shared/autodetect-nfts-item.test.tsx b/ui/pages/settings-v2/shared/autodetect-nfts-item.test.tsx
index c2898d0033d5..73ab013ea990 100644
--- a/ui/pages/settings-v2/shared/autodetect-nfts-item.test.tsx
+++ b/ui/pages/settings-v2/shared/autodetect-nfts-item.test.tsx
@@ -59,7 +59,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeEnabled);
 
-    expect(screen.getByTestId('use-nft-detection')).toHaveAttribute(
+    expect(screen.getByTestId('use-nft-detection-input')).toHaveAttribute(
       'value',
       'true',
     );
@@ -72,7 +72,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeDisabled);
 
-    expect(screen.getByTestId('use-nft-detection')).toHaveAttribute(
+    expect(screen.getByTestId('use-nft-detection-input')).toHaveAttribute(
       'value',
       'false',
     );
@@ -85,7 +85,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeEnabled);
 
-    fireEvent.click(screen.getByTestId('use-nft-detection'));
+    fireEvent.click(screen.getByTestId('use-nft-detection-input'));
 
     expect(mockSetUseNftDetection).toHaveBeenCalledWith(false);
   });
@@ -97,7 +97,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeDisabled);
 
-    fireEvent.click(screen.getByTestId('use-nft-detection'));
+    fireEvent.click(screen.getByTestId('use-nft-detection-input'));
 
     expect(mockSetUseNftDetection).toHaveBeenCalledWith(true);
   });
@@ -113,7 +113,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeWithBothDisabled);
 
-    fireEvent.click(screen.getByTestId('use-nft-detection'));
+    fireEvent.click(screen.getByTestId('use-nft-detection-input'));
 
     expect(mockSetOpenSeaEnabled).toHaveBeenCalledWith(true);
     expect(mockSetUseNftDetection).toHaveBeenCalledWith(true);
@@ -130,7 +130,7 @@ describe('AutodetectNftsToggleItem', () => {
     });
     renderWithProvider(<AutodetectNftsToggleItem />, storeWithOpenSeaEnabled);
 
-    fireEvent.click(screen.getByTestId('use-nft-detection'));
+    fireEvent.click(screen.getByTestId('use-nft-detection-input'));
 
     expect(mockSetOpenSeaEnabled).not.toHaveBeenCalled();
     expect(mockSetUseNftDetection).toHaveBeenCalledWith(true);
diff --git a/ui/pages/settings-v2/shared/autodetect-nfts-item.tsx b/ui/pages/settings-v2/shared/autodetect-nfts-item.tsx
index bb43ae00db2d..b003b2df038f 100644
--- a/ui/pages/settings-v2/shared/autodetect-nfts-item.tsx
+++ b/ui/pages/settings-v2/shared/autodetect-nfts-item.tsx
@@ -38,7 +38,8 @@ export const AutodetectNftsToggleItem = () => {
         }
         dispatch(setUseNftDetection(!value));
       }}
-      dataTestId="use-nft-detection"
+      dataTestId="use-nft-detection-input"
+      containerDataTestId="use-nft-detection"
     />
   );
 };
diff --git a/ui/pages/settings-v2/shared/create-select-item.tsx b/ui/pages/settings-v2/shared/create-select-item.tsx
index 18bf3a04dfd5..9d066cccfce0 100644
--- a/ui/pages/settings-v2/shared/create-select-item.tsx
+++ b/ui/pages/settings-v2/shared/create-select-item.tsx
@@ -14,6 +14,7 @@ export type SelectItemConfig = {
   /** Optional formatter to transform the value. Receives translation function for i18n. */
   formatValue?: (value: string, t: TranslateFunction) => string | ReactNode;
   route: string;
+  dataTestId?: string;
 };
 
 /**
@@ -36,6 +37,7 @@ export const createSelectItem = (
         label={t(config.titleKey)}
         value={displayValue}
         to={config.route}
+        dataTestId={config.dataTestId}
       />
     );
   };
diff --git a/ui/pages/settings-v2/shared/create-toggle-item.tsx b/ui/pages/settings-v2/shared/create-toggle-item.tsx
index db77aeb9e24f..ad2271bb27f4 100644
--- a/ui/pages/settings-v2/shared/create-toggle-item.tsx
+++ b/ui/pages/settings-v2/shared/create-toggle-item.tsx
@@ -51,7 +51,6 @@ export const createToggleItem = (
 
     const handleToggle = (currentValue: boolean) => {
       const newValue = !currentValue;
-      dispatch(config.action(newValue));
 
       if (config.trackEvent) {
         trackEvent({
@@ -60,6 +59,11 @@ export const createToggleItem = (
           properties: config.trackEvent.properties(newValue),
         });
       }
+
+      const result = config.action(newValue);
+      if (result !== undefined) {
+        dispatch(result);
+      }
     };
 
     let description: string | React.ReactNode;
diff --git a/ui/pages/settings-v2/shared/divider.tsx b/ui/pages/settings-v2/shared/divider.tsx
index 3c9cac98534f..87b89517d8a1 100644
--- a/ui/pages/settings-v2/shared/divider.tsx
+++ b/ui/pages/settings-v2/shared/divider.tsx
@@ -4,6 +4,6 @@ import { Box, BoxBackgroundColor } from '@metamask/design-system-react';
 export const Divider = () => (
   <Box
     backgroundColor={BoxBackgroundColor.BackgroundMuted}
-    className="my-2 h-px w-full"
+    className="my-2 h-px w-full mx-4"
   />
 );
diff --git a/ui/pages/settings-v2/shared/index.ts b/ui/pages/settings-v2/shared/index.ts
index e4f4b917ebf1..f34577cfc0aa 100644
--- a/ui/pages/settings-v2/shared/index.ts
+++ b/ui/pages/settings-v2/shared/index.ts
@@ -8,4 +8,5 @@ export { PrivacyPolicyLink } from './privacy-policy-link';
 export { SettingsTab } from './settings-tab';
 export { SettingsSelectItem } from './settings-select-item';
 export { SettingsV2Header } from './settings-v2-header';
+export { SettingsV2Root } from './settings-v2-root';
 export { SettingsV2SearchResults } from './settings-v2-search-results';
diff --git a/ui/pages/settings-v2/shared/settings-select-item.tsx b/ui/pages/settings-v2/shared/settings-select-item.tsx
index 7fee19d53291..d7130cc1137e 100644
--- a/ui/pages/settings-v2/shared/settings-select-item.tsx
+++ b/ui/pages/settings-v2/shared/settings-select-item.tsx
@@ -20,47 +20,55 @@ type SettingsSelectItemProps = {
   value: string | ReactNode;
   /** Route to navigate to when the item is selected */
   to: string;
+  /** Optional test id for the clickable navigation control */
+  dataTestId?: string;
 };
 
 export const SettingsSelectItem = ({
   label,
   value,
   to,
+  dataTestId,
 }: SettingsSelectItemProps) => {
   return (
-    <Box
-      flexDirection={BoxFlexDirection.Row}
-      justifyContent={BoxJustifyContent.Between}
-      alignItems={BoxAlignItems.Center}
-      paddingVertical={3}
+    <Link
+      to={to}
+      className="block hover:bg-background-default-hover"
+      data-testid={dataTestId}
     >
-      <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
-        {label}
-      </Text>
       <Box
         flexDirection={BoxFlexDirection.Row}
+        justifyContent={BoxJustifyContent.Between}
         alignItems={BoxAlignItems.Center}
-        gap={1}
+        paddingVertical={3}
+        paddingHorizontal={4}
       >
-        {typeof value === 'string' ? (
-          <Text
-            color={TextColor.TextAlternative}
-            variant={TextVariant.BodyMd}
-            fontWeight={FontWeight.Medium}
-          >
-            {value}
-          </Text>
-        ) : (
-          value
-        )}
-        <Link to={to} className="flex ml-1">
+        <Text variant={TextVariant.BodyMd} fontWeight={FontWeight.Medium}>
+          {label}
+        </Text>
+        <Box
+          flexDirection={BoxFlexDirection.Row}
+          alignItems={BoxAlignItems.Center}
+          gap={1}
+        >
+          {typeof value === 'string' ? (
+            <Text
+              color={TextColor.TextAlternative}
+              variant={TextVariant.BodyMd}
+              fontWeight={FontWeight.Medium}
+            >
+              {value}
+            </Text>
+          ) : (
+            value
+          )}
           <Icon
             name={IconName.ArrowRight}
             size={IconSize.Sm}
             className="text-icon-alternative"
           />
-        </Link>
+        </Box>
       </Box>
-    </Box>
+    </Link>
   );
 };
diff --git a/ui/pages/settings-v2/shared/settings-tab.tsx b/ui/pages/settings-v2/shared/settings-tab.tsx
index 14a48bb288e7..81ce1733314e 100644
--- a/ui/pages/settings-v2/shared/settings-tab.tsx
+++ b/ui/pages/settings-v2/shared/settings-tab.tsx
@@ -56,12 +56,12 @@ export const SettingsTab = ({
   }, [hash, items, settingsRefs]);
 
   return (
-    <Box paddingHorizontal={4} paddingBottom={4} className="overflow-y-auto">
+    <Box paddingBottom={4} className="overflow-y-auto">
       {subHeader && (
         <Text
           variant={TextVariant.BodyMd}
           color={TextColor.TextAlternative}
-          className="py-2"
+          className="py-2 px-4"
         >
           {subHeader}
         </Text>
diff --git a/ui/pages/settings-v2/shared/settings-v2-header.tsx b/ui/pages/settings-v2/shared/settings-v2-header.tsx
index d3a0680ccdc2..6caeb4d2aac0 100644
--- a/ui/pages/settings-v2/shared/settings-v2-header.tsx
+++ b/ui/pages/settings-v2/shared/settings-v2-header.tsx
@@ -106,7 +106,7 @@ export const SettingsV2Header = ({
       <ButtonIcon
         iconName={IconName.ArrowLeft}
         ariaLabel={t('back')}
-        size={ButtonIconSize.Md}
+        size={ButtonIconSize.Sm}
         onClick={onClose}
         data-testid="settings-v2-header-back-button"
       />
diff --git a/ui/pages/settings-v2/shared/settings-v2-root.tsx b/ui/pages/settings-v2/shared/settings-v2-root.tsx
new file mode 100644
index 000000000000..32d043a38fc9
--- /dev/null
+++ b/ui/pages/settings-v2/shared/settings-v2-root.tsx
@@ -0,0 +1,124 @@
+import React, { useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  FontWeight,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  SETTINGS_V2_ROOT_SECTIONS,
+  SETTINGS_V2_TABS,
+} from '../settings-registry';
+
+type RootListItem = {
+  id: string;
+  path: string;
+  iconName: IconName;
+  labelKey: string;
+};
+
+type SettingsV2RootProps = {
+  /** Called before navigating. Return `true` to prevent navigation. */
+  onBeforeNavigate?: (path: string) => boolean | void;
+};
+
+export const SettingsV2Root = ({ onBeforeNavigate }: SettingsV2RootProps) => {
+  const t = useI18nContext();
+  const navigate = useNavigate();
+
+  const groupedItems = useMemo(() => {
+    const rootItems: RootListItem[] = SETTINGS_V2_TABS.map((item) => ({
+      id: item.id,
+      path: item.path,
+      iconName: item.iconName,
+      labelKey: item.labelKey,
+    }));
+
+    return SETTINGS_V2_ROOT_SECTIONS.map(({ titleKeys, paths }) => ({
+      titleKeys,
+      items: rootItems.filter((item) => paths.includes(item.path)),
+    })).filter(({ items }) => items.length > 0);
+  }, []);
+
+  const handleSelectItem = (item: RootListItem) => {
+    if (onBeforeNavigate?.(item.path) === true) {
+      return;
+    }
+    navigate(item.path);
+  };
+
+  return (
+    <Box
+      flexDirection={BoxFlexDirection.Column}
+      className="w-full h-full overflow-y-auto"
+      data-testid="settings-v2-root"
+    >
+      {groupedItems.map(({ titleKeys, items }, index) => {
+        return (
+          <Box
+            key={titleKeys.join('-')}
+            flexDirection={BoxFlexDirection.Column}
+            className="w-full"
+          >
+            <Text
+              variant={TextVariant.BodyMd}
+              color={TextColor.TextAlternative}
+              className="px-4 pt-3 pb-2"
+            >
+              {titleKeys.map((key) => t(key))}
+            </Text>
+            <Box flexDirection={BoxFlexDirection.Column} className="w-full">
+              {items.map((item) => (
+                <button
+                  key={item.id}
+                  type="button"
+                  className="w-full border-0 bg-transparent p-0 text-left text-inherit cursor-pointer hover:bg-background-default-hover"
+                  onClick={() => handleSelectItem(item)}
+                  data-testid={`settings-v2-root-item-${item.id}`}
+                >
+                  <Box
+                    flexDirection={BoxFlexDirection.Row}
+                    alignItems={BoxAlignItems.Center}
+                    className="w-full gap-2 px-4 py-3"
+                  >
+                    <Icon
+                      name={item.iconName}
+                      size={IconSize.Md}
+                      color={IconColor.IconAlternative}
+                    />
+                    <Text
+                      variant={TextVariant.BodyMd}
+                      fontWeight={FontWeight.Medium}
+                      className="flex-1 min-w-0 text-left"
+                    >
+                      {t(item.labelKey)}
+                    </Text>
+                    <Icon
+                      name={IconName.ArrowRight}
+                      size={IconSize.Sm}
+                      color={IconColor.IconAlternative}
+                    />
+                  </Box>
+                </button>
+              ))}
+            </Box>
+            {index === groupedItems.length - 1 ? null : (
+              <Box className="w-full px-4 py-2">
+                <div className="w-full border-t border-border-muted" />
+              </Box>
+            )}
+          </Box>
+        );
+      })}
+    </Box>
+  );
+};
diff --git a/ui/pages/settings-v2/tab-bar.tsx b/ui/pages/settings-v2/tab-bar.tsx
index b029b888478e..27e365f5b3de 100644
--- a/ui/pages/settings-v2/tab-bar.tsx
+++ b/ui/pages/settings-v2/tab-bar.tsx
@@ -7,6 +7,7 @@ import {
   IconSize,
   IconColor,
   Text,
+  TextColor,
   TextVariant,
   BoxAlignItems,
   BoxJustifyContent,
@@ -18,64 +19,119 @@ type TabItem = {
   key: string;
   content: React.ReactNode;
   iconName: IconName;
+  dataTestId?: string;
+};
+
+type TabSection = {
+  key: string;
+  title: React.ReactNode;
+  items: TabItem[];
 };
 
 type TabBarProps = {
-  tabs: TabItem[];
+  tabs?: TabItem[];
+  sections?: TabSection[];
   isActive: (key: string, content?: React.ReactNode) => boolean;
   /** When true, disables fullscreen styles (active background, hidden caret) */
   removeFullscreenStyles?: boolean;
+  /** Called when a tab is clicked. Return `true` to prevent the default Link navigation. */
+  onTabClick?: (key: string) => boolean | void;
 };
 
 const TabBar = ({
   tabs = [],
+  sections = [],
   isActive,
   removeFullscreenStyles = false,
+  onTabClick,
 }: TabBarProps) => {
-  return (
-    <Box flexDirection={BoxFlexDirection.Column} className="w-full">
-      {tabs.map(({ key, content, iconName }) => {
-        const active = isActive(key, content);
+  const renderItems = (items: TabItem[]) =>
+    items.map(({ key, content, iconName, dataTestId }) => {
+      const active = isActive(key, content);
 
-        const activeClass =
-          active && !removeFullscreenStyles ? 'sm:bg-background-muted' : '';
+      const activeClass =
+        active && !removeFullscreenStyles ? 'sm:bg-background-muted' : '';
 
-        const caretClass = removeFullscreenStyles
-          ? 'rtl:rotate-180'
-          : 'sm:hidden rtl:rotate-180';
+      const caretClass = removeFullscreenStyles
+        ? 'rtl:rotate-180'
+        : 'sm:hidden rtl:rotate-180';
 
-        return (
-          <MenuItem
+      return (
+        <MenuItem
+          key={key}
+          to={key}
+          iconName={iconName}
+          iconColor={IconColor.IconAlternative}
+          iconSize={IconSize.Lg}
+          textVariant={TextVariant.BodyMd}
+          className={`!rounded-none focus:outline-none focus:[outline:none] focus-visible:outline-none focus-visible:[outline:none] focus:shadow-none ${activeClass}`}
+          data-testid={dataTestId}
+          onClick={
+            onTabClick
+              ? (e?: React.MouseEvent) => {
+                  if (onTabClick(key) === true) {
+                    e?.preventDefault();
+                  }
+                }
+              : undefined
+          }
+        >
+          <Box
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            justifyContent={BoxJustifyContent.Between}
+            className="w-full"
+          >
+            <Text fontWeight={FontWeight.Medium} className="whitespace-nowrap">
+              {content}
+            </Text>
+            <Icon
+              name={IconName.ArrowRight}
+              size={IconSize.Sm}
+              color={IconColor.IconAlternative}
+              className={caretClass}
+            />
+          </Box>
+        </MenuItem>
+      );
+    });
+
+  if (sections.length > 0) {
+    return (
+      <Box
+        flexDirection={BoxFlexDirection.Column}
+        className="w-full h-full overflow-y-auto py-4"
+        data-testid="settings-v2-tab-bar-grouped"
+      >
+        {sections.map(({ key, title, items }, sectionIndex) => (
+          <Box
             key={key}
-            to={key}
-            iconName={iconName}
-            iconColor={IconColor.IconAlternative}
-            iconSize={IconSize.Lg}
-            textVariant={TextVariant.BodyMd}
-            className={`!rounded-none ${activeClass}`}
+            flexDirection={BoxFlexDirection.Column}
+            className="w-full"
           >
             <Box
-              flexDirection={BoxFlexDirection.Row}
-              alignItems={BoxAlignItems.Center}
-              justifyContent={BoxJustifyContent.Between}
-              className="w-full"
+              className="mx-4"
+              paddingTop={sectionIndex > 0 ? 4 : 2}
+              paddingBottom={2}
             >
               <Text
+                variant={TextVariant.BodyMd}
                 fontWeight={FontWeight.Medium}
-                className="whitespace-nowrap"
+                color={TextColor.TextAlternative}
               >
-                {content}
+                {title}
               </Text>
-              <Icon
-                name={IconName.ArrowRight}
-                size={IconSize.Sm}
-                color={IconColor.IconAlternative}
-                className={caretClass}
-              />
             </Box>
-          </MenuItem>
-        );
-      })}
+            {renderItems(items)}
+          </Box>
+        ))}
+      </Box>
+    );
+  }
+
+  return (
+    <Box flexDirection={BoxFlexDirection.Column} className="w-full pt-2">
+      {renderItems(tabs)}
     </Box>
   );
 };
diff --git a/ui/pages/settings-v2/transaction-shield-tab/manage-past-plan-sub-page.tsx b/ui/pages/settings-v2/transaction-shield-tab/manage-past-plan-sub-page.tsx
new file mode 100644
index 000000000000..552d844e8b39
--- /dev/null
+++ b/ui/pages/settings-v2/transaction-shield-tab/manage-past-plan-sub-page.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import ManageShieldPlan from '../../settings/transaction-shield-tab/manage-shield-plan/manage-shield-plan';
+
+const ManagePastPlanSubPage = () => {
+  return <ManageShieldPlan isPastPlan />;
+};
+
+export default ManagePastPlanSubPage;
diff --git a/ui/pages/settings-v2/transaction-shield-tab/manage-plan-sub-page.tsx b/ui/pages/settings-v2/transaction-shield-tab/manage-plan-sub-page.tsx
new file mode 100644
index 000000000000..f34c1dd8a4b9
--- /dev/null
+++ b/ui/pages/settings-v2/transaction-shield-tab/manage-plan-sub-page.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import ManageShieldPlan from '../../settings/transaction-shield-tab/manage-shield-plan/manage-shield-plan';
+
+const ManagePlanSubPage = () => {
+  return <ManageShieldPlan />;
+};
+
+export default ManagePlanSubPage;
diff --git a/ui/pages/settings-v2/transactions-tab/__snapshots__/transactions-tab.test.tsx.snap b/ui/pages/settings-v2/transactions-tab/__snapshots__/transactions-tab.test.tsx.snap
index 6fa39551847a..09b8ab041413 100644
--- a/ui/pages/settings-v2/transactions-tab/__snapshots__/transactions-tab.test.tsx.snap
+++ b/ui/pages/settings-v2/transactions-tab/__snapshots__/transactions-tab.test.tsx.snap
@@ -3,11 +3,11 @@
 exports[`TransactionsTab snapshot matches snapshot 1`] = `
 <div>
   <div
-    class="pb-4 px-4 overflow-y-auto"
+    class="pb-4 overflow-y-auto"
   >
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -74,7 +74,7 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -84,7 +84,9 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
           >
             Security alerts
           </p>
-          <div>
+          <div
+            data-testid="securityAlert"
+          >
             <label
               class="toggle-button toggle-button--off"
               tabindex="0"
@@ -141,7 +143,7 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -208,7 +210,7 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -262,7 +264,7 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
     </div>
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -315,11 +317,11 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="bg-muted my-2 h-px w-full"
+      class="bg-muted my-2 h-px w-full mx-4"
     />
     <div>
       <div
-        class="flex flex-col gap-1 py-3"
+        class="flex flex-col gap-1 px-4 py-3"
       >
         <div
           class="flex flex-row items-center justify-between"
@@ -329,7 +331,9 @@ exports[`TransactionsTab snapshot matches snapshot 1`] = `
           >
             Show hex data
           </p>
-          <div>
+          <div
+            data-testid="transactions-settings-hex-data-toggle"
+          >
             <label
               class="toggle-button toggle-button--off"
               tabindex="0"
diff --git a/ui/pages/settings-v2/transactions-tab/transactions-tab.test.tsx b/ui/pages/settings-v2/transactions-tab/transactions-tab.test.tsx
index 91b3a47dc096..3ac886fd4e80 100644
--- a/ui/pages/settings-v2/transactions-tab/transactions-tab.test.tsx
+++ b/ui/pages/settings-v2/transactions-tab/transactions-tab.test.tsx
@@ -39,6 +39,7 @@ describe('TransactionsTab', () => {
         'transactions-smart-account-requests-toggle',
         'transactions-proposed-nicknames-toggle',
         'transactions-show-hex-data-toggle',
+        'transactions-settings-hex-data-toggle',
       ];
 
       for (const testId of expectedTestIds) {
diff --git a/ui/pages/settings-v2/transactions-tab/transactions-tab.tsx b/ui/pages/settings-v2/transactions-tab/transactions-tab.tsx
index 388543368e30..0ac162e03247 100644
--- a/ui/pages/settings-v2/transactions-tab/transactions-tab.tsx
+++ b/ui/pages/settings-v2/transactions-tab/transactions-tab.tsx
@@ -58,6 +58,7 @@ const SecurityAlertsItem = createToggleItem({
   selector: getIsSecurityAlertsEnabled,
   action: setSecurityAlertsEnabled,
   dataTestId: 'transactions-security-alerts-toggle',
+  containerDataTestId: 'securityAlert',
   disabledSelector: selectIsDisabledByShieldSubscription,
   trackEvent: {
     event: MetaMetricsEventName.SettingsUpdated,
@@ -109,6 +110,7 @@ const ShowHexDataItem = createToggleItem({
     Boolean(state.metamask?.featureFlags?.sendHexData),
   action: (value: boolean) => setFeatureFlag('sendHexData', value, ''),
   dataTestId: 'transactions-show-hex-data-toggle',
+  containerDataTestId: 'transactions-settings-hex-data-toggle',
 });
 
 const TRANSACTION_SETTING_ITEMS: SettingItemConfig[] = [
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 fc9320501915..896574cb3779 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
@@ -49,7 +49,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         <span
           class="settings-page__content-description"
         >
-          This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.
+          Resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.
         </span>
       </div>
       <div
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.tsx b/ui/pages/settings/experimental-tab/experimental-tab.tsx
index de8d1424b6cc..46d788484148 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.tsx
+++ b/ui/pages/settings/experimental-tab/experimental-tab.tsx
@@ -17,7 +17,7 @@ import { EXPERIMENTAL_ITEMS } from '../../settings-v2/search-config';
 
 const NotificationsItem = createToggleItem({
   name: 'NotificationsItem',
-  titleKey: EXPERIMENTAL_ITEMS.notifications,
+  titleKey: 'notificationsFeatureToggle',
   descriptionKey: 'notificationsFeatureToggleDescription',
   selector: getFeatureNotificationsEnabled,
   action: setFeatureNotificationsEnabled,
diff --git a/ui/pages/settings/info-tab/info-tab.test.tsx b/ui/pages/settings/info-tab/info-tab.test.tsx
index 26fc87b077d6..e078fe6daa45 100644
--- a/ui/pages/settings/info-tab/info-tab.test.tsx
+++ b/ui/pages/settings/info-tab/info-tab.test.tsx
@@ -47,7 +47,7 @@ describe('InfoTab', () => {
       });
       expect(attributionsLink).toHaveAttribute(
         'href',
-        `https://raw.githubusercontent.com/MetaMask/metamask-extension/vMOCK_VERSION/attribution.txt`,
+        'https://raw.githubusercontent.com/MetaMask/metamask-extension/main/attribution.txt',
       );
     });
 
diff --git a/ui/pages/settings/info-tab/info-tab.tsx b/ui/pages/settings/info-tab/info-tab.tsx
index 238c01df34ad..8a07cc15fba6 100644
--- a/ui/pages/settings/info-tab/info-tab.tsx
+++ b/ui/pages/settings/info-tab/info-tab.tsx
@@ -31,6 +31,7 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import VisitSupportDataConsentModal from '../../../components/app/modals/visit-support-data-consent-modal';
+import { Divider } from '../../settings-v2/shared';
 
 export default function InfoTab(): React.ReactElement {
   const t = useI18nContext();
@@ -81,24 +82,22 @@ export default function InfoTab(): React.ReactElement {
 
     const linkProps = {
       size: TextButtonSize.BodyMd,
-      className: 'text-default',
+      className:
+        'w-full justify-start text-default !bg-transparent p-0 text-left',
     };
 
     const linkItemProps = {
-      paddingTop: 4 as const,
-      paddingBottom: 4 as const,
+      paddingTop: 3 as const,
+      paddingBottom: 3 as const,
+      className: 'w-full',
     };
 
-    const separatorBox = (
-      <Box className="mt-4 mb-4 border-t border-border-muted" />
-    );
-
     return (
       <Box
         ref={settingsRefs[1]}
         flexDirection={BoxFlexDirection.Column}
         alignItems={BoxAlignItems.Start}
-        className="settings-page__content-item settings-page__content-item--without-height w-full px-0"
+        className="w-full"
       >
         <Box ref={settingsRefs[2]} {...linkItemProps}>
           <TextButton asChild {...linkProps}>
@@ -122,7 +121,7 @@ export default function InfoTab(): React.ReactElement {
           <Box ref={settingsRefs[8]} {...linkItemProps}>
             <TextButton asChild {...linkProps}>
               <a
-                href="https://metamask.io/beta-terms.html"
+                href="https://metamask.io/beta-terms"
                 target="_blank"
                 rel="noopener noreferrer"
               >
@@ -134,7 +133,7 @@ export default function InfoTab(): React.ReactElement {
         <Box ref={settingsRefs[4]} {...linkItemProps}>
           <TextButton asChild {...linkProps}>
             <a
-              href={`https://raw.githubusercontent.com/MetaMask/metamask-extension/v${version}/attribution.txt`}
+              href="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/attribution.txt"
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -142,7 +141,7 @@ export default function InfoTab(): React.ReactElement {
             </a>
           </TextButton>
         </Box>
-        {separatorBox}
+        <Divider />
         <Box ref={settingsRefs[5]} {...linkItemProps}>
           <TextButton
             onClick={toggleVisitSupportDataConsentModal}
@@ -158,7 +157,6 @@ export default function InfoTab(): React.ReactElement {
             </a>
           </TextButton>
         </Box>
-        {separatorBox}
         <Box ref={settingsRefs[7]} {...linkItemProps}>
           <TextButton asChild {...linkProps}>
             <a
@@ -180,34 +178,31 @@ export default function InfoTab(): React.ReactElement {
     : t('metamaskVersion');
 
   return (
-    <Box className="settings-page__body px-0">
-      <Box className="settings-page__content-row">
-        <Box
-          flexDirection={BoxFlexDirection.Column}
-          alignItems={BoxAlignItems.Center}
-          paddingBottom={6}
-          gap={4}
-          className="settings-page__content-item settings-page__content-item--without-height w-full px-0"
+    <Box
+      flexDirection={BoxFlexDirection.Column}
+      alignItems={BoxAlignItems.Center}
+      paddingTop={3}
+      paddingBottom={6}
+      gap={4}
+      paddingHorizontal={4}
+    >
+      <Box>
+        <img
+          src="./images/logo/metamask-fox.svg"
+          alt="MetaMask Logo"
+          className="info-tab__logo w-24 h-24"
+        />
+      </Box>
+      <Box ref={settingsRefs[0]} data-testid="info-tab-version">
+        <Text
+          variant={TextVariant.BodySm}
+          color={TextColor.TextAlternative}
+          className="info-tab__version-number"
         >
-          <Box>
-            <img
-              src="./images/logo/metamask-fox.svg"
-              alt="MetaMask Logo"
-              className="info-tab__logo w-24 h-24"
-            />
-          </Box>
-          <Box ref={settingsRefs[0]} data-testid="info-tab-version">
-            <Text
-              variant={TextVariant.BodySm}
-              color={TextColor.TextAlternative}
-              className="info-tab__version-number"
-            >
-              {versionLabel} {version}
-            </Text>
-          </Box>
-          {renderInfoLinks()}
-        </Box>
+          {versionLabel} {version}
+        </Text>
       </Box>
+      {renderInfoLinks()}
       {isVisitSupportDataConsentModalOpen && (
         <VisitSupportDataConsentModal
           isOpen={isVisitSupportDataConsentModalOpen}
diff --git a/ui/pages/settings/security-tab/change-password/change-password.tsx b/ui/pages/settings/security-tab/change-password/change-password.tsx
index 238283819648..1db55219b5a8 100644
--- a/ui/pages/settings/security-tab/change-password/change-password.tsx
+++ b/ui/pages/settings/security-tab/change-password/change-password.tsx
@@ -48,7 +48,13 @@ const ChangePasswordSteps = {
   ChangePasswordLoading: 3,
 };
 
-const ChangePassword = () => {
+type ChangePasswordProps = {
+  redirectRoute?: string;
+};
+
+const ChangePassword = ({
+  redirectRoute = SECURITY_ROUTE,
+}: ChangePasswordProps) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
   const navigate = useNavigate();
@@ -114,7 +120,7 @@ const ChangePassword = () => {
       });
 
       // upon successful password change, go back to the settings page
-      navigate(SECURITY_ROUTE);
+      navigate(redirectRoute);
       dispatch(setShowPasswordChangeToast(PasswordChangeToastType.Success));
     } catch (error) {
       console.error(error);
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
index e43d5d536d30..b2752f53b317 100644
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
@@ -10,6 +10,7 @@ import { selectIsBackupAndSyncEnabled } from '../../../../selectors/identity/bac
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../../shared/constants/metametrics';
 import { Box, Text } from '../../../../components/component-library';
 import ToggleButton from '../../../../components/ui/toggle-button';
@@ -67,7 +68,6 @@ const MetametricsToggle = ({
         await setDataCollectionForMarketing(false);
       }
 
-      await disableMetametrics();
       trackEvent({
         category: MetaMetricsEventCategory.Settings,
         event: MetaMetricsEventName.TurnOffMetaMetrics,
@@ -81,15 +81,13 @@ const MetametricsToggle = ({
         category: MetaMetricsEventCategory.Settings,
         event: MetaMetricsEventName.AnalyticsPreferenceSelected,
         properties: {
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          is_metrics_opted_in: false,
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          has_marketing_consent: false,
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: false,
+          [MetaMetricsUserTrait.HasMarketingConsent]: false,
           location: 'Settings',
         },
       });
+
+      await disableMetametrics();
     }
   };
 
diff --git a/ui/pages/settings/security-tab/reveal-srp-list/reveal-srp-list.tsx b/ui/pages/settings/security-tab/reveal-srp-list/reveal-srp-list.tsx
index c93b503b1a51..ad8445e1ec53 100644
--- a/ui/pages/settings/security-tab/reveal-srp-list/reveal-srp-list.tsx
+++ b/ui/pages/settings/security-tab/reveal-srp-list/reveal-srp-list.tsx
@@ -143,6 +143,7 @@ export const RevealSrpList = () => {
         paddingRight={4}
         paddingBottom={0}
         className="srp-reveal-list__srp-list"
+        data-testid="select-srp-container"
       >
         <Text
           marginBottom={2}
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index cbf3c2b0baea..d7187046767f 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -13,6 +13,7 @@ import {
   MetaMetricsEventCategory,
   MetaMetricsEventKeyType,
   MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../../../shared/constants/metametrics';
 import {
   IPFS_DEFAULT_GATEWAY_URL,
@@ -190,8 +191,8 @@ export default class SecurityTab extends PureComponent {
         category: MetaMetricsEventCategory.Settings,
         event: MetaMetricsEventName.AnalyticsPreferenceSelected,
         properties: {
-          is_metrics_opted_in: true,
-          has_marketing_consent: Boolean(value),
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+          [MetaMetricsUserTrait.HasMarketingConsent]: Boolean(value),
           location: 'Settings',
         },
       });
diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js
index b40de33cb4b8..75fcf0c4a169 100644
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@@ -63,7 +63,6 @@ export default class SettingsTab extends PureComponent {
     setCurrentCurrency: PropTypes.func,
     updateCurrentLocale: PropTypes.func,
     currentLocale: PropTypes.string,
-    useBlockie: PropTypes.bool,
     currentCurrency: PropTypes.string,
     showNativeTokenAsMainBalance: PropTypes.bool,
     setShowNativeTokenAsMainBalancePreference: PropTypes.func,
@@ -301,15 +300,9 @@ export default class SettingsTab extends PureComponent {
 
   renderBlockieOptIn() {
     const { t } = this.context;
-    const { useBlockie, avatarType, setAvatarType, selectedAddress } =
-      this.props;
-
-    let currentAvatarType;
-    if (avatarType !== undefined) {
-      currentAvatarType = avatarType;
-    } else if (useBlockie) {
-      currentAvatarType = 'blockies';
-    }
+    const { avatarType, setAvatarType, selectedAddress } = this.props;
+
+    const currentAvatarType = avatarType;
 
     return (
       <Box
diff --git a/ui/pages/settings/settings-tab/settings-tab.container.js b/ui/pages/settings/settings-tab/settings-tab.container.js
index 7f71047b2b1b..16a68aa5fb0a 100644
--- a/ui/pages/settings/settings-tab/settings-tab.container.js
+++ b/ui/pages/settings/settings-tab/settings-tab.container.js
@@ -22,7 +22,7 @@ import SettingsTab from './settings-tab.component';
 
 const mapStateToProps = (state) => {
   const { metamask } = state;
-  const { currentCurrency, useBlockie, currentLocale } = metamask;
+  const { currentCurrency, currentLocale } = metamask;
   const { ticker: nativeCurrency } = getProviderConfig(state);
   const { address: selectedAddress } = getSelectedInternalAccount(state);
   const {
@@ -39,7 +39,6 @@ const mapStateToProps = (state) => {
     currentLocale,
     currentCurrency,
     nativeCurrency,
-    useBlockie,
     avatarType,
     showNativeTokenAsMainBalance,
     hideZeroBalanceTokens,
diff --git a/ui/pages/settings/settings-toggle-item.tsx b/ui/pages/settings/settings-toggle-item.tsx
index 574b8fd22fc0..54a3e1878d67 100644
--- a/ui/pages/settings/settings-toggle-item.tsx
+++ b/ui/pages/settings/settings-toggle-item.tsx
@@ -30,7 +30,12 @@ export const SettingsToggleItem = ({
   dataTestId,
   disabled,
 }: SettingsToggleItemProps) => (
-  <Box flexDirection={BoxFlexDirection.Column} gap={1} paddingVertical={3}>
+  <Box
+    flexDirection={BoxFlexDirection.Column}
+    gap={1}
+    paddingVertical={3}
+    paddingHorizontal={4}
+  >
     <Box
       flexDirection={BoxFlexDirection.Row}
       justifyContent={BoxJustifyContent.Between}
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 2705a2be28a2..1ec8a1660953 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -438,7 +438,7 @@ class SettingsPage extends PureComponent {
 
     if (process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS || process.env.IN_TEST) {
       tabs.splice(-1, 0, {
-        content: t('developerOptions'),
+        content: t('debug'),
         icon: <Icon name={IconName.CodeCircle} />,
         key: DEVELOPER_OPTIONS_ROUTE,
       });
diff --git a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.stories.tsx b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.stories.tsx
index 5d3953b820d3..5eea733a7ad0 100644
--- a/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.stories.tsx
+++ b/ui/pages/smart-transactions/smart-transaction-status-page/smart-transaction-status-page.stories.tsx
@@ -3,9 +3,13 @@ import { Provider } from 'react-redux';
 import configureStore from '../../../store/store';
 import SmartTransactionStatusPage from './smart-transaction-status-page';
 import { Meta, StoryObj } from '@storybook/react';
-import { SimulationData } from '@metamask/transaction-controller';
+import {
+  SimulationData,
+  TransactionMeta,
+} from '@metamask/transaction-controller';
 import { mockNetworkState } from '../../../../test/stub/networks';
 import mockState from '../../../../test/data/mock-state.json';
+import { ConfirmContextProvider } from '../../confirmations/context/confirm';
 
 // Mock data
 const CHAIN_ID_MOCK = '0x1';
@@ -41,7 +45,17 @@ const storeMock = configureStore({
 const meta: Meta<typeof SmartTransactionStatusPage> = {
   title: 'Pages/SmartTransactions/SmartTransactionStatusPage',
   component: SmartTransactionStatusPage,
-  decorators: [(story) => <Provider store={storeMock}>{story()}</Provider>],
+  decorators: [
+    (story) => (
+      <Provider store={storeMock}>
+        <ConfirmContextProvider
+          currentConfirmationOverride={TX_MOCK as TransactionMeta}
+        >
+          {story()}
+        </ConfirmContextProvider>
+      </Provider>
+    ),
+  ],
 };
 
 export default meta;
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 66b79f770215..e14065993dfb 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -50,7 +50,6 @@ import {
   OFFLINE_FOR_MAINTENANCE,
 } from '../../../../shared/constants/swaps';
 import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
-import { isSwapsDefaultTokenSymbol } from '../../../../shared/lib/swaps.utils';
 import PulseLoader from '../../../components/ui/pulse-loader';
 import { isFlask, isBeta } from '../../../../shared/lib/build-types';
 
@@ -339,13 +338,8 @@ export default function AwaitingSwap({
             );
           } else if (errorKey) {
             await dispatch(navigateBackToPrepareSwap(navigate));
-          } else if (
-            isSwapsDefaultTokenSymbol(destinationTokenSymbol, chainId) ||
-            swapComplete
-          ) {
-            navigate(DEFAULT_ROUTE);
           } else {
-            navigate(`${DEFAULT_ROUTE}?tab=activity`);
+            navigate(DEFAULT_ROUTE);
           }
         }}
         onCancel={async () =>
diff --git a/ui/pages/unlock-page/__snapshots__/unlock-page.test.tsx.snap b/ui/pages/unlock-page/__snapshots__/unlock-page.test.tsx.snap
index ff4b256170b7..36c3e5deac22 100644
--- a/ui/pages/unlock-page/__snapshots__/unlock-page.test.tsx.snap
+++ b/ui/pages/unlock-page/__snapshots__/unlock-page.test.tsx.snap
@@ -62,7 +62,7 @@ exports[`Unlock Page should match snapshot 1`] = `
           </span>
         </button>
         <button
-          class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:bg-hover hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:bg-pressed active:text-primary-default-pressed active:decoration-primary-default-pressed mb-4"
+          class="inline-flex items-center justify-center font-medium min-w-20 overflow-hidden relative duration-100 ease-linear active:ease-[cubic-bezier(0.3,0.8,0.3,1)] h-auto rounded-none bg-transparent px-0 transform-none transition-none active:scale-100 text-primary-default hover:text-primary-default-hover hover:underline hover:decoration-primary-default-hover hover:decoration-2 hover:underline-offset-4 active:text-primary-default-pressed active:decoration-primary-default-pressed mb-4"
           color="text-primary-default"
           data-testid="unlock-forgot-password-button"
           role="button"
diff --git a/ui/providers/perps/PerpsStreamManager.ts b/ui/providers/perps/PerpsStreamManager.ts
index 78d898fc557c..82ad159e6d29 100644
--- a/ui/providers/perps/PerpsStreamManager.ts
+++ b/ui/providers/perps/PerpsStreamManager.ts
@@ -237,6 +237,13 @@ class PerpsStreamManager {
     this.optimisticTPSLOverrides.delete(symbol);
   }
 
+  /**
+   * Clears all optimistic TP/SL overrides (e.g. after closing every position).
+   */
+  clearAllOptimisticTPSL(): void {
+    this.optimisticTPSLOverrides.clear();
+  }
+
   /**
    * Push positions to the channel with optimistic overrides applied.
    * Use this instead of positions.pushData() when pushing data from REST
diff --git a/ui/providers/perps/getPerpsController.mock.ts b/ui/providers/perps/getPerpsController.mock.ts
index 0cb5864cf878..2e498622c484 100644
--- a/ui/providers/perps/getPerpsController.mock.ts
+++ b/ui/providers/perps/getPerpsController.mock.ts
@@ -76,9 +76,51 @@ class MockPerpsController {
    * @param options0
    * @param options0.cancelAll
    */
-  async cancelOrders({ cancelAll }: { cancelAll: boolean }): Promise<void> {
+  async cancelOrders({ cancelAll }: { cancelAll: boolean }): Promise<{
+    success: boolean;
+    successCount: number;
+    failureCount: number;
+    results: {
+      orderId: string;
+      symbol: string;
+      success: boolean;
+      error?: string;
+    }[];
+  }> {
     console.log(`[MockPerpsController] Canceling all orders: ${cancelAll}`);
     await new Promise((resolve) => setTimeout(resolve, 100));
+    return {
+      success: true,
+      successCount: 0,
+      failureCount: 0,
+      results: [],
+    };
+  }
+
+  /**
+   * Close all positions or a subset by symbol
+   *
+   * @param params
+   * @param params.closeAll
+   * @param params.symbols
+   */
+  async closePositions(params: {
+    closeAll?: boolean;
+    symbols?: string[];
+  }): Promise<{
+    success: boolean;
+    successCount: number;
+    failureCount: number;
+    results: { symbol: string; success: boolean; error?: string }[];
+  }> {
+    console.log('[MockPerpsController] Closing positions:', params);
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    return {
+      success: true,
+      successCount: 0,
+      failureCount: 0,
+      results: [],
+    };
   }
 
   /**
diff --git a/ui/selectors/assets.test.ts b/ui/selectors/assets.test.ts
index 282b76624104..288530673573 100644
--- a/ui/selectors/assets.test.ts
+++ b/ui/selectors/assets.test.ts
@@ -22,7 +22,6 @@ import {
   getAssetPreferences,
   getCustomAssets,
   getAssetsRates,
-  getHistoricalPrices,
   getMultiChainAssets,
   getMultichainNativeAssetType,
   getTokenByAccountAndAddressAndChainId,
@@ -360,26 +359,6 @@ describe('getAssetsRates', () => {
   });
 });
 
-describe('getHistoricalPrices', () => {
-  it('should return the assetsRates from the state', () => {
-    const result = getHistoricalPrices(mockRatesState);
-    expect(result).toEqual(mockRatesState.metamask.historicalPrices);
-  });
-
-  it('should return an empty object if historicalPrices is empty', () => {
-    const emptyState: AssetsRatesState = {
-      metamask: { conversionRates: {}, historicalPrices: {} },
-    };
-    const result = getHistoricalPrices(emptyState);
-    expect(result).toEqual({});
-  });
-
-  it('should return undefined if state does not have metamask property', () => {
-    const invalidState = {} as AssetsRatesState;
-    expect(() => getHistoricalPrices(invalidState)).toThrow();
-  });
-});
-
 describe('getMultiChainAssets', () => {
   const mockAccountId = '5132883f-598e-482c-a02b-84eeaa352f5b';
   const mockMultichainBalances = {
@@ -527,6 +506,7 @@ describe('getTokenByAccountAndAddressAndChainId', () => {
                   },
                   hidden: false,
                   pinned: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -538,8 +518,8 @@ describe('getTokenByAccountAndAddressAndChainId', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       },
+      selectedAccountGroup: 'entropy:01JKAF3DSGM3AB87EM9N0K41AJ/0',
       internalAccounts: {
         accounts: {
           '81b1ead4-334c-4921-9adf-282fde539752': {
@@ -1016,7 +996,8 @@ describe('Aggregated balance recomputation behavior', () => {
 
   it('does not recompute when unrelated state changes but used slice references are stable', () => {
     // Build stable references for used slices
-    const accountTree = { wallets: {}, selectedAccountGroup: '' };
+    const accountTree = { wallets: {} };
+    const selectedAccountGroup = '';
     const internalAccounts = { accounts: {}, selectedAccount: '' };
     const tokenBalances = {};
     const marketData = {};
@@ -1033,6 +1014,7 @@ describe('Aggregated balance recomputation behavior', () => {
     const baseState: BalanceCalculationState = {
       metamask: {
         // provide all used slices with stable refs
+        selectedAccountGroup,
         accountTree,
         internalAccounts,
         tokenBalances,
@@ -1056,6 +1038,7 @@ describe('Aggregated balance recomputation behavior', () => {
     const nextState: BalanceCalculationState = {
       metamask: {
         // reuse same references for used inputs
+        selectedAccountGroup,
         accountTree,
         internalAccounts,
         tokenBalances,
@@ -1090,7 +1073,8 @@ describe('Aggregated balance recomputation behavior', () => {
 
     const stateA: BalanceCalculationState = {
       metamask: {
-        accountTree: { wallets: {}, selectedAccountGroup: '' },
+        selectedAccountGroup: '',
+        accountTree: { wallets: {} },
         internalAccounts: { accounts: {}, selectedAccount: '' },
         tokenBalances: tokenBalancesA,
         marketData: {},
@@ -1193,6 +1177,7 @@ describe('selectAccountGroupBalanceForEmptyState', () => {
     accountScopes: string[],
     accountMetadata: Record<string, unknown> = {},
   ): Partial<BalanceCalculationState['metamask']> => ({
+    selectedAccountGroup: 'entropy:wallet1/group1',
     accountTree: {
       wallets: {
         'entropy:wallet1': {
@@ -1206,12 +1191,12 @@ describe('selectAccountGroupBalanceForEmptyState', () => {
                 name: 'Account 1',
                 hidden: false,
                 pinned: false,
+                lastSelected: 0,
               },
             },
           },
         },
       },
-      selectedAccountGroup: 'entropy:wallet1/group1',
     } as unknown as BalanceCalculationState['metamask']['accountTree'],
     internalAccounts: {
       accounts: {
diff --git a/ui/selectors/assets.ts b/ui/selectors/assets.ts
index 5c67dfc9b3a2..3e9b0870856c 100644
--- a/ui/selectors/assets.ts
+++ b/ui/selectors/assets.ts
@@ -93,7 +93,10 @@ import {
   getSelectedMultichainNetworkConfiguration,
   MultichainNetworkControllerState,
 } from './multichain/networks';
-import { getInternalAccountBySelectedAccountGroupAndCaip } from './multichain-accounts/account-tree';
+import {
+  getInternalAccountBySelectedAccountGroupAndCaip,
+  getSelectedAccountGroup,
+} from './multichain-accounts/account-tree';
 
 export type AssetsState = {
   metamask: MultichainAssetsControllerState;
@@ -207,6 +210,7 @@ export const selectAggregatedBalanceForSelectedAccount = createSelector(
     getCustomAssets,
     getCurrentCurrency,
     getSelectedInternalAccount,
+    getSelectedAccountGroup,
     getEnabledNetworks,
     (state: AggregatedBalanceState) => state.metamask?.accountTree,
     (state: AggregatedBalanceState) =>
@@ -238,6 +242,7 @@ export const selectAggregatedBalanceForSelectedAccount = createSelector(
     customAssets,
     selectedCurrency,
     selectedInternalAccount,
+    selectedAccountGroup,
     enabledNetworkMap,
     accountTree,
     isAccountTreeSyncingInProgress,
@@ -260,6 +265,7 @@ export const selectAggregatedBalanceForSelectedAccount = createSelector(
     };
     const accountTreeState: AccountTreeControllerState | undefined = accountTree
       ? {
+          selectedAccountGroup,
           accountTree,
           isAccountTreeSyncingInProgress:
             isAccountTreeSyncingInProgress ?? false,
@@ -307,16 +313,6 @@ export function getDefiPositions(
   return state?.metamask?.allDeFiPositions;
 }
 
-/**
- * Gets non-EVM assets historical prices.
- *
- * @param state - Redux state object.
- * @returns An object containing non-EVM assets historical prices per asset types (CAIP-19).
- */
-export function getHistoricalPrices(state: AssetsRatesState) {
-  return state.metamask.historicalPrices;
-}
-
 /**
  * @deprecated use selectBalanceByAccountGroup instead
  */
@@ -759,7 +755,6 @@ const getMetamaskState = (state: BalanceCalculationState) =>
 
 const EMPTY_ACCOUNT_TREE = Object.freeze({
   wallets: {},
-  selectedAccountGroup: '',
 });
 
 // Renamed for clarity
@@ -773,13 +768,22 @@ const selectAccountTreeStateForBalances = createSelector(
   [
     (state: BalanceCalculationState) => getMetamaskState(state).accountTree,
 
+    (state: BalanceCalculationState) =>
+      getMetamaskState(state).selectedAccountGroup,
+
     (state: BalanceCalculationState) =>
       getMetamaskState(state).accountGroupsMetadata,
 
     (state: BalanceCalculationState) =>
       getMetamaskState(state).accountWalletsMetadata,
   ],
-  (accountTree, accountGroupsMetadata, accountWalletsMetadata) => ({
+  (
+    accountTree,
+    selectedAccountGroup,
+    accountGroupsMetadata,
+    accountWalletsMetadata,
+  ) => ({
+    selectedAccountGroup: selectedAccountGroup ?? '',
     accountTree: accountTree ?? EMPTY_ACCOUNT_TREE,
     accountGroupsMetadata: accountGroupsMetadata ?? EMPTY_OBJECT,
     accountWalletsMetadata: accountWalletsMetadata ?? EMPTY_OBJECT,
@@ -825,10 +829,10 @@ const selectTokenRatesStateForBalances = createSelector(
  * Provides conversion rates and historical prices with stable fallbacks.
  */
 const selectMultichainRatesStateForBalances = createSelector(
-  [getMultichainAssetsRatesControllerConversionRates, getHistoricalPrices],
-  (conversionRates, historicalPrices) => ({
+  [getMultichainAssetsRatesControllerConversionRates],
+  (conversionRates) => ({
     conversionRates: conversionRates ?? EMPTY_OBJECT,
-    historicalPrices: historicalPrices ?? EMPTY_OBJECT,
+    historicalPrices: EMPTY_OBJECT,
   }),
 );
 
@@ -1092,7 +1096,7 @@ export const selectBalanceChangeBySelectedAccountGroup = (
       currencyRateState,
       enabledNetworkMap,
     ): BalanceChangeResult | null => {
-      const groupId = accountTreeState?.accountTree?.selectedAccountGroup;
+      const groupId = accountTreeState?.selectedAccountGroup;
       if (!groupId) {
         return null;
       }
@@ -1201,7 +1205,7 @@ export const selectAccountGroupBalanceForEmptyState = createSelector(
     allMainnetNetworksMap,
     accountsByChainId,
   ): boolean => {
-    const selectedGroupId = accountTreeState?.accountTree?.selectedAccountGroup;
+    const selectedGroupId = accountTreeState?.selectedAccountGroup;
     if (!selectedGroupId) {
       return false;
     }
@@ -1346,7 +1350,7 @@ export const selectAccountGroupBalanceForEmptyState = createSelector(
 export const selectBalanceBySelectedAccountGroup = createSelector(
   [selectAccountTreeStateForBalances, selectBalanceForAllWallets],
   (accountTreeState, allBalances) => {
-    const selectedGroupId = accountTreeState?.accountTree?.selectedAccountGroup;
+    const selectedGroupId = accountTreeState?.selectedAccountGroup;
     if (!selectedGroupId) {
       return null;
     }
@@ -1412,6 +1416,7 @@ export const selectBalanceByWallet = (walletId: string) =>
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- There is no type for the root state
 const getStateForAssetSelector = ({ metamask }: any) => {
   const initialState = {
+    selectedAccountGroup: metamask.selectedAccountGroup,
     accountTree: metamask.accountTree,
     internalAccounts: metamask.internalAccounts,
     allTokens: getTokensControllerAllTokens({ metamask }),
diff --git a/ui/selectors/multichain-accounts/account-tree.test.ts b/ui/selectors/multichain-accounts/account-tree.test.ts
index 86307af1f6ad..284cd85bfd29 100644
--- a/ui/selectors/multichain-accounts/account-tree.test.ts
+++ b/ui/selectors/multichain-accounts/account-tree.test.ts
@@ -85,6 +85,7 @@ describe('Multichain Accounts Selectors', () => {
                   entropy: { groupIndex: 0 },
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -94,7 +95,6 @@ describe('Multichain Accounts Selectors', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:test/0' as AccountGroupId,
       },
       {
         accounts: {},
@@ -106,6 +106,7 @@ describe('Multichain Accounts Selectors', () => {
         multichainNetworkConfigurationsByChainId:
           typedMockState.metamask.multichainNetworkConfigurationsByChainId,
       },
+      'entropy:test/0' as AccountGroupId,
     );
 
   const createStateWithoutMultichain = (): MultichainAccountsState =>
@@ -125,6 +126,7 @@ describe('Multichain Accounts Selectors', () => {
                   name: 'Test',
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -134,7 +136,6 @@ describe('Multichain Accounts Selectors', () => {
             },
           },
         },
-        selectedAccountGroup: 'keyring:Test/address' as AccountGroupId,
       },
       {
         accounts: {},
@@ -146,6 +147,7 @@ describe('Multichain Accounts Selectors', () => {
         multichainNetworkConfigurationsByChainId:
           typedMockState.metamask.multichainNetworkConfigurationsByChainId,
       },
+      'keyring:Test/address' as AccountGroupId,
     );
 
   // Helper to create state with mixed existing and missing accounts
@@ -171,6 +173,7 @@ describe('Multichain Accounts Selectors', () => {
                   entropy: { groupIndex: 0 },
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -180,7 +183,6 @@ describe('Multichain Accounts Selectors', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:test/0' as AccountGroupId,
       },
       {
         ...typedMockState.metamask.internalAccounts,
@@ -199,6 +201,7 @@ describe('Multichain Accounts Selectors', () => {
         multichainNetworkConfigurationsByChainId:
           typedMockState.metamask.multichainNetworkConfigurationsByChainId,
       },
+      'entropy:test/0' as AccountGroupId,
     );
 
   // Helper to create state with no matching accounts
@@ -224,6 +227,7 @@ describe('Multichain Accounts Selectors', () => {
                   entropy: { groupIndex: 0 },
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
             },
@@ -233,7 +237,6 @@ describe('Multichain Accounts Selectors', () => {
             },
           },
         },
-        selectedAccountGroup: 'entropy:test/0' as AccountGroupId,
       },
       {
         accounts: {},
@@ -245,6 +248,7 @@ describe('Multichain Accounts Selectors', () => {
         multichainNetworkConfigurationsByChainId:
           typedMockState.metamask.multichainNetworkConfigurationsByChainId,
       },
+      'entropy:test/0' as AccountGroupId,
     );
 
   describe('getAccountTree', () => {
@@ -256,6 +260,46 @@ describe('Multichain Accounts Selectors', () => {
   });
 
   describe('getWalletsWithAccounts', () => {
+    it('filters out account IDs that have no matching entry in internalAccounts (state corruption)', () => {
+      // Inject a stale/orphaned account ID into an existing group to simulate corruption
+      const corruptedState = {
+        ...typedMockState,
+        metamask: {
+          ...typedMockState.metamask,
+          accountTree: {
+            ...typedMockState.metamask.accountTree,
+            wallets: {
+              ...typedMockState.metamask.accountTree.wallets,
+              [ENTROPY_WALLET_1_ID]: {
+                ...typedMockState.metamask.accountTree.wallets[
+                  ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                ],
+                groups: {
+                  [ENTROPY_GROUP_1_ID]: {
+                    ...typedMockState.metamask.accountTree.wallets[
+                      ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                    ].groups[ENTROPY_GROUP_1_ID],
+                    accounts: [
+                      ACCOUNT_1_ID,
+                      'stale-orphaned-account-id-that-does-not-exist',
+                    ],
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as typeof typedMockState;
+
+      expect(() => getWalletsWithAccounts(corruptedState)).not.toThrow();
+      const result = getWalletsWithAccounts(corruptedState);
+      const accounts =
+        result[ENTROPY_WALLET_1_ID]?.groups[ENTROPY_GROUP_1_ID]?.accounts;
+      // Orphaned account ID must be filtered out; only the valid account remains
+      expect(accounts).toHaveLength(1);
+      expect(accounts?.[0].id).toBe(ACCOUNT_1_ID);
+    });
+
     it('returns wallets with accounts and their metadata', () => {
       const result = getWalletsWithAccounts(typedMockState);
 
@@ -330,6 +374,7 @@ describe('Multichain Accounts Selectors', () => {
                 },
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
             },
           },
@@ -383,6 +428,7 @@ describe('Multichain Accounts Selectors', () => {
                 },
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
             },
           },
@@ -432,6 +478,7 @@ describe('Multichain Accounts Selectors', () => {
                   name: 'Another Snap Account 1',
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
           },
@@ -481,6 +528,7 @@ describe('Multichain Accounts Selectors', () => {
                   name: 'Ledger Account 1',
                   pinned: false,
                   hidden: false,
+                  lastSelected: 0,
                 },
               },
           },
@@ -534,6 +582,7 @@ describe('Multichain Accounts Selectors', () => {
                 name: 'Snap Account 1',
                 pinned: false,
                 hidden: false,
+                lastSelected: 0,
               },
             },
           },
@@ -602,6 +651,72 @@ describe('Multichain Accounts Selectors', () => {
 
       expect(result).toBeNull();
     });
+
+    it('does not throw when the account tree references orphaned account IDs (state corruption)', () => {
+      const corruptedState = {
+        ...typedMockState,
+        metamask: {
+          ...typedMockState.metamask,
+          accountTree: {
+            ...typedMockState.metamask.accountTree,
+            wallets: {
+              ...typedMockState.metamask.accountTree.wallets,
+              [ENTROPY_WALLET_1_ID]: {
+                ...typedMockState.metamask.accountTree.wallets[
+                  ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                ],
+                groups: {
+                  [ENTROPY_GROUP_1_ID]: {
+                    ...typedMockState.metamask.accountTree.wallets[
+                      ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                    ].groups[ENTROPY_GROUP_1_ID],
+                    accounts: ['stale-orphaned-account-id-that-does-not-exist'],
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as typeof typedMockState;
+
+      expect(() =>
+        getWalletIdAndNameByAccountAddress(corruptedState, ACCOUNT_1_ADDRESS),
+      ).not.toThrow();
+    });
+
+    it('returns null when all accounts in the tree are orphaned (state corruption)', () => {
+      const corruptedState = {
+        ...typedMockState,
+        metamask: {
+          ...typedMockState.metamask,
+          accountTree: {
+            ...typedMockState.metamask.accountTree,
+            wallets: {
+              ...typedMockState.metamask.accountTree.wallets,
+              [ENTROPY_WALLET_1_ID]: {
+                ...typedMockState.metamask.accountTree.wallets[
+                  ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                ],
+                groups: {
+                  [ENTROPY_GROUP_1_ID]: {
+                    ...typedMockState.metamask.accountTree.wallets[
+                      ENTROPY_WALLET_1_ID as unknown as keyof typeof typedMockState.metamask.accountTree.wallets
+                    ].groups[ENTROPY_GROUP_1_ID],
+                    accounts: ['stale-orphaned-account-id-that-does-not-exist'],
+                  },
+                },
+              },
+            },
+          },
+        },
+      } as unknown as typeof typedMockState;
+
+      const result = getWalletIdAndNameByAccountAddress(
+        corruptedState,
+        ACCOUNT_1_ADDRESS,
+      );
+      expect(result).toBeNull();
+    });
   });
 
   describe('getInternalAccountByGroupAndCaip', () => {
@@ -678,7 +793,7 @@ describe('Multichain Accounts Selectors', () => {
       const result = getSelectedAccountGroup(typedMockState);
 
       expect(result).toStrictEqual(
-        typedMockState.metamask.accountTree.selectedAccountGroup,
+        typedMockState.metamask.selectedAccountGroup,
       );
     });
   });
@@ -701,6 +816,7 @@ describe('Multichain Accounts Selectors', () => {
           },
           pinned: false,
           hidden: false,
+          lastSelected: 0,
         },
       });
     });
@@ -814,6 +930,7 @@ describe('Multichain Accounts Selectors', () => {
                     name: 'Test',
                     pinned: false,
                     hidden: false,
+                    lastSelected: 0,
                   },
                 },
               },
@@ -823,7 +940,6 @@ describe('Multichain Accounts Selectors', () => {
               },
             },
           },
-          selectedAccountGroup: null as unknown as AccountGroupId,
         },
         {
           accounts: {},
@@ -835,6 +951,7 @@ describe('Multichain Accounts Selectors', () => {
           multichainNetworkConfigurationsByChainId:
             typedMockState.metamask.multichainNetworkConfigurationsByChainId,
         },
+        null as unknown as AccountGroupId,
       );
       const result = getMultichainAccountGroups(stateWithoutEntropy);
 
@@ -876,6 +993,7 @@ describe('Multichain Accounts Selectors', () => {
                     name: 'Test',
                     pinned: false,
                     hidden: false,
+                    lastSelected: 0,
                   },
                 },
               },
@@ -885,7 +1003,6 @@ describe('Multichain Accounts Selectors', () => {
               },
             },
           },
-          selectedAccountGroup: null as unknown as AccountGroupId,
         },
         {
           accounts: {},
@@ -897,6 +1014,7 @@ describe('Multichain Accounts Selectors', () => {
           multichainNetworkConfigurationsByChainId:
             typedMockState.metamask.multichainNetworkConfigurationsByChainId,
         },
+        null as unknown as AccountGroupId,
       );
       const result = getSingleAccountGroups(stateWithoutEntropy);
 
@@ -1218,6 +1336,7 @@ describe('Multichain Accounts Selectors', () => {
                     entropy: { groupIndex: 0 },
                     pinned: false,
                     hidden: false,
+                    lastSelected: 0,
                   },
                 },
               },
@@ -1227,7 +1346,6 @@ describe('Multichain Accounts Selectors', () => {
               },
             },
           },
-          selectedAccountGroup: 'entropy:ordered/0' as AccountGroupId,
         },
         {
           accounts: {
@@ -1249,6 +1367,8 @@ describe('Multichain Accounts Selectors', () => {
           },
           selectedAccount: 'account-1',
         },
+        undefined,
+        'entropy:ordered/0' as AccountGroupId,
       );
 
       const result = getInternalAccountsFromGroupById(
@@ -1431,7 +1551,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: ENTROPY_GROUP_1_ID as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Account 1', pinned: false, hidden: false },
+          metadata: {
+            name: 'Account 1',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Test Wallet',
           walletId: ENTROPY_WALLET_1_ID as AccountWalletId,
@@ -1439,7 +1564,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: ENTROPY_GROUP_2_ID as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Account 2', pinned: false, hidden: false },
+          metadata: {
+            name: 'Account 2',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Test Wallet 2',
           walletId: 'entropy:01JKAF3PJ247KAM6C03G5Q0NP8' as AccountWalletId,
@@ -1468,7 +1598,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: ENTROPY_GROUP_1_ID as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Valid Account', pinned: false, hidden: false },
+          metadata: {
+            name: 'Valid Account',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Test Wallet',
           walletId: ENTROPY_WALLET_1_ID as AccountWalletId,
@@ -1476,7 +1611,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: 'entropy:nonexistent/0' as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Invalid Account', pinned: false, hidden: false },
+          metadata: {
+            name: 'Invalid Account',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Invalid Wallet',
           walletId: 'entropy:nonexistent' as AccountWalletId,
@@ -1488,6 +1628,7 @@ describe('Multichain Accounts Selectors', () => {
             name: 'Another Valid Account',
             pinned: false,
             hidden: false,
+            lastSelected: 0,
           },
           accounts: [],
           walletName: 'Test Wallet 2',
@@ -1514,7 +1655,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: 'entropy:invalid1/0' as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Invalid 1', pinned: false, hidden: false },
+          metadata: {
+            name: 'Invalid 1',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Invalid Wallet 1',
           walletId: 'entropy:invalid1' as AccountWalletId,
@@ -1522,7 +1668,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: 'entropy:invalid2/0' as AccountGroupId,
           type: AccountGroupType.MultichainAccount,
-          metadata: { name: 'Invalid 2', pinned: false, hidden: false },
+          metadata: {
+            name: 'Invalid 2',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Invalid Wallet 2',
           walletId: 'entropy:invalid2' as AccountWalletId,
@@ -1545,7 +1696,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: LEDGER_GROUP_ID as AccountGroupId,
           type: AccountGroupType.SingleAccount,
-          metadata: { name: 'Ledger Account', pinned: false, hidden: false },
+          metadata: {
+            name: 'Ledger Account',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Ledger Hardware',
           walletId: 'keyring:Ledger Hardware' as AccountWalletId,
@@ -1568,7 +1724,12 @@ describe('Multichain Accounts Selectors', () => {
         {
           id: 'keyring:some/0x123' as AccountGroupId,
           type: AccountGroupType.SingleAccount,
-          metadata: { name: 'Some Account', pinned: false, hidden: false },
+          metadata: {
+            name: 'Some Account',
+            pinned: false,
+            hidden: false,
+            lastSelected: 0,
+          },
           accounts: [],
           walletName: 'Some Wallet',
           walletId: 'keyring:some' as AccountWalletId,
diff --git a/ui/selectors/multichain-accounts/account-tree.ts b/ui/selectors/multichain-accounts/account-tree.ts
index b696f67fb01f..fdb9f534e43a 100644
--- a/ui/selectors/multichain-accounts/account-tree.ts
+++ b/ui/selectors/multichain-accounts/account-tree.ts
@@ -127,22 +127,24 @@ export const getWalletsWithAccounts = createSelector(
         };
 
         Object.values(wallet.groups).forEach((group: AccountGroupObject) => {
-          const accountsFromGroup = group.accounts.map((accountId) => {
-            const accountWithMetadata = { ...accountsById[accountId] };
-
-            // Set flags for pinned, hidden, and active accounts
-            accountWithMetadata.pinned = pinnedAccountsSet.has(
-              accountWithMetadata.address,
-            );
-            accountWithMetadata.hidden = hiddenAccountsSet.has(
-              accountWithMetadata.address,
-            );
-            accountWithMetadata.active =
-              selectedAccount.id === accountWithMetadata.id &&
-              connectedAccountIdsSet.has(accountWithMetadata.id);
-
-            return accountWithMetadata;
-          });
+          const accountsFromGroup = group.accounts
+            .filter((accountId) => accountsById[accountId] !== undefined)
+            .map((accountId) => {
+              const accountWithMetadata = { ...accountsById[accountId] };
+
+              // Set flags for pinned, hidden, and active accounts
+              accountWithMetadata.pinned = pinnedAccountsSet.has(
+                accountWithMetadata.address,
+              );
+              accountWithMetadata.hidden = hiddenAccountsSet.has(
+                accountWithMetadata.address,
+              );
+              accountWithMetadata.active =
+                selectedAccount.id === accountWithMetadata.id &&
+                connectedAccountIdsSet.has(accountWithMetadata.id);
+
+              return accountWithMetadata;
+            });
 
           consolidatedWallets[wallet.id].groups[group.id] = {
             id: group.id,
@@ -535,15 +537,14 @@ export const getInternalAccountByGroupAndCaip = createParameterizedSelector(
 );
 
 /**
- * Get the selected account group from the account tree.
+ * Get the selected account group from the state.
  *
- * @param accountTree - The account tree state.
+ * @param state - The multichain accounts state.
  * @returns The selected account group, or null if not found.
  */
-export const getSelectedAccountGroup = createSelector(
-  getAccountTree,
-  (accountTree: AccountTreeState) => accountTree.selectedAccountGroup,
-);
+export const getSelectedAccountGroup = (
+  state: MultichainAccountsState,
+): AccountGroupId => state.metamask.selectedAccountGroup;
 
 /**
  * Get an internal account from the account tree by its selected account group and CAIP chain ID.
diff --git a/ui/selectors/multichain-accounts/account-tree.types.ts b/ui/selectors/multichain-accounts/account-tree.types.ts
index 1255a6cb1b2b..135ca6e5aa59 100644
--- a/ui/selectors/multichain-accounts/account-tree.types.ts
+++ b/ui/selectors/multichain-accounts/account-tree.types.ts
@@ -19,7 +19,6 @@ export type AccountTreeWallets = {
 
 export type AccountTreeState = {
   wallets: AccountTreeWallets;
-  selectedAccountGroup: AccountGroupId;
 };
 
 export type InternalAccountsState = {
@@ -29,6 +28,7 @@ export type InternalAccountsState = {
 
 export type MultichainAccountsState = {
   metamask: {
+    selectedAccountGroup: AccountGroupId;
     accountTree: AccountTreeState;
     internalAccounts: InternalAccountsState;
     accountIdByAddress: Record<string, AccountId>;
diff --git a/ui/selectors/multichain-accounts/feature-flags.ts b/ui/selectors/multichain-accounts/feature-flags.ts
index 594c877aa881..2d7fd9a315c7 100644
--- a/ui/selectors/multichain-accounts/feature-flags.ts
+++ b/ui/selectors/multichain-accounts/feature-flags.ts
@@ -1,75 +1,14 @@
-import {
-  Infer,
-  object,
-  boolean,
-  nullable,
-  string,
-  assert,
-} from '@metamask/superstruct';
-import {
-  getRemoteFeatureFlags,
-  type RemoteFeatureFlagsState,
-} from '../remote-feature-flags';
-import {
-  FEATURE_VERSION_2,
-  isMultichainAccountsFeatureEnabled,
-} from '../../../shared/lib/multichain-accounts/remote-feature-flag';
-
-export const STATE_2_FLAG = 'enableMultichainAccountsState2';
-
-/**
- * Feature flag structure for multichain accounts features
- */
-const MultichainAccountsFeatureFlag = object({
-  enabled: boolean(),
-  featureVersion: nullable(string()),
-  minimumVersion: nullable(string()),
-});
-
-/**
- * Feature flag type for multichain accounts features
- */
-export type MultichainAccountsFeatureFlag = Infer<
-  typeof MultichainAccountsFeatureFlag
->;
-
-/**
- * Selector to get the multichain accounts remote feature flags.
- *
- * @param state - The MetaMask state object
- * @param flagName - The name of the remote flag to use
- * @returns MultichainAccountsFeatureFlag - The feature flags for multichain accounts.
- */
-const getMultichainAccountsRemoteFeatureFlags = (
-  state: RemoteFeatureFlagsState,
-  flagName: typeof STATE_2_FLAG,
-) => {
-  try {
-    const multichainAccountsFeatureFlags =
-      getRemoteFeatureFlags(state)[flagName];
-
-    assert(multichainAccountsFeatureFlags, MultichainAccountsFeatureFlag);
-
-    return multichainAccountsFeatureFlags;
-  } catch (error) {
-    return undefined;
-  }
-};
+import { type RemoteFeatureFlagsState } from '../remote-feature-flags';
 
 /**
  * Selector to check if the multichain accounts feature is enabled for state 2.
+ * The feature is permanently enabled — the remote feature flag is no longer required.
  *
  * @deprecated This selector is no longer used and will be removed in the future.
  * All multichain accounts features are now enabled by default.
- * @param state - The MetaMask state object
- * @returns boolean - True if the feature is enabled for state 2, false otherwise.
+ * @param _state - The remote feature flags state.
+ * @returns Always true.
  */
 export const getIsMultichainAccountsState2Enabled = (
-  state: RemoteFeatureFlagsState,
-) => {
-  const remoteFlag = getMultichainAccountsRemoteFeatureFlags(
-    state,
-    STATE_2_FLAG,
-  );
-  return isMultichainAccountsFeatureEnabled(remoteFlag, FEATURE_VERSION_2);
-};
+  _state: RemoteFeatureFlagsState,
+): boolean => true;
diff --git a/ui/selectors/multichain-accounts/test-utils.ts b/ui/selectors/multichain-accounts/test-utils.ts
index 817be5cfa552..30ee4a3eb584 100644
--- a/ui/selectors/multichain-accounts/test-utils.ts
+++ b/ui/selectors/multichain-accounts/test-utils.ts
@@ -19,8 +19,10 @@ export const createMockMultichainAccountsState = (
       MultichainNetworkConfiguration
     >;
   },
+  selectedAccountGroup: AccountGroupId | null = null as unknown as AccountGroupId,
 ): MultichainAccountsState & MultichainNetworkConfigurationsByChainIdState => ({
   metamask: {
+    selectedAccountGroup: selectedAccountGroup as AccountGroupId,
     accountTree,
     internalAccounts,
     accountIdByAddress: Object.fromEntries(
@@ -42,10 +44,11 @@ export const createEmptyState = (): MultichainAccountsState &
   createMockMultichainAccountsState(
     {
       wallets: {},
-      selectedAccountGroup: null as unknown as AccountGroupId,
     },
     {
       accounts: {},
       selectedAccount: '',
     },
+    undefined,
+    null as unknown as AccountGroupId,
   );
diff --git a/ui/selectors/multichain-transactions.test.ts b/ui/selectors/multichain-transactions.test.ts
index 5d9100fe99ea..6c244230e475 100644
--- a/ui/selectors/multichain-transactions.test.ts
+++ b/ui/selectors/multichain-transactions.test.ts
@@ -1,5 +1,6 @@
 import type { MultichainTransactionsControllerState } from '@metamask/multichain-transactions-controller';
 import type { Transaction } from '@metamask/keyring-api';
+import { AccountGroupId } from '@metamask/account-api';
 import type { MetaMaskReduxState as _MetaMaskReduxState } from '../store/store';
 import type { AccountTreeState } from './multichain-accounts/account-tree.types';
 import { selectCurrentAccountNonEvmTransactions } from './multichain-transactions';
@@ -24,7 +25,10 @@ type NonEvmTransactionsMap =
   MultichainTransactionsControllerState['nonEvmTransactions'];
 
 type MetaMaskReduxState = _MetaMaskReduxState & {
-  metamask: { accountTree: AccountTreeState };
+  metamask: {
+    selectedAccountGroup: AccountGroupId;
+    accountTree: AccountTreeState;
+  };
 };
 
 function buildState(
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index 7a19e54c89fa..8a78567aec8b 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -27,6 +27,7 @@ import { Numeric } from '../../shared/lib/Numeric';
 import {
   getMultichainAssetsRatesControllerConversionRates,
   getMultiChainBalancesControllerBalances,
+  getRatesControllerRates,
 } from '../../shared/lib/selectors/assets-migration';
 import {
   getConversionRate,
@@ -332,9 +333,7 @@ export function getMultichainIsTestnet(
 // TODO: Update all references to use asset-migration.ts
 export { getMultiChainBalancesControllerBalances as getMultichainBalances };
 
-export const getMultichainCoinRates = (state: MultichainState) => {
-  return state.metamask.rates;
-};
+export { getRatesControllerRates as getMultichainCoinRates };
 
 function getNonEvmCachedBalance(
   state: MultichainState,
diff --git a/ui/selectors/perps-controller.ts b/ui/selectors/perps-controller.ts
index 0ef7a5bccaa5..0592172d7051 100644
--- a/ui/selectors/perps-controller.ts
+++ b/ui/selectors/perps-controller.ts
@@ -10,6 +10,8 @@ export type PerpsState = {
 };
 
 const EMPTY_ARRAY: never[] = [];
+const EMPTY_TRADE_CONFIGURATIONS: PerpsControllerState['tradeConfigurations'] =
+  { testnet: {}, mainnet: {} };
 
 export const selectPerpsIsEligible = (state: PerpsState): boolean =>
   state.metamask.isEligible ?? false;
@@ -109,3 +111,6 @@ export const selectPerpsPerpsBalances = (state: PerpsState) =>
 
 export const selectPerpsMarketFilterPreferences = (state: PerpsState) =>
   state.metamask.marketFilterPreferences ?? null;
+
+export const selectPerpsTradeConfigurations = (state: PerpsState) =>
+  state.metamask.tradeConfigurations ?? EMPTY_TRADE_CONFIGURATIONS;
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 6df9f60b3b75..7187bb85dd19 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -2697,16 +2697,6 @@ export function getUseNftDetection(state) {
   return Boolean(state.metamask.useNftDetection);
 }
 
-/**
- * To get the useBlockie flag which determines whether we show blockies or Jazzicons
- *
- * @param {*} state
- * @returns Boolean
- */
-export function getUseBlockie(state) {
-  return Boolean(state.metamask.useBlockie);
-}
-
 /**
  * To get the openSeaEnabled flag which determines whether we use OpenSea's API
  *
@@ -2938,6 +2928,8 @@ export const getTokenDetectionSupportNetworkByChainId = (state) => {
       return '';
   }
 };
+
+// TODO AssetsController - Remove this selector and fix dependencies
 /**
  * Returns true if a token list is available for the current network.
  *
@@ -2950,10 +2942,12 @@ export function getDetectedTokensInCurrentNetwork(state) {
   return state.metamask.allDetectedTokens?.[currentChainId]?.[selectedAddress];
 }
 
+// TODO AssetsController - Remove this selector and fix dependencies
 export function getAllDetectedTokens(state) {
   return state.metamask.allDetectedTokens;
 }
 
+// TODO AssetsController - Remove this selector and fix dependencies
 /**
  * To retrieve the list of tokens detected across all chains.
  *
diff --git a/ui/selectors/toast.test.ts b/ui/selectors/toast.test.ts
new file mode 100644
index 000000000000..b71e00a10b80
--- /dev/null
+++ b/ui/selectors/toast.test.ts
@@ -0,0 +1,225 @@
+import { TransactionType } from '@metamask/transaction-controller';
+import {
+  selectTransactionIds,
+  selectBridgeApprovalTxIds,
+  selectCrossChainBridgeSourceTxIds,
+  selectEvmTransactionsForToast,
+  selectNonEvmTransactionsForToast,
+} from './toast';
+
+type SelectorState = Parameters<typeof selectTransactionIds>[0];
+
+describe('toast selectors', () => {
+  describe('selectTransactionIds', () => {
+    it('returns a Set of all transaction ids', () => {
+      const state = {
+        metamask: {
+          transactions: [{ id: 'a' }, { id: 'b' }, { id: 'c' }],
+        },
+      } as unknown as SelectorState;
+      const result = selectTransactionIds(state);
+      expect(result).toStrictEqual(new Set(['a', 'b', 'c']));
+    });
+
+    it('returns an empty Set when there are no transactions', () => {
+      const result = selectTransactionIds({
+        metamask: {},
+      } as unknown as SelectorState);
+      expect(result).toStrictEqual(new Set());
+    });
+  });
+
+  describe('selectBridgeApprovalTxIds', () => {
+    it('returns a Set of bridge approval tx ids (lowercased)', () => {
+      const state = {
+        metamask: {
+          txHistory: {
+            entry1: { approvalTxId: 'ABC' },
+            entry2: { approvalTxId: 'def' },
+            entry3: {},
+          },
+        },
+      } as unknown as SelectorState;
+      const result = selectBridgeApprovalTxIds(state);
+      expect(result).toStrictEqual(new Set(['abc', 'def']));
+    });
+
+    it('returns an empty Set when there is no txHistory', () => {
+      const result = selectBridgeApprovalTxIds({
+        metamask: {},
+      } as unknown as SelectorState);
+      expect(result).toStrictEqual(new Set());
+    });
+  });
+
+  describe('selectCrossChainBridgeSourceTxIds', () => {
+    it('returns ids where srcChainId !== destChainId', () => {
+      const state = {
+        metamask: {
+          txHistory: {
+            crossChain: {
+              quote: { srcChainId: 1, destChainId: 10 },
+            },
+            sameChain: {
+              quote: { srcChainId: 1, destChainId: 1 },
+            },
+            noQuote: {},
+          },
+        },
+      } as unknown as SelectorState;
+      const result = selectCrossChainBridgeSourceTxIds(state);
+      expect(result).toStrictEqual(new Set(['crossChain']));
+    });
+  });
+
+  describe('selectEvmTransactionsForToast', () => {
+    it('returns all transactions except excluded types', () => {
+      const state = {
+        metamask: {
+          transactions: [
+            { id: '0', time: 1, type: TransactionType.simpleSend },
+            { id: '1', time: 2, type: TransactionType.deployContract },
+            { id: '2', time: 3, type: TransactionType.swap },
+            { id: '3', time: 4 },
+            { id: '4', time: 5, type: TransactionType.swapApproval },
+            { id: '5', time: 6, type: TransactionType.bridgeApproval },
+            {
+              id: '6',
+              time: 7,
+              type: TransactionType.shieldSubscriptionApprove,
+            },
+          ],
+        },
+      } as unknown as SelectorState;
+
+      const results = selectEvmTransactionsForToast(state);
+
+      expect(results).toStrictEqual([
+        { id: '0', time: 1, type: TransactionType.simpleSend },
+        { id: '1', time: 2, type: TransactionType.deployContract },
+        { id: '2', time: 3, type: TransactionType.swap },
+      ]);
+    });
+
+    it('deduplicates transactions by id', () => {
+      const state = {
+        metamask: {
+          transactions: [
+            { id: '0', time: 1, type: TransactionType.simpleSend },
+            { id: '0', time: 2, type: TransactionType.simpleSend },
+          ],
+        },
+      } as unknown as SelectorState;
+      const results = selectEvmTransactionsForToast(state);
+      expect(results).toHaveLength(1);
+    });
+
+    it('excludes bridge approval and cross-chain bridge source txs', () => {
+      const state = {
+        metamask: {
+          transactions: [
+            { id: 'approval-1', time: 1, type: TransactionType.simpleSend },
+            { id: 'cross-chain-1', time: 2, type: TransactionType.simpleSend },
+            { id: 'normal-1', time: 3, type: TransactionType.simpleSend },
+          ],
+          txHistory: {
+            entry1: { approvalTxId: 'approval-1' },
+            'cross-chain-1': {
+              quote: { srcChainId: 1, destChainId: 10 },
+            },
+          },
+        },
+      } as unknown as SelectorState;
+      const results = selectEvmTransactionsForToast(state);
+      expect(results).toStrictEqual([
+        { id: 'normal-1', time: 3, type: TransactionType.simpleSend },
+      ]);
+    });
+
+    it('returns an empty array if there are no transactions', () => {
+      const results = selectEvmTransactionsForToast(
+        {} as unknown as SelectorState,
+      );
+      expect(results).toStrictEqual([]);
+    });
+  });
+
+  describe('selectNonEvmTransactionsForToast', () => {
+    it('returns all non-EVM transactions except excluded types', () => {
+      const tx1 = {
+        id: 'tx-1',
+        type: 'send',
+        status: 'submitted',
+        chain: 'solana:mainnet',
+      };
+      const tx2 = {
+        id: 'tx-2',
+        type: 'swap',
+        status: 'confirmed',
+        chain: 'solana:mainnet',
+      };
+      const tx3 = {
+        id: 'tx-3',
+        type: 'send',
+        status: 'failed',
+        chain: 'solana:devnet',
+      };
+      const filteredOutType = {
+        id: 'tx-4',
+        type: 'approve',
+        status: 'submitted',
+        chain: 'solana:mainnet',
+      };
+      const includedBtcTx = {
+        id: 'tx-5',
+        type: 'send',
+        status: 'submitted',
+        chain: 'bip122:000000000019d6689c085ae165831e93',
+      };
+
+      const state = {
+        metamask: {
+          nonEvmTransactions: {
+            'account-1': {
+              'solana:mainnet': {
+                transactions: [tx1, tx2, filteredOutType],
+              },
+            },
+            'account-2': {
+              'solana:mainnet': { transactions: [tx3] },
+              'bip122:1': { transactions: [includedBtcTx] },
+            },
+          },
+        },
+      } as unknown as SelectorState;
+
+      const results = selectNonEvmTransactionsForToast(state);
+
+      expect(results).toStrictEqual([tx1, tx2, tx3, includedBtcTx]);
+    });
+
+    it('excludes cross-chain bridge source transactions', () => {
+      const tx1 = { id: 'bridge-src', type: 'send' };
+      const tx2 = { id: 'normal', type: 'send' };
+      const state = {
+        metamask: {
+          nonEvmTransactions: {
+            acct: { chain: { transactions: [tx1, tx2] } },
+          },
+          txHistory: {
+            'bridge-src': { quote: { srcChainId: 1, destChainId: 10 } },
+          },
+        },
+      } as unknown as SelectorState;
+      const results = selectNonEvmTransactionsForToast(state);
+      expect(results).toStrictEqual([tx2]);
+    });
+
+    it('returns an empty array if non-EVM transactions do not exist', () => {
+      const results = selectNonEvmTransactionsForToast(
+        {} as unknown as SelectorState,
+      );
+      expect(results).toStrictEqual([]);
+    });
+  });
+});
diff --git a/ui/selectors/toast.ts b/ui/selectors/toast.ts
new file mode 100644
index 000000000000..fc92cee1cb39
--- /dev/null
+++ b/ui/selectors/toast.ts
@@ -0,0 +1,117 @@
+import { createSelector } from 'reselect';
+import { createDeepEqualSelector } from '../../shared/lib/selectors/util';
+import type { MetaMaskReduxState } from '../store/store';
+import {
+  TOAST_EXCLUDED_TRANSACTION_TYPES,
+  TOAST_EXCLUDED_NON_EVM_TRANSACTION_TYPES,
+} from '../helpers/constants/transactions';
+import { EMPTY_ARRAY, EMPTY_OBJECT } from './shared';
+
+const selectTransactions = (state: MetaMaskReduxState) =>
+  state.metamask?.transactions ?? EMPTY_ARRAY;
+
+const selectNonEvmTransactions = (state: MetaMaskReduxState) =>
+  state.metamask?.nonEvmTransactions ?? EMPTY_OBJECT;
+
+const selectTxHistory = (state: MetaMaskReduxState) =>
+  state.metamask?.txHistory ?? EMPTY_OBJECT;
+
+export const selectTransactionIds = createSelector(
+  selectTransactions,
+  (transactions) => new Set<string>(transactions.map((tx) => tx.id)),
+);
+
+export const selectBridgeApprovalTxIds = createSelector(
+  selectTxHistory,
+  (txHistory) => {
+    const ids = new Set<string>();
+    for (const item of Object.values(txHistory)) {
+      if (item.approvalTxId) {
+        ids.add(item.approvalTxId.toLowerCase());
+      }
+    }
+    return ids;
+  },
+);
+
+export const selectCrossChainBridgeSourceTxIds = createSelector(
+  selectTxHistory,
+  (txHistory) => {
+    const ids = new Set<string>();
+    for (const [key, item] of Object.entries(txHistory)) {
+      if (item.quote && item.quote.srcChainId !== item.quote.destChainId) {
+        ids.add(key);
+      }
+    }
+    return ids;
+  },
+);
+
+/**
+ * Returns EVM transactions eligible for toast notifications.
+ *
+ * @param {object} state - Root state
+ * @returns {object[]} Filtered, deduplicated array of transaction objects
+ */
+export const selectEvmTransactionsForToast = createSelector(
+  selectTransactions,
+  selectBridgeApprovalTxIds,
+  selectCrossChainBridgeSourceTxIds,
+  (rawTransactions, bridgeApprovalIds, crossChainBridgeIds) => {
+    if (!rawTransactions?.length) {
+      return EMPTY_ARRAY;
+    }
+
+    const seen = new Set<string>();
+
+    return rawTransactions.filter((transaction) => {
+      if (seen.has(transaction.id)) {
+        return false;
+      }
+
+      seen.add(transaction.id);
+
+      const type = transaction?.type;
+      if (typeof type !== 'string') {
+        return false;
+      }
+      return (
+        Boolean(type) &&
+        !TOAST_EXCLUDED_TRANSACTION_TYPES.has(type) &&
+        !bridgeApprovalIds.has(transaction.id?.toLowerCase()) &&
+        !crossChainBridgeIds.has(transaction.id)
+      );
+    });
+  },
+);
+
+/**
+ * Returns non-EVM transactions for toast notifications
+ *
+ * @param {object} state - Root state
+ * @returns {object[]} Filtered array of non-EVM transaction objects
+ */
+export const selectNonEvmTransactionsForToast = createDeepEqualSelector(
+  selectNonEvmTransactions,
+  selectCrossChainBridgeSourceTxIds,
+  (nonEvmTransactionsMap, crossChainBridgeIds) => {
+    if (!nonEvmTransactionsMap) {
+      return EMPTY_ARRAY;
+    }
+
+    return Object.values(nonEvmTransactionsMap)
+      .flatMap((byChainMap) =>
+        Object.values(byChainMap ?? {}).flatMap(
+          (entry) => entry?.transactions ?? EMPTY_ARRAY,
+        ),
+      )
+      .filter((transaction) => {
+        const type = transaction?.type;
+        return (
+          Boolean(type) &&
+          !TOAST_EXCLUDED_NON_EVM_TRANSACTION_TYPES.has(type) &&
+          !crossChainBridgeIds.has(transaction.id)
+        );
+      });
+  },
+);
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 05202d0dab25..092aa2522856 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -5,6 +5,10 @@ import {
   TransactionType,
 } from '@metamask/transaction-controller';
 import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller';
+import {
+  isCorrectDeveloperTransactionType,
+  isCorrectSignatureApprovalType,
+} from '../../shared/lib/confirmation.utils';
 import {
   PRIORITY_STATUS_HASH,
   PENDING_STATUS_HASH,
@@ -22,8 +26,13 @@ import {
   createShallowEqualInputAndResultSelector,
   createParameterizedShallowEqualSelector,
 } from '../../shared/lib/selectors/selector-creators';
+import { oldestPendingConfirmationSelector } from '../pages/confirmations/selectors/confirm';
 import { getSelectedInternalAccount } from './accounts';
-import { hasPendingApprovals, getApprovalRequestsByType } from './approvals';
+import {
+  hasPendingApprovals,
+  getApprovalRequestsByType,
+  getPendingApprovals,
+} from './approvals';
 import { EMPTY_ARRAY, EMPTY_OBJECT } from './shared';
 
 /**
@@ -760,3 +769,22 @@ function getProviderConfigSafe(state) {
     return null;
   }
 }
+
+const selectIsTransactionTypeRedesigned = createSelector(
+  (state, transactionId) =>
+    selectTransactionMetadata(state, transactionId)?.type,
+  (transactionType) => isCorrectDeveloperTransactionType(transactionType),
+);
+
+export const selectIsRedesignedConfirmationType = createSelector(
+  (state, paramsId) => {
+    const id = paramsId ?? oldestPendingConfirmationSelector(state)?.id;
+    return selectIsTransactionTypeRedesigned(state, id);
+  },
+  (state, paramsId) => {
+    const id = paramsId ?? oldestPendingConfirmationSelector(state)?.id;
+    return getPendingApprovals(state).find((a) => a.id === id)?.type;
+  },
+  (isRedesignedTx, approvalType) =>
+    isRedesignedTx || isCorrectSignatureApprovalType(approvalType),
+);
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index 95387c63ae69..56fca30223b0 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -19,7 +19,12 @@ import MetaMaskController from '../../app/scripts/metamask-controller';
 import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
 import { GAS_LIMITS } from '../../shared/constants/gas';
 import { ORIGIN_METAMASK } from '../../shared/constants/app';
-import { MetaMetricsNetworkEventSource } from '../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsNetworkEventSource,
+  MetaMetricsUserTrait,
+} from '../../shared/constants/metametrics';
 import { ETH_EOA_METHODS } from '../../shared/constants/eth-methods';
 import { mockNetworkState } from '../../test/stub/networks';
 import { CHAIN_IDS } from '../../shared/constants/network';
@@ -189,29 +194,74 @@ describe('Actions', () => {
     });
   });
 
-  describe('#restoreAndGetSeedPhrase', () => {
+  describe('#restoreSocialBackupAndGetSeedPhrase', () => {
     afterEach(() => {
       sinon.restore();
     });
 
-    it('fetches all seed phrases from the metadata store, restores the vault and updates the SocialbackupMetadata state', async () => {
+    it('returns the seed phrase and syncs marketing consent', async () => {
       const store = mockStore();
+      const mnemonic = 'seed phrase';
 
       const restoreSocialBackupAndGetSeedPhraseStub =
-        background.restoreSocialBackupAndGetSeedPhrase.resolves();
+        background.restoreSocialBackupAndGetSeedPhrase.resolves(mnemonic);
+      background.getMarketingConsent = sinon.stub().resolves(true);
+      background.setDataCollectionForMarketing = sinon.stub().resolves();
 
       setBackgroundConnection(background);
 
-      await store.dispatch(
+      const result = await store.dispatch(
         actions.restoreSocialBackupAndGetSeedPhrase('password'),
       );
 
-      expect(restoreSocialBackupAndGetSeedPhraseStub.callCount).toStrictEqual(
-        1,
+      expect(result).toStrictEqual(mnemonic);
+      expect(
+        restoreSocialBackupAndGetSeedPhraseStub.calledOnceWith('password'),
+      ).toStrictEqual(true);
+      expect(background.getMarketingConsent.calledOnce).toStrictEqual(true);
+      expect(
+        background.setDataCollectionForMarketing.calledOnceWith(true),
+      ).toStrictEqual(true);
+      expect(background.getStatePatches.calledOnce).toStrictEqual(true);
+      expect(store.getActions()).toStrictEqual([
+        {
+          type: actionConstants.SET_DATA_COLLECTION_FOR_MARKETING,
+          value: true,
+        },
+        {
+          type: actionConstants.HIDE_WARNING,
+        },
+      ]);
+    });
+
+    it('tracks the onboarding analytics preference event when a tracking function is provided', async () => {
+      const store = mockStore();
+      const trackEventStub = sinon.stub().resolves();
+
+      background.restoreSocialBackupAndGetSeedPhrase.resolves('seed phrase');
+      background.getMarketingConsent = sinon.stub().resolves(false);
+      background.setDataCollectionForMarketing = sinon.stub().resolves();
+
+      setBackgroundConnection(background);
+
+      await store.dispatch(
+        actions.restoreSocialBackupAndGetSeedPhrase('password', trackEventStub),
       );
+
+      expect(
+        trackEventStub.calledOnceWith({
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+          properties: {
+            [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+            [MetaMetricsUserTrait.HasMarketingConsent]: false,
+            location: 'onboarding_social_login_rehydration',
+          },
+        }),
+      ).toStrictEqual(true);
     });
 
-    it('errors when fetchAndRestoreSeedPhrase throws', async () => {
+    it('displays a warning when restoring the social backup fails', async () => {
       const store = mockStore();
 
       background.restoreSocialBackupAndGetSeedPhrase.rejects(
@@ -862,12 +912,22 @@ describe('Actions', () => {
   });
 
   describe('#connectHardware', () => {
+    const translateHardwareMessage = (key, substitutions = []) =>
+      key === 'hardwareWalletLookingForDevice'
+        ? enLocale.hardwareWalletLookingForDevice.message.replace(
+            '$1',
+            substitutions[0],
+          )
+        : `translated_${key}`;
+
     afterEach(() => {
       sinon.restore();
     });
 
     it('calls connectHardware in background', async () => {
       const store = mockStore();
+      const page = 0;
+      const hdPath = `m/44'/60'/0'/0`;
 
       const connectHardware = background.connectHardware.resolves();
 
@@ -876,15 +936,25 @@ describe('Actions', () => {
       await store.dispatch(
         actions.connectHardware(
           HardwareDeviceNames.ledger,
-          0,
-          `m/44'/60'/0'/0`,
+          page,
+          hdPath,
+          false,
+          translateHardwareMessage,
         ),
       );
-      expect(connectHardware.callCount).toStrictEqual(1);
+      expect(
+        connectHardware.calledOnceWith(
+          HardwareDeviceNames.ledger,
+          page,
+          hdPath,
+        ),
+      ).toStrictEqual(true);
     });
 
     it('shows loading indicator and displays error', async () => {
       const store = mockStore();
+      const page = 0;
+      const hdPath = `m/44'/60'/0'/0`;
 
       background.connectHardware.rejects(new Error('error'));
 
@@ -900,7 +970,15 @@ describe('Actions', () => {
       ];
 
       await expect(
-        store.dispatch(actions.connectHardware(HardwareDeviceNames.ledger)),
+        store.dispatch(
+          actions.connectHardware(
+            HardwareDeviceNames.ledger,
+            page,
+            hdPath,
+            false,
+            translateHardwareMessage,
+          ),
+        ),
       ).rejects.toThrow('error');
 
       expect(store.getActions()).toStrictEqual(expectedActions);
@@ -948,7 +1026,7 @@ describe('Actions', () => {
           0,
           `m/44'/60'/0'/0`,
           true,
-          (key) => `translated_${key}`,
+          translateHardwareMessage,
         ),
       );
 
@@ -993,8 +1071,6 @@ describe('Actions', () => {
         { type: 'HIDE_LOADING_INDICATION' },
       ];
 
-      const mockTranslation = (key) => `translated_${key}`;
-
       await expect(
         store.dispatch(
           actions.connectHardware(
@@ -1002,7 +1078,7 @@ describe('Actions', () => {
             0,
             `m/44'/60'/0'/0`,
             true,
-            mockTranslation,
+            translateHardwareMessage,
           ),
         ),
       ).rejects.toThrow('translated_ledgerWebHIDNotConnectedErrorMessage');
@@ -1051,7 +1127,7 @@ describe('Actions', () => {
           0,
           `m/44'/60'/0'/0`,
           false,
-          (key) => `translated_${key}`,
+          translateHardwareMessage,
         ),
       );
 
@@ -1100,8 +1176,6 @@ describe('Actions', () => {
         { type: 'HIDE_LOADING_INDICATION' },
       ];
 
-      const mockTranslation = (key) => `translated_${key}`;
-
       await expect(
         store.dispatch(
           actions.connectHardware(
@@ -1109,7 +1183,7 @@ describe('Actions', () => {
             0,
             `m/44'/60'/0'/0`,
             true,
-            mockTranslation,
+            translateHardwareMessage,
           ),
         ),
       ).rejects.toThrow('translated_ledgerDeviceOpenFailureMessage');
@@ -1152,7 +1226,7 @@ describe('Actions', () => {
           0,
           `m/44'/60'/0'/0`,
           true,
-          (key) => `translated_${key}`,
+          translateHardwareMessage,
         ),
       );
 
@@ -1186,6 +1260,30 @@ describe('Actions', () => {
       expect(unlockHardwareWalletAccount.callCount).toStrictEqual(1);
     });
 
+    it('forwards a null hd path to the background handler', async () => {
+      const store = mockStore();
+      const unlockHardwareWalletAccount =
+        background.unlockHardwareWalletAccount.resolves();
+
+      setBackgroundConnection(background);
+
+      await store.dispatch(
+        actions.unlockHardwareWalletAccounts(
+          [0],
+          HardwareDeviceNames.trezor,
+          null,
+          '',
+        ),
+      );
+
+      expect(unlockHardwareWalletAccount.firstCall.args).toStrictEqual([
+        0,
+        HardwareDeviceNames.trezor,
+        null,
+        '',
+      ]);
+    });
+
     it('shows loading indicator and displays error', async () => {
       const store = mockStore();
 
@@ -2756,37 +2854,6 @@ describe('Actions', () => {
     });
   });
 
-  describe('#setUseBlockie', () => {
-    afterEach(() => {
-      sinon.restore();
-    });
-
-    it('calls setUseBlockie in background', async () => {
-      const store = mockStore();
-      const setUseBlockieStub = sinon.stub().resolves();
-      setBackgroundConnection({ setUseBlockie: setUseBlockieStub });
-
-      await store.dispatch(actions.setUseBlockie());
-      expect(setUseBlockieStub.callCount).toStrictEqual(1);
-    });
-
-    it('errors when setUseBlockie in background throws', async () => {
-      const store = mockStore();
-      const setUseBlockieStub = sinon.stub().rejects(new Error('error'));
-
-      setBackgroundConnection({ setUseBlockie: setUseBlockieStub });
-
-      const expectedActions = [
-        { type: 'SHOW_LOADING_INDICATION', payload: undefined },
-        { type: 'DISPLAY_WARNING', payload: 'error' },
-        { type: 'HIDE_LOADING_INDICATION' },
-      ];
-
-      await store.dispatch(actions.setUseBlockie());
-      expect(store.getActions()).toStrictEqual(expectedActions);
-    });
-  });
-
   describe('#setUsePhishDetect', () => {
     afterEach(() => {
       sinon.restore();
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index b4523a19ce37..c492c4b9a415 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -28,6 +28,7 @@ import { PayloadAction } from '@reduxjs/toolkit';
 import { GasFeeController } from '@metamask/gas-fee-controller';
 import { PermissionsRequest } from '@metamask/permission-controller';
 import { NonEmptyArray } from '@metamask/controller-utils';
+import type { PhishingDetectionScanResult } from '@metamask/phishing-controller';
 import {
   SetNameRequest,
   UpdateProposedNamesRequest,
@@ -146,6 +147,7 @@ import {
   MetaMetricsEventName,
   MetaMetricsEventAccountType,
   MetaMetricsUserTraits,
+  MetaMetricsUserTrait,
 } from '../../shared/constants/metametrics';
 import { parseSmartTransactionsError } from '../pages/swaps/swaps.util';
 import { isEqualCaseInsensitive } from '../../shared/lib/string-utils';
@@ -863,10 +865,15 @@ export async function setShieldSubscriptionError(
  * Fetches and restores the seed phrase from the metadata store using the social login and restore the vault using the seed phrase.
  *
  * @param password - The password.
+ * @param trackEvent - The track event function from MetaMetrics context.
  * @returns The seed phrase.
  */
 export function restoreSocialBackupAndGetSeedPhrase(
   password: string,
+  trackEvent?: (
+    payload: MetaMetricsEventPayload,
+    options?: MetaMetricsEventOptions,
+  ) => Promise<void>,
 ): ThunkAction<Promise<string>, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch: MetaMaskReduxDispatch) => {
     try {
@@ -880,6 +887,16 @@ export function restoreSocialBackupAndGetSeedPhrase(
       const marketingConsent = await getMarketingConsent();
       dispatch(setDataCollectionForMarketing(marketingConsent));
 
+      await trackEvent?.({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+          [MetaMetricsUserTrait.HasMarketingConsent]: marketingConsent,
+          location: 'onboarding_social_login_rehydration',
+        },
+      });
+
       dispatch(hideWarning());
       await forceUpdateMetamaskState(dispatch);
       return mnemonic;
@@ -1428,7 +1445,9 @@ export function connectHardware(
     const { ledgerTransportType } = getState().metamask;
 
     dispatch(
-      showLoadingIndication(`Looking for your ${capitalize(deviceName)}...`),
+      showLoadingIndication(
+        t('hardwareWalletLookingForDevice', [capitalize(deviceName)]),
+      ),
     );
 
     let accounts: { address: string }[];
@@ -1493,9 +1512,9 @@ export function connectHardware(
 }
 
 export function unlockHardwareWalletAccounts(
-  indexes: string[],
+  indexes: number[],
   deviceName: HardwareDeviceNames,
-  hdPath: string,
+  hdPath: string | null,
   hdPathDescription: string,
 ): ThunkAction<Promise<undefined>, MetaMaskReduxState, unknown, AnyAction> {
   log.debug(
@@ -2175,6 +2194,12 @@ export async function getPhishingResult(website: string) {
   return await submitRequestToBackground('getPhishingResult', [website]);
 }
 
+export async function scanUrlForPhishing(
+  origin: string,
+): Promise<PhishingDetectionScanResult | null> {
+  return await submitRequestToBackground('scanUrlForPhishing', [origin]);
+}
+
 // TODO: Clean this up.
 export function removeSnap(
   snapId: string,
@@ -4678,26 +4703,6 @@ export async function getMarketingConsent() {
   }
 }
 
-/**
- * @deprecated Use setAvatarType instead
- * @param val - Boolean value for blockie preference
- */
-export function setUseBlockie(
-  val: boolean,
-): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  return async (dispatch: MetaMaskReduxDispatch) => {
-    dispatch(showLoadingIndication());
-    log.debug(`background.setUseBlockie`);
-    try {
-      await submitRequestToBackground('setUseBlockie', [val]);
-    } catch (err) {
-      dispatch(displayWarning(err));
-    } finally {
-      dispatch(hideLoadingIndication());
-    }
-  };
-}
-
 export function setAvatarType(value: string) {
   return setPreference('avatarType', value);
 }
diff --git a/yarn.lock b/yarn.lock
index f8c4ccfcae74..5012ec2862d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -132,7 +132,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:7.27.1, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.24.6, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.27.1":
+"@babel/code-frame@npm:7.27.1":
   version: 7.27.1
   resolution: "@babel/code-frame@npm:7.27.1"
   dependencies:
@@ -143,6 +143,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.24.6, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.27.1, @babel/code-frame@npm:^7.28.6, @babel/code-frame@npm:^7.29.0":
+  version: 7.29.0
+  resolution: "@babel/code-frame@npm:7.29.0"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.28.5"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.1.1"
+  checksum: 10/199e15ff89007dd30675655eec52481cb245c9fdf4f81e4dc1f866603b0217b57aff25f5ffa0a95bbc8e31eb861695330cd7869ad52cc211aa63016320ef72c5
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.9":
   version: 7.25.9
   resolution: "@babel/compat-data@npm:7.25.9"
@@ -222,16 +233,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.22.5, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.24.6, @babel/generator@npm:^7.25.9, @babel/generator@npm:^7.27.3, @babel/generator@npm:^7.28.3, @babel/generator@npm:^7.7.2":
-  version: 7.28.3
-  resolution: "@babel/generator@npm:7.28.3"
+"@babel/generator@npm:^7.22.5, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.24.6, @babel/generator@npm:^7.25.9, @babel/generator@npm:^7.27.3, @babel/generator@npm:^7.29.0, @babel/generator@npm:^7.7.2":
+  version: 7.29.1
+  resolution: "@babel/generator@npm:7.29.1"
   dependencies:
-    "@babel/parser": "npm:^7.28.3"
-    "@babel/types": "npm:^7.28.2"
+    "@babel/parser": "npm:^7.29.0"
+    "@babel/types": "npm:^7.29.0"
     "@jridgewell/gen-mapping": "npm:^0.3.12"
     "@jridgewell/trace-mapping": "npm:^0.3.28"
     jsesc: "npm:^3.0.2"
-  checksum: 10/d00d1e6b51059e47594aab7920b88ec6fcef6489954a9172235ab57ad2e91b39c95376963a6e2e4cc7e8b88fa4f931018f71f9ab32bbc9c0bc0de35a0231f26c
+  checksum: 10/61fe4ddd6e817aa312a14963ccdbb5c9a8c57e8b97b98d19a8a99ccab2215fda1a5f52bc8dd8d2e3c064497ddeb3ab8ceb55c76fa0f58f8169c34679d2256fe0
   languageName: node
   linkType: hard
 
@@ -267,20 +278,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.25.9":
-  version: 7.28.3
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.28.3"
+"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.25.9, @babel/helper-create-class-features-plugin@npm:^7.28.6":
+  version: 7.28.6
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.28.6"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.27.3"
-    "@babel/helper-member-expression-to-functions": "npm:^7.27.1"
+    "@babel/helper-member-expression-to-functions": "npm:^7.28.5"
     "@babel/helper-optimise-call-expression": "npm:^7.27.1"
-    "@babel/helper-replace-supers": "npm:^7.27.1"
+    "@babel/helper-replace-supers": "npm:^7.28.6"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.28.3"
+    "@babel/traverse": "npm:^7.28.6"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/32d01bdd601b4d129b1d510058a19644abc764badcc543adaec9e71443e874ef252783cceb2809645bdf0e92b07f206fd439c75a2a48cf702c627aba7f3ee34a
+  checksum: 10/11f55607fcf66827ade745c0616aa3c6086aa655c0fab665dd3c4961829752e4c94c942262db30c4831ef9bce37ad444722e85ef1b7136587e28c6b1ef8ad43c
   languageName: node
   linkType: hard
 
@@ -347,13 +358,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.27.1"
+"@babel/helper-member-expression-to-functions@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.28.5"
   dependencies:
-    "@babel/traverse": "npm:^7.27.1"
-    "@babel/types": "npm:^7.27.1"
-  checksum: 10/533a5a2cf1c9a8770d241b86d5f124c88e953c831a359faf1ac7ba1e632749c1748281b83295d227fe6035b202d81f3d3a1ea13891f150c6538e040668d6126a
+    "@babel/traverse": "npm:^7.28.5"
+    "@babel/types": "npm:^7.28.5"
+  checksum: 10/05e0857cf7913f03d88ca62952d3888693c21a4f4d7cfc141c630983f71fc0a64393e05cecceb7701dfe98298f7cc38fcb735d892e3c8c6f56f112c85ee1b154
   languageName: node
   linkType: hard
 
@@ -390,10 +401,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.27.1, @babel/helper-plugin-utils@npm:^7.8.0":
-  version: 7.27.1
-  resolution: "@babel/helper-plugin-utils@npm:7.27.1"
-  checksum: 10/96136c2428888e620e2ec493c25888f9ceb4a21099dcf3dd4508ea64b58cdedbd5a9fb6c7b352546de84d6c24edafe482318646932a22c449ebd16d16c22d864
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.27.1, @babel/helper-plugin-utils@npm:^7.28.6, @babel/helper-plugin-utils@npm:^7.8.0":
+  version: 7.28.6
+  resolution: "@babel/helper-plugin-utils@npm:7.28.6"
+  checksum: 10/21c853bbc13dbdddf03309c9a0477270124ad48989e1ad6524b83e83a77524b333f92edd2caae645c5a7ecf264ec6d04a9ebe15aeb54c7f33c037b71ec521e4a
   languageName: node
   linkType: hard
 
@@ -410,16 +421,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.25.9, @babel/helper-replace-supers@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/helper-replace-supers@npm:7.27.1"
+"@babel/helper-replace-supers@npm:^7.25.9, @babel/helper-replace-supers@npm:^7.28.6":
+  version: 7.28.6
+  resolution: "@babel/helper-replace-supers@npm:7.28.6"
   dependencies:
-    "@babel/helper-member-expression-to-functions": "npm:^7.27.1"
+    "@babel/helper-member-expression-to-functions": "npm:^7.28.5"
     "@babel/helper-optimise-call-expression": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.27.1"
+    "@babel/traverse": "npm:^7.28.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/72e3f8bef744c06874206bf0d80a0abbedbda269586966511c2491df4f6bf6d47a94700810c7a6737345a545dfb8295222e1e72f506bcd0b40edb3f594f739ea
+  checksum: 10/ad2724713a4d983208f509e9607e8f950855f11bd97518a700057eb8bec69d687a8f90dc2da0c3c47281d2e3b79cf1d14ecf1fe3e1ee0a8e90b61aee6759c9a7
   languageName: node
   linkType: hard
 
@@ -459,10 +470,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.24.6, @babel/helper-validator-identifier@npm:^7.25.9, @babel/helper-validator-identifier@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/helper-validator-identifier@npm:7.27.1"
-  checksum: 10/75041904d21bdc0cd3b07a8ac90b11d64cd3c881e89cb936fa80edd734bf23c35e6bd1312611e8574c4eab1f3af0f63e8a5894f4699e9cfdf70c06fcf4252320
+"@babel/helper-validator-identifier@npm:^7.24.6, @babel/helper-validator-identifier@npm:^7.25.9, @babel/helper-validator-identifier@npm:^7.27.1, @babel/helper-validator-identifier@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/helper-validator-identifier@npm:7.28.5"
+  checksum: 10/8e5d9b0133702cfacc7f368bf792f0f8ac0483794877c6dca5fcb73810ee138e27527701826fb58a40a004f3a5ec0a2f3c3dd5e326d262530b119918f3132ba7
   languageName: node
   linkType: hard
 
@@ -546,14 +557,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.24.6, @babel/parser@npm:^7.25.3, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.27.2, @babel/parser@npm:^7.27.3, @babel/parser@npm:^7.28.3, @babel/parser@npm:^7.28.4":
-  version: 7.28.4
-  resolution: "@babel/parser@npm:7.28.4"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.24.6, @babel/parser@npm:^7.25.3, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.27.3, @babel/parser@npm:^7.28.6, @babel/parser@npm:^7.29.0":
+  version: 7.29.2
+  resolution: "@babel/parser@npm:7.29.2"
   dependencies:
-    "@babel/types": "npm:^7.28.4"
+    "@babel/types": "npm:^7.29.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10/f54c46213ef180b149f6a17ea765bf40acc1aebe2009f594e2a283aec69a190c6dda1fdf24c61a258dbeb903abb8ffb7a28f1a378f8ab5d333846ce7b7e23bf1
+  checksum: 10/45d050bf75aa5194b3255f156173e8553d615ff5a2434674cc4a10cdc7c261931befb8618c996a1c449b87f0ef32a3407879af2ac967d95dc7b4fdbae7037efa
   languageName: node
   linkType: hard
 
@@ -895,15 +906,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.22.5, @babel/plugin-transform-class-properties@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-class-properties@npm:7.25.9"
+"@babel/plugin-transform-class-properties@npm:^7.22.5, @babel/plugin-transform-class-properties@npm:^7.25.9, @babel/plugin-transform-class-properties@npm:^7.28.6":
+  version: 7.28.6
+  resolution: "@babel/plugin-transform-class-properties@npm:7.28.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-create-class-features-plugin": "npm:^7.28.6"
+    "@babel/helper-plugin-utils": "npm:^7.28.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/a8d69e2c285486b63f49193cbcf7a15e1d3a5f632c1c07d7a97f65306df7f554b30270b7378dde143f8b557d1f8f6336c643377943dec8ec405e4cd11e90b9ea
+  checksum: 10/200f30d44b36a768fa3a8cf690db9e333996af2ad14d9fa1b4c91a427ed9302907873b219b4ce87517ca1014a810eb2e929a6a66be68473f72b546fc64d04fbc
   languageName: node
   linkType: hard
 
@@ -1263,28 +1274,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.22.5, @babel/plugin-transform-private-methods@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-private-methods@npm:7.25.9"
+"@babel/plugin-transform-private-methods@npm:^7.22.5, @babel/plugin-transform-private-methods@npm:^7.25.9, @babel/plugin-transform-private-methods@npm:^7.28.6":
+  version: 7.28.6
+  resolution: "@babel/plugin-transform-private-methods@npm:7.28.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-create-class-features-plugin": "npm:^7.28.6"
+    "@babel/helper-plugin-utils": "npm:^7.28.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/6e3671b352c267847c53a170a1937210fa8151764d70d25005e711ef9b21969aaf422acc14f9f7fb86bc0e4ec43e7aefcc0ad9196ae02d262ec10f509f126a58
+  checksum: 10/b80179b28f6a165674d0b0d6c6349b13a01dd282b18f56933423c0a33c23fc0626c8f011f859fc20737d021fe966eb8474a5233e4596401482e9ee7fb00e2aa2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.9"
+"@babel/plugin-transform-private-property-in-object@npm:^7.25.9, @babel/plugin-transform-private-property-in-object@npm:^7.27.1":
+  version: 7.28.6
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.28.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
-    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-annotate-as-pure": "npm:^7.27.3"
+    "@babel/helper-create-class-features-plugin": "npm:^7.28.6"
+    "@babel/helper-plugin-utils": "npm:^7.28.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/aa45bb5669b610afa763d774a4b5583bb60ce7d38e4fd2dedfd0703e73e25aa560e6c6124e155aa90b101601743b127d9e5d3eb00989a7e4b4ab9c2eb88475ba
+  checksum: 10/d02008c62fd32ff747b850b8581ab5076b717320e1cb01c7fc66ebf5169095bd922e18cfb269992f85bc7fbd2cc61e5b5af25e2b54aad67411474b789ea94d5f
   languageName: node
   linkType: hard
 
@@ -1657,14 +1668,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.5, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.9, @babel/template@npm:^7.27.2, @babel/template@npm:^7.3.3":
-  version: 7.27.2
-  resolution: "@babel/template@npm:7.27.2"
+"@babel/template@npm:^7.22.5, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.9, @babel/template@npm:^7.27.2, @babel/template@npm:^7.28.6, @babel/template@npm:^7.3.3":
+  version: 7.28.6
+  resolution: "@babel/template@npm:7.28.6"
   dependencies:
-    "@babel/code-frame": "npm:^7.27.1"
-    "@babel/parser": "npm:^7.27.2"
-    "@babel/types": "npm:^7.27.1"
-  checksum: 10/fed15a84beb0b9340e5f81566600dbee5eccd92e4b9cc42a944359b1aa1082373391d9d5fc3656981dff27233ec935d0bc96453cf507f60a4b079463999244d8
+    "@babel/code-frame": "npm:^7.28.6"
+    "@babel/parser": "npm:^7.28.6"
+    "@babel/types": "npm:^7.28.6"
+  checksum: 10/0ad6e32bf1e7e31bf6b52c20d15391f541ddd645cbd488a77fe537a15b280ee91acd3a777062c52e03eedbc2e1f41548791f6a3697c02476ec5daf49faa38533
   languageName: node
   linkType: hard
 
@@ -1701,18 +1712,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.3, @babel/traverse@npm:^7.4.5":
-  version: 7.28.4
-  resolution: "@babel/traverse@npm:7.28.4"
+"@babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.5, @babel/traverse@npm:^7.28.6, @babel/traverse@npm:^7.4.5":
+  version: 7.29.0
+  resolution: "@babel/traverse@npm:7.29.0"
   dependencies:
-    "@babel/code-frame": "npm:^7.27.1"
-    "@babel/generator": "npm:^7.28.3"
+    "@babel/code-frame": "npm:^7.29.0"
+    "@babel/generator": "npm:^7.29.0"
     "@babel/helper-globals": "npm:^7.28.0"
-    "@babel/parser": "npm:^7.28.4"
-    "@babel/template": "npm:^7.27.2"
-    "@babel/types": "npm:^7.28.4"
+    "@babel/parser": "npm:^7.29.0"
+    "@babel/template": "npm:^7.28.6"
+    "@babel/types": "npm:^7.29.0"
     debug: "npm:^4.3.1"
-  checksum: 10/c3099364b7b1c36bcd111099195d4abeef16499e5defb1e56766b754e8b768c252e856ed9041665158aa1b31215fc6682632756803c8fa53405381ec08c4752b
+  checksum: 10/3a0d0438f1ba9fed4fbe1706ea598a865f9af655a16ca9517ab57bda526e224569ca1b980b473fb68feea5e08deafbbf2cf9febb941f92f2d2533310c3fc4abc
   languageName: node
   linkType: hard
 
@@ -1737,13 +1748,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.6, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.28.4
-  resolution: "@babel/types@npm:7.28.4"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.6, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.5, @babel/types@npm:^7.28.6, @babel/types@npm:^7.29.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.29.0
+  resolution: "@babel/types@npm:7.29.0"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.27.1"
-    "@babel/helper-validator-identifier": "npm:^7.27.1"
-  checksum: 10/db50bf257aafa5d845ad16dae0587f57d596e4be4cbb233ea539976a4c461f9fbcc0bf3d37adae3f8ce5dcb4001462aa608f3558161258b585f6ce6ce21a2e45
+    "@babel/helper-validator-identifier": "npm:^7.28.5"
+  checksum: 10/bfc2b211210f3894dcd7e6a33b2d1c32c93495dc1e36b547376aa33441abe551ab4bc1640d4154ee2acd8e46d3bbc925c7224caae02fcaf0e6a771e97fccc661
   languageName: node
   linkType: hard
 
@@ -3885,12 +3896,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@httptoolkit/httpolyglot@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "@httptoolkit/httpolyglot@npm:2.2.1"
+"@httptoolkit/httpolyglot@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@httptoolkit/httpolyglot@npm:3.0.1"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/97ff0ef69251dfb0d526e0bfdcde44ffcbdc31a3ea6c42f48ef1dc2ec570787def8c1cb42dc8da6640eb91507e6afd70e622048bcac2199bc890c8e6eb4f5c22
+  checksum: 10/fcc94a297fda59d15d89c29fffa31cfed170c63482476a3b6ec5e2442efafe3dad48fd5489d1e2c5169c78986d5ca06a9ca8e9d7687dfca60e5eba1c545e5435
   languageName: node
   linkType: hard
 
@@ -3909,6 +3920,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@httptoolkit/util@npm:^0.1.7":
+  version: 0.1.9
+  resolution: "@httptoolkit/util@npm:0.1.9"
+  checksum: 10/b9f22f55e7d58bf979f18d9fcd256cc0d284065a678e8d9095a79017615e5a0d177d5c1125ab90469088ae0f75dfe76b29a3273fa293d84709e57f8f8feec6ff
+  languageName: node
+  linkType: hard
+
 "@httptoolkit/websocket-stream@npm:^6.0.1":
   version: 6.0.1
   resolution: "@httptoolkit/websocket-stream@npm:6.0.1"
@@ -5591,19 +5609,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/account-tree-controller@npm:^5.0.0, @metamask/account-tree-controller@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@metamask/account-tree-controller@npm:5.0.1"
+"@metamask/account-tree-controller@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@metamask/account-tree-controller@npm:7.0.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/multichain-account-service": "npm:^7.1.0"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/multichain-account-service": "npm:^8.0.1"
+    "@metamask/profile-sync-controller": "npm:^28.0.2"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     fast-deep-equal: "npm:^3.1.3"
@@ -5611,7 +5630,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/3b2739424e6aeae84e25a5b9326a43bfb905ca6223c34accbc7a9d4de933ccea7ff7bd5f221c84aa3d579ae50b4246fe28c2ab07ebb9db028e382a7629e38bd8
+  checksum: 10/d5383892f0962e7ea9d6215992a0a7de918cdf4009cc53f51baa0dae3d4f4e428d3ca3a6931e0919b3ac9ac9d1f1ec7f3ecae211bdafca00c34b1edd35046e27
   languageName: node
   linkType: hard
 
@@ -5622,22 +5641,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/accounts-controller@npm:37.0.0":
-  version: 37.0.0
-  resolution: "@metamask/accounts-controller@npm:37.0.0"
+"@metamask/accounts-controller@npm:^37.0.0, @metamask/accounts-controller@npm:^37.1.0, @metamask/accounts-controller@npm:^37.1.1":
+  version: 37.1.1
+  resolution: "@metamask/accounts-controller@npm:37.1.1"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/eth-snap-keyring": "npm:^19.0.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
     "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     deepmerge: "npm:^4.2.2"
@@ -5648,19 +5667,19 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/4ea9a310d707160b05a314090a7a1e7eee9bcf68e0cc82e1aa471fc2932560fde856176748328932ed4d10a16a6ff8cb9288d10be8821a4460ee76290bf8d747
+  checksum: 10/01a2afd596ebcb850e8742b749004b5b4d904eff1b29506178a6feee9bd51aab9992bd1ca2af4ff548034216bf85e3f7e9ad200999a53f3733800293bdd7be5a
   languageName: node
   linkType: hard
 
-"@metamask/address-book-controller@npm:^7.0.1, @metamask/address-book-controller@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "@metamask/address-book-controller@npm:7.1.0"
+"@metamask/address-book-controller@npm:^7.0.1, @metamask/address-book-controller@npm:^7.1.0, @metamask/address-book-controller@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "@metamask/address-book-controller@npm:7.1.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/utils": "npm:^11.9.0"
-  checksum: 10/0c2feddcfcd16e535bc6af2268917a8327ad4c54f6ae6c6df4cfe1ddcda2045e5984ae42e8cb7b9a32e7b5604bfcc70c72015b3756fe9773cb2d18542d33f5b4
+  checksum: 10/0e61958eab6c7f1472d270156398c819c648c9a3a093ed63abaadd7554330befa8149b929c8cb803f4b959fd0ceb71b42bf67b8680ea296f5e224df9b0216b44
   languageName: node
   linkType: hard
 
@@ -5701,92 +5720,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/approval-controller@npm:9.0.0"
+"@metamask/approval-controller@npm:^9.0.0, @metamask/approval-controller@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@metamask/approval-controller@npm:9.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.9.0"
     nanoid: "npm:^3.3.8"
-  checksum: 10/3eea0d1f291c159f096ed74d029531af529dc1e94bf1246ce3718bf91c11510fb3a52348eae5547b18af799213beee48f3cfe7d701909e9e527d6d4fe33e0152
+  checksum: 10/980e7ded7022a887c11693226922f9814d160c93fe5297380addafebe9b6e9191ba3acc7bf54775c8c8eeb7e07bcfcaaf79cc90361ff18fa04c1d449eab2ed33
   languageName: node
   linkType: hard
 
-"@metamask/assets-controller@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@metamask/assets-controller@npm:2.4.0"
-  dependencies:
-    "@ethereumjs/util": "npm:^9.1.0"
-    "@ethersproject/abi": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/account-tree-controller": "npm:^5.0.1"
-    "@metamask/assets-controllers": "npm:^101.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/client-controller": "npm:^1.0.0"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/core-backend": "npm:^6.1.1"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-snap-client": "npm:^8.2.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/network-enablement-controller": "npm:^5.0.0"
-    "@metamask/permission-controller": "npm:^12.2.1"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/preferences-controller": "npm:^23.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
-    "@metamask/utils": "npm:^11.9.0"
-    async-mutex: "npm:^0.5.0"
-    bignumber.js: "npm:^9.1.2"
-    lodash: "npm:^4.17.21"
-    p-limit: "npm:^3.1.0"
-  checksum: 10/7c9d489736617508de3464539f1d2370b720c83d0b62e17ddd9593f8de0fbe2f1f97c65ff86c76793114b79f209c25d975ab169adf1a256ac5116d9f26e86db0
-  languageName: node
-  linkType: hard
-
-"@metamask/assets-controller@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@metamask/assets-controller@npm:3.1.1"
+"@metamask/assets-controller@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "@metamask/assets-controller@npm:3.2.1"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/account-tree-controller": "npm:^5.0.1"
-    "@metamask/assets-controllers": "npm:^101.0.1"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/client-controller": "npm:^1.0.0"
+    "@metamask/account-tree-controller": "npm:^7.0.0"
+    "@metamask/assets-controllers": "npm:^103.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/client-controller": "npm:^1.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/core-backend": "npm:^6.2.0"
+    "@metamask/core-backend": "npm:^6.2.1"
     "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
     "@metamask/keyring-snap-client": "npm:^8.2.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/network-enablement-controller": "npm:^5.0.0"
-    "@metamask/permission-controller": "npm:^12.2.1"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/preferences-controller": "npm:^23.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/transaction-controller": "npm:^63.1.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/network-enablement-controller": "npm:^5.0.1"
+    "@metamask/permission-controller": "npm:^12.3.0"
+    "@metamask/polling-controller": "npm:^16.0.4"
+    "@metamask/preferences-controller": "npm:^23.1.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
     bignumber.js: "npm:^9.1.2"
     lodash: "npm:^4.17.21"
     p-limit: "npm:^3.1.0"
-  checksum: 10/31d2de936f003be07c56dd7e248d22b70fcadaa35f41e463946ea3cacdfad927336a8315222ea92e0eb2c032f5b9cf4dc1e4c55e27ad5a5ac955a6c6cea075c6
+  checksum: 10/017cb5d9546e468ad9890686c077d062fbf68a5a28f49f5fab091e9fbdd51b26d61d2b8f171fd04e9fbdd7e8eea2317d17b101c05244c91fd935afddbbf21102
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^100.0.3":
-  version: 100.2.1
-  resolution: "@metamask/assets-controllers@npm:100.2.1"
+"@metamask/assets-controllers@npm:^103.0.0":
+  version: 103.0.0
+  resolution: "@metamask/assets-controllers@npm:103.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
@@ -5795,88 +5779,32 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/abi-utils": "npm:^2.0.3"
-    "@metamask/account-tree-controller": "npm:^5.0.1"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/approval-controller": "npm:^8.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/account-tree-controller": "npm:^7.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/contract-metadata": "npm:^2.4.0"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/core-backend": "npm:^6.1.1"
+    "@metamask/core-backend": "npm:^6.2.1"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-account-service": "npm:^7.1.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/network-enablement-controller": "npm:^4.2.0"
-    "@metamask/permission-controller": "npm:^12.2.0"
-    "@metamask/phishing-controller": "npm:^16.3.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/preferences-controller": "npm:^23.0.0"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/storage-service": "npm:^1.0.0"
-    "@metamask/transaction-controller": "npm:^62.21.0"
-    "@metamask/utils": "npm:^11.9.0"
-    "@types/bn.js": "npm:^5.1.5"
-    "@types/uuid": "npm:^8.3.0"
-    async-mutex: "npm:^0.5.0"
-    bitcoin-address-validation: "npm:^2.2.3"
-    bn.js: "npm:^5.2.1"
-    immer: "npm:^9.0.6"
-    lodash: "npm:^4.17.21"
-    multiformats: "npm:^9.9.0"
-    reselect: "npm:^5.1.1"
-    single-call-balance-checker-abi: "npm:^1.0.0"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/providers": ^22.0.0
-    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/383546ac2d9263332d32b3e50b0afd8eb1356e5fd5feb4b2aadb2cee01d5737757925304b484e3ca2d5e27dc727431fd0ef4de6b077859e15733d99ce1d67066
-  languageName: node
-  linkType: hard
-
-"@metamask/assets-controllers@npm:^101.0.0, @metamask/assets-controllers@npm:^101.0.1":
-  version: 101.0.1
-  resolution: "@metamask/assets-controllers@npm:101.0.1"
-  dependencies:
-    "@ethereumjs/util": "npm:^9.1.0"
-    "@ethersproject/abi": "npm:^5.7.0"
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/contracts": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/abi-utils": "npm:^2.0.3"
-    "@metamask/account-tree-controller": "npm:^5.0.1"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/core-backend": "npm:^6.2.0"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-account-service": "npm:^7.1.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/network-enablement-controller": "npm:^5.0.0"
-    "@metamask/permission-controller": "npm:^12.2.1"
-    "@metamask/phishing-controller": "npm:^17.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/preferences-controller": "npm:^23.0.0"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
+    "@metamask/multichain-account-service": "npm:^8.0.1"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/network-enablement-controller": "npm:^5.0.1"
+    "@metamask/permission-controller": "npm:^12.3.0"
+    "@metamask/phishing-controller": "npm:^17.1.0"
+    "@metamask/polling-controller": "npm:^16.0.4"
+    "@metamask/preferences-controller": "npm:^23.1.0"
+    "@metamask/profile-sync-controller": "npm:^28.0.2"
     "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/storage-service": "npm:^1.0.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/storage-service": "npm:^1.0.1"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
@@ -5892,7 +5820,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/183443bcc72fa08eabda0a7c7d853bc97fb18afb89fca9440fce4fcdd7bf5d34dfdaa3de7ea0497a9c5312faaf60565ad67f23ff2c5166ed732ba523701659e9
+  checksum: 10/dfa1e0dcf91f94f365046086915aa52f004b43550bdd9f4c97f7a32da7a554f8c091c5d6457384710ea7b5f263720782b28a4d28c8600267b0f96f49737b72a5
   languageName: node
   linkType: hard
 
@@ -5958,155 +5886,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/base-controller@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/base-controller@npm:9.0.0"
+"@metamask/base-controller@npm:^9.0.0, @metamask/base-controller@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@metamask/base-controller@npm:9.0.1"
   dependencies:
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/utils": "npm:^11.8.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/utils": "npm:^11.9.0"
     immer: "npm:^9.0.6"
-  checksum: 10/27554d34ec85c4b585b87850c90dfeaaf9c7e6430f2ab2fa80a1ec06ccc17641e118afab7ad765a0b7255ffef37bc9f6ca5065d459228a2dc660bc463293310d
+  checksum: 10/bc5052c9a38c21a52003e9a79de1f609ff127d939c87eb7b9ebe01cdf05ce2a9ee8e4635dd96f193e9951983e9554d9381af303fbadaae740445ffb2424698e8
   languageName: node
   linkType: hard
 
-"@metamask/bitcoin-wallet-snap@npm:^1.10.0":
-  version: 1.10.0
-  resolution: "@metamask/bitcoin-wallet-snap@npm:1.10.0"
-  checksum: 10/43bc519f0d6f243658c32ddce3418277f2c7b745a37713ad2eb7927ff6fcc038f7c23dc6fb1933b56bc7ffb5e6dacf403470ee215cf5e0a138e765cd0b14ada5
-  languageName: node
-  linkType: hard
-
-"@metamask/bridge-controller@npm:^68.0.0":
-  version: 68.0.0
-  resolution: "@metamask/bridge-controller@npm:68.0.0"
+"@metamask/base-data-service@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@metamask/base-data-service@npm:0.1.0"
   dependencies:
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/constants": "npm:^5.7.0"
-    "@ethersproject/contracts": "npm:^5.7.0"
-    "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/accounts-controller": "npm:^36.0.1"
-    "@metamask/assets-controllers": "npm:^100.0.3"
-    "@metamask/base-controller": "npm:^9.0.0"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.0.3"
-    "@metamask/keyring-api": "npm:^21.5.0"
     "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-network-controller": "npm:^3.0.4"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/profile-sync-controller": "npm:^27.1.0"
-    "@metamask/remote-feature-flag-controller": "npm:^4.1.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/transaction-controller": "npm:^62.19.0"
     "@metamask/utils": "npm:^11.9.0"
-    bignumber.js: "npm:^9.1.2"
-    reselect: "npm:^5.1.1"
-    uuid: "npm:^8.3.2"
-  checksum: 10/e92d96c7e421efeadcccdd58c87e3f5b171f3a8eff035dae8fff602b162902652b2738ae4aec62e48b432fefcab1736f69f7a2026ba7686151fafe73601c6a9b
+    "@tanstack/query-core": "npm:^4.43.0"
+    fast-deep-equal: "npm:^3.1.3"
+  checksum: 10/1a6c7cde54fa3a1d5378cfbb33891cb640c913421e747126587dc432e4c52c0510ba1f6dc18ab615528bf721b0f122c48707ba382dfa80fe9eff60fff0a0d26a
+  languageName: node
+  linkType: hard
+
+"@metamask/bitcoin-wallet-snap@npm:^1.10.1":
+  version: 1.10.1
+  resolution: "@metamask/bitcoin-wallet-snap@npm:1.10.1"
+  checksum: 10/647c0c6211011a54f97fe58f97e930693c8dd64a861969d3546486fdadc8f0efb7b39328469a07408c8ab76fc79d63a74d06c12de91e60204ce040f8ee89741d
   languageName: node
   linkType: hard
 
-"@metamask/bridge-controller@npm:^69.1.1":
-  version: 69.1.1
-  resolution: "@metamask/bridge-controller@npm:69.1.1"
+"@metamask/bridge-controller@npm:^69.2.3":
+  version: 69.2.3
+  resolution: "@metamask/bridge-controller@npm:69.2.3"
   dependencies:
     "@ethersproject/address": "npm:^5.7.0"
     "@ethersproject/bignumber": "npm:^5.7.0"
     "@ethersproject/constants": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/assets-controller": "npm:^2.4.0"
-    "@metamask/assets-controllers": "npm:^101.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/assets-controller": "npm:^3.2.1"
+    "@metamask/assets-controllers": "npm:^103.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/gas-fee-controller": "npm:^26.1.1"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-network-controller": "npm:^3.0.5"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/remote-feature-flag-controller": "npm:^4.1.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/multichain-network-controller": "npm:^3.0.6"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/polling-controller": "npm:^16.0.4"
+    "@metamask/profile-sync-controller": "npm:^28.0.2"
+    "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     bignumber.js: "npm:^9.1.2"
     reselect: "npm:^5.1.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/fac684a9caac65c336464affd8647d34ab0e4ccdddb3db95ffc741c454732df2eae52db6d9d6980ee04e38bd696d09e4c40fce30911bdea6c51fc5b91cf06320
-  languageName: node
-  linkType: hard
-
-"@metamask/bridge-status-controller@npm:69.0.0":
-  version: 69.0.0
-  resolution: "@metamask/bridge-status-controller@npm:69.0.0"
-  dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bridge-controller": "npm:^69.1.1"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
-    "@metamask/utils": "npm:^11.9.0"
-    bignumber.js: "npm:^9.1.2"
-    uuid: "npm:^8.3.2"
-  checksum: 10/65a08737028eff08ce1b0438e3836418f70a7c30fd49ed5117df98271cd94923e08cfe29790dfb600c8d8232401afb0807b7d92d237204d4b86190bccc47d809
-  languageName: node
-  linkType: hard
-
-"@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@npm%3A69.0.0#~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch::version=69.0.0&hash=ca26bd":
-  version: 69.0.0
-  resolution: "@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@npm%3A69.0.0#~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch::version=69.0.0&hash=ca26bd"
-  dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bridge-controller": "npm:^69.1.1"
-    "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
-    "@metamask/utils": "npm:^11.9.0"
-    bignumber.js: "npm:^9.1.2"
-    uuid: "npm:^8.3.2"
-  checksum: 10/e3c4aa4b0b493c179edda3d1eb80df14b2bfd3c326897f74c5c1f3ce5691c3c99a15a0d5d1cbddd9a8336eaeb8b441bdad735e0d78879fbfbcc52cbff4fa2c88
+  checksum: 10/9a346e147101c18bf5d0f09695d4405c45f80149e301fa27f92b57a138058127cdd5036818312fe02c71611a10b375aaa19455a81748d96ad6e7b55c6756901e
   languageName: node
   linkType: hard
 
-"@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@patch%3A@metamask/bridge-status-controller@npm%253A69.0.0%23~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch%3A%3Aversion=69.0.0&hash=ca26bd#~/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch":
-  version: 69.0.0
-  resolution: "@metamask/bridge-status-controller@patch:@metamask/bridge-status-controller@patch%3A@metamask/bridge-status-controller@npm%253A69.0.0%23~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch%3A%3Aversion=69.0.0&hash=ca26bd#~/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch::version=69.0.0&hash=299123"
+"@metamask/bridge-status-controller@npm:^70.0.3":
+  version: 70.0.3
+  resolution: "@metamask/bridge-status-controller@npm:70.0.3"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bridge-controller": "npm:^69.1.1"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/bridge-controller": "npm:^69.2.3"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
+    "@metamask/gas-fee-controller": "npm:^26.1.1"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/polling-controller": "npm:^16.0.4"
+    "@metamask/profile-sync-controller": "npm:^28.0.2"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     bignumber.js: "npm:^9.1.2"
     uuid: "npm:^8.3.2"
-  checksum: 10/09a2a30561a59a03fcddcb497a48827f0307efe15e3f02b764f6f6f9bd1a63d88222887e3faf416f726c93e1bd123553488d809b6073cca8c900d2bb9f928662
+  checksum: 10/d8a553dab473aa904244661253beabbbc936b7323f72d7973b3287fb48711cc19072305a6c9a83419b625bcb008cc471e9d4c510e7dd4ff368c9f75d13176b3b
   languageName: node
   linkType: hard
 
@@ -6136,17 +5999,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/chain-agnostic-permission@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@metamask/chain-agnostic-permission@npm:1.4.0"
+"@metamask/chain-agnostic-permission@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@metamask/chain-agnostic-permission@npm:1.5.0"
   dependencies:
     "@metamask/api-specs": "npm:^0.14.0"
-    "@metamask/controller-utils": "npm:^11.17.0"
-    "@metamask/permission-controller": "npm:^12.2.0"
+    "@metamask/controller-utils": "npm:^11.19.0"
+    "@metamask/permission-controller": "npm:^12.2.1"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.9.0"
     lodash: "npm:^4.17.21"
-  checksum: 10/fecd0ead0423b283519d8e2a4c783621a4323c961e7ff33653ef0c7fe4a0b3b039918b082c76267a1beb3c11178283a0c1b7e0dc18b3030e5e2019e7cbd10080
+  checksum: 10/d9d7f912d911623bbbec7952ef8f5d882d7d79bca75915dfa7366a6abc22a2b7bd22c267f84a6c5c628a6fd484d69aecfa1a95d6840ca2ccfd5ff5f247f0bb8b
   languageName: node
   linkType: hard
 
@@ -6162,13 +6025,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/client-controller@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@metamask/client-controller@npm:1.0.0"
+"@metamask/client-controller@npm:^1.0.0, @metamask/client-controller@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@metamask/client-controller@npm:1.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
-  checksum: 10/79a81ebae21fbe41cc110c5f8593751aebd64c3df98e23c4ec1b2129fa4d86d301afc3a8aa8ff65fc0c917f65c171aa6c90bce00753ec1378966cfca95f89d9c
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
+  checksum: 10/7a3db2c30c6217a018a7cc36cb40b0be21ec66d1816327619ca91e843657ea684a2194fd27a6d58cb2f9e6f5736e44277c9eb026e9606dd2ae522be68affc912
   languageName: node
   linkType: hard
 
@@ -6195,6 +6058,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/connectivity-controller@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@metamask/connectivity-controller@npm:0.2.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
+  checksum: 10/586c80931341375c713aa5a474725ec88174e6e885d5f75d23b6458b734ec0e912a8c47996bea94a82f9549c9598ba982ac99aaeccac1fd92002c35a38f5397f
+  languageName: node
+  linkType: hard
+
 "@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"
@@ -6202,7 +6075,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.14.1, @metamask/controller-utils@npm:^11.16.0, @metamask/controller-utils@npm:^11.17.0, @metamask/controller-utils@npm:^11.18.0, @metamask/controller-utils@npm:^11.19.0, @metamask/controller-utils@npm:^11.3.0":
+"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.14.1, @metamask/controller-utils@npm:^11.18.0, @metamask/controller-utils@npm:^11.19.0, @metamask/controller-utils@npm:^11.3.0":
   version: 11.19.0
   resolution: "@metamask/controller-utils@npm:11.19.0"
   dependencies:
@@ -6223,19 +6096,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/core-backend@npm:^6.1.1, @metamask/core-backend@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "@metamask/core-backend@npm:6.2.0"
+"@metamask/core-backend@npm:^6.1.1, @metamask/core-backend@npm:^6.2.0, @metamask/core-backend@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "@metamask/core-backend@npm:6.2.1"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.0"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/profile-sync-controller": "npm:^28.0.1"
     "@metamask/utils": "npm:^11.9.0"
     "@tanstack/query-core": "npm:^5.62.16"
     uuid: "npm:^8.3.2"
-  checksum: 10/6fc7619eb298d82ddf901e163b065b47cbb6933e55545cc540e02309fef1134f4843184395ddea39f4055f3bbe9588151dd95b4fe556539182b3a8d42cc4ef70
+  checksum: 10/ce31c391dd385afd9a7c4a7e79e9df55813cf7c37e590d03df5d9deed75d367621c441e76699e38fd48231a791df63a0119d9d76febb649beb687da1b99cd311
   languageName: node
   linkType: hard
 
@@ -6288,11 +6161,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-system-react@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "@metamask/design-system-react@npm:0.11.0"
+"@metamask/design-system-react@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "@metamask/design-system-react@npm:0.12.0"
   dependencies:
-    "@metamask/design-system-shared": "npm:^0.4.0"
+    "@metamask/design-system-shared": "npm:^0.5.0"
     "@metamask/jazzicon": "npm:^2.0.0"
     "@radix-ui/react-slot": "npm:^1.1.0"
     blo: "npm:^2.0.0"
@@ -6303,16 +6176,16 @@ __metadata:
     "@metamask/utils": ^11.10.0
     react: ^17.0.0 || ^18.0.0
     react-dom: ^17.0.0 || ^18.0.0
-  checksum: 10/f73cc6d61d3997d7c6f6a4e922841802343b5328828bd6186a22d1ff1ee94ef780f8705329c3e3c9a69a46279ed964d6cf0bbb9f4a48a90a4fbb9fa9f9786e7a
+  checksum: 10/f3b839c442645c97401e928cb6f4831ec507331df1527e39659593ee163366d9ebc916ce402d5056e0112af684cdbe7158525c784f3aa25c010d55546c5346a0
   languageName: node
   linkType: hard
 
-"@metamask/design-system-shared@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@metamask/design-system-shared@npm:0.4.0"
+"@metamask/design-system-shared@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@metamask/design-system-shared@npm:0.5.0"
   dependencies:
     "@metamask/utils": "npm:^11.10.0"
-  checksum: 10/e7799c011360295b6ae1cb458cd069e2df2ce27e836a6c604c3f2488ef7b76d00709afadc5c9462e47cb81a379751fd9da8684dcc704244e180870aa293cdd2b
+  checksum: 10/9b37df0e330429ecee6bc8fabe7aef0b9575383d5a86808b34ae76283c8938540a27c32f0cde9b72fdf076fbba1b926f00b58b8ec5699f3c87631b502972c870
   languageName: node
   linkType: hard
 
@@ -6388,16 +6261,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/error-reporting-service@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@metamask/error-reporting-service@npm:3.0.0"
-  dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
-  checksum: 10/f62921c4b185ae2d7524230da35e8f6e9d18554931fc1c72da2c0e59a27c8b7ceaa12d5a94f6fda4a9a313abce71fa59c76954615a13e28df7830b7e716664e5
-  languageName: node
-  linkType: hard
-
 "@metamask/eslint-config-jest@npm:^13.0.0":
   version: 13.0.0
   resolution: "@metamask/eslint-config-jest@npm:13.0.0"
@@ -6534,22 +6397,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^23.1.0":
-  version: 23.1.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:23.1.0"
+"@metamask/eth-json-rpc-middleware@npm:^23.1.0, @metamask/eth-json-rpc-middleware@npm:^23.1.1":
+  version: 23.1.1
+  resolution: "@metamask/eth-json-rpc-middleware@npm:23.1.1"
   dependencies:
     "@metamask/eth-block-tracker": "npm:^15.0.1"
-    "@metamask/eth-json-rpc-provider": "npm:^6.0.0"
+    "@metamask/eth-json-rpc-provider": "npm:^6.0.1"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/json-rpc-engine": "npm:^10.2.1"
-    "@metamask/message-manager": "npm:^14.1.0"
+    "@metamask/json-rpc-engine": "npm:^10.2.4"
+    "@metamask/message-manager": "npm:^14.1.1"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     klona: "npm:^2.0.6"
     pify: "npm:^5.0.0"
     safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10/3d122e04edfc2c317b80f465dace316e4201dcc2c9e5d191bd46e62c5cd1396855685a2caed8e6189bb858ac91ddde59afb266b0028e12354e4b61ab499bc3e3
+  checksum: 10/229859120744e22cd0da50e3af316521ddb1f470dd4e2ae9797145d7694d0355d847f1453a1280788359d5cb5ba78bdfc6b038be85287918e7a530cbaf24d1d4
   languageName: node
   linkType: hard
 
@@ -6579,15 +6442,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-provider@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "@metamask/eth-json-rpc-provider@npm:6.0.0"
+"@metamask/eth-json-rpc-provider@npm:^6.0.0, @metamask/eth-json-rpc-provider@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "@metamask/eth-json-rpc-provider@npm:6.0.1"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^10.2.0"
+    "@metamask/json-rpc-engine": "npm:^10.2.4"
     "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/utils": "npm:^11.8.1"
+    "@metamask/utils": "npm:^11.9.0"
     nanoid: "npm:^3.3.8"
-  checksum: 10/ab7cf6139af7e5d2f26406c22651d4eb103a1fbc95f7274307a35878ae7ad26d51440b56575401286d5d4e57f4f39690c44d31b4088b64cf87ccf6c2d9322436
+  checksum: 10/06078a9e43b02f35387a3ccfe09733c7eeac2a732dee1f1be53254fc05719e230776b8512b13702a178fb692088fc7da46f727c5064550d65f51ac59d44f9d83
   languageName: node
   linkType: hard
 
@@ -6687,6 +6550,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-snap-keyring@npm:^20.0.0":
+  version: 20.0.0
+  resolution: "@metamask/eth-snap-keyring@npm:20.0.0"
+  dependencies:
+    "@ethereumjs/tx": "npm:^5.4.0"
+    "@metamask/eth-sig-util": "npm:^8.2.0"
+    "@metamask/keyring-api": "npm:^22.0.0"
+    "@metamask/keyring-internal-api": "npm:^10.0.1"
+    "@metamask/keyring-internal-snap-client": "npm:^9.0.1"
+    "@metamask/keyring-snap-sdk": "npm:^8.0.0"
+    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^11.1.0"
+    "@types/uuid": "npm:^9.0.8"
+    async-mutex: "npm:^0.5.0"
+    uuid: "npm:^9.0.1"
+  peerDependencies:
+    "@metamask/keyring-api": ^22.0.0
+  checksum: 10/6da8b4ef02c700e4e1a1ec4716489e48b559e9c88b7d72de1fb9a2d7f1850d21f638dda0be23878c709508e0be471a3e1d95661d6388121d123fff9cf75ceb9c
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-token-tracker@npm:^10.0.2":
   version: 10.0.2
   resolution: "@metamask/eth-token-tracker@npm:10.0.2"
@@ -6838,16 +6727,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^26.0.3, @metamask/gas-fee-controller@npm:^26.1.0":
-  version: 26.1.0
-  resolution: "@metamask/gas-fee-controller@npm:26.1.0"
+"@metamask/gas-fee-controller@npm:^26.0.3, @metamask/gas-fee-controller@npm:^26.1.0, @metamask/gas-fee-controller@npm:^26.1.1":
+  version: 26.1.1
+  resolution: "@metamask/gas-fee-controller@npm:26.1.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/polling-controller": "npm:^16.0.4"
     "@metamask/utils": "npm:^11.9.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
@@ -6855,25 +6744,25 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@babel/runtime": ^7.0.0
-  checksum: 10/a376b8a6349461ef1aceda258af6d766832e3e89adde5dc9d0bf95d9624c498e76270ed06fd91a52aeffeb77c4d948fd742f38c721808a77383f8b39e3246359
+  checksum: 10/6697364e4f624fee18c9b195003db1e551c572f63069f824bb9d48c0d968b862e8a9f6df6155cf5cc1227f055c7dce641dbf2cadad4df0ebbab6c9f358ce88f3
   languageName: node
   linkType: hard
 
-"@metamask/gator-permissions-controller@npm:^2.1.0, @metamask/gator-permissions-controller@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@metamask/gator-permissions-controller@npm:2.1.1"
+"@metamask/gator-permissions-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@metamask/gator-permissions-controller@npm:3.0.0"
   dependencies:
     "@metamask/7715-permission-types": "npm:^0.5.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/delegation-core": "npm:^0.2.0"
     "@metamask/delegation-deployments": "npm:^0.12.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
-  checksum: 10/f78fc482e79a426921f3f98922fe4c26d890d6b20e12ce0a84fa5787778ec237bdae1c3cfc3530e1911b5d58e00091db62f64cc4b41519b0b24bbf6e2a6dc17c
+  checksum: 10/9694949d0a4c2b2c153c42b8aeff3916d18f2d46b0b22ebf614413eafbdc38b896d12d2185559f0fe99f0c84cd24cc5efaddd948374b2cd09edeeb4cce2301cc
   languageName: node
   linkType: hard
 
@@ -6898,10 +6787,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/hw-wallet-sdk@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@metamask/hw-wallet-sdk@npm:0.5.0"
-  checksum: 10/ed306846a35723968f45ee24198fd04ce6d53a461077015eda777a85efe36569009a737be74d4945a3aba894b6f193b3acd66bf19c2f7a0de4dc75d07dd24d0a
+"@metamask/hw-wallet-sdk@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@metamask/hw-wallet-sdk@npm:0.8.0"
+  checksum: 10/99e045af2f881d27b827e0f2a0546c056476f5704cbede5a7733f98bff482508e05f5cdcf3969666ccd16e97b6f362c84012390e403cd2da6b7f809fe6ad72e5
   languageName: node
   linkType: hard
 
@@ -6932,9 +6821,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.0, @metamask/json-rpc-engine@npm:^10.2.1, @metamask/json-rpc-engine@npm:^10.2.2, @metamask/json-rpc-engine@npm:^10.2.3":
-  version: 10.2.3
-  resolution: "@metamask/json-rpc-engine@npm:10.2.3"
+"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.0.3, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.2, @metamask/json-rpc-engine@npm:^10.2.3, @metamask/json-rpc-engine@npm:^10.2.4":
+  version: 10.2.4
+  resolution: "@metamask/json-rpc-engine@npm:10.2.4"
   dependencies:
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/safe-event-emitter": "npm:^3.0.0"
@@ -6942,7 +6831,7 @@ __metadata:
     "@types/deep-freeze-strict": "npm:^1.1.0"
     deep-freeze-strict: "npm:^1.1.1"
     klona: "npm:^2.0.6"
-  checksum: 10/8895ffcfc0dbf5542476dfd9771cb288feaf6fd7e9628e02c10232b3b8f0feabe3a0ad3e3480e3260a69aaafcf8f58d1d89410e7f43e97a08350b3ec3e767b1d
+  checksum: 10/b207dd2a9a44674c141c2e027c082974464a37beada98a27e80fe59c9bd44e2c2a992edf8a8d7e3ed461fa27ed372c95d4e27df18752b558c10bf540b7fe7bcd
   languageName: node
   linkType: hard
 
@@ -7005,7 +6894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-api@npm:^21.0.0, @metamask/keyring-api@npm:^21.2.0, @metamask/keyring-api@npm:^21.3.0, @metamask/keyring-api@npm:^21.4.0, @metamask/keyring-api@npm:^21.5.0, @metamask/keyring-api@npm:^21.6.0":
+"@metamask/keyring-api@npm:^21.3.0, @metamask/keyring-api@npm:^21.4.0, @metamask/keyring-api@npm:^21.5.0, @metamask/keyring-api@npm:^21.6.0":
   version: 21.6.0
   resolution: "@metamask/keyring-api@npm:21.6.0"
   dependencies:
@@ -7022,6 +6911,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-api@npm:^22.0.0":
+  version: 22.0.0
+  resolution: "@metamask/keyring-api@npm:22.0.0"
+  dependencies:
+    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^11.1.0"
+    bitcoin-address-validation: "npm:^2.2.3"
+  checksum: 10/ff1e9537c7219fb906b61d6755de28890239ec44f634732bd8571801c662e8b801671e98961a1c5047e079cef314353297499a52f7091a2b5391325d575ec4f9
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-api@npm:^8.1.3":
   version: 8.1.3
   resolution: "@metamask/keyring-api@npm:8.1.3"
@@ -7038,26 +6939,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^25.1.0":
-  version: 25.1.0
-  resolution: "@metamask/keyring-controller@npm:25.1.0"
+"@metamask/keyring-controller@npm:^25.1.0, @metamask/keyring-controller@npm:^25.1.1":
+  version: 25.1.1
+  resolution: "@metamask/keyring-controller@npm:25.1.1"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/browser-passworder": "npm:^6.0.0"
     "@metamask/eth-hd-keyring": "npm:^13.0.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/eth-simple-keyring": "npm:^11.0.0"
-    "@metamask/keyring-api": "npm:^21.0.0"
-    "@metamask/keyring-internal-api": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/keyring-internal-api": "npm:^10.0.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
     lodash: "npm:^4.17.21"
     ulid: "npm:^2.3.0"
-  checksum: 10/e81fccb901ea3627b97e725a789832eb1e1f2ae61bfc00eaee6ce5717d65a39c73d6c683c8643b87de1ce6d98db76fc3e60004acb0a4b5ea21f05a404204f708
+  checksum: 10/01fe91c90b12c083dafcb003e9df91e0746ab5b53df4559294006be7483c6bf720396200bc7ae1b6a88cdeb4f9d1478a4ee23816a48f35c50f24f51289d29ea9
   languageName: node
   linkType: hard
 
@@ -7072,29 +6973,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-internal-snap-client@npm:^8.0.0":
-  version: 8.0.1
-  resolution: "@metamask/keyring-internal-snap-client@npm:8.0.1"
-  dependencies:
-    "@metamask/keyring-api": "npm:^21.2.0"
-    "@metamask/keyring-internal-api": "npm:^9.1.1"
-    "@metamask/keyring-snap-client": "npm:^8.1.1"
-    "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-  checksum: 10/40a686cd3d1f49accde83bb2a983ac9e897498e1de5a0ccb0768e382d44dd4c273230db95bcd6eace4ad8a184e7ab4fc780770f617994a2ca29b4302890f31b6
-  languageName: node
-  linkType: hard
-
-"@metamask/keyring-internal-snap-client@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/keyring-internal-snap-client@npm:9.0.0"
+"@metamask/keyring-internal-snap-client@npm:^9.0.0, @metamask/keyring-internal-snap-client@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "@metamask/keyring-internal-snap-client@npm:9.0.1"
   dependencies:
-    "@metamask/keyring-api": "npm:^21.4.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-snap-client": "npm:^8.2.0"
+    "@metamask/keyring-api": "npm:^22.0.0"
+    "@metamask/keyring-internal-api": "npm:^10.0.1"
+    "@metamask/keyring-snap-client": "npm:^8.2.1"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/messenger": "npm:^0.3.0"
-  checksum: 10/d3a63d0a1aff343af013c5bc872f782eec80d048a76b169a17034fd004c61a42fe07d703c8227a1341569b62fb1fe091f66494c4658419a3e2827d864487e608
+  checksum: 10/fb683a7826856612d2d89a8f6eb83bd14a20e27c18dddb5c50699d0fefce7475ff9e3077b65296820cf0911ee49d4daf3014932d1b1d7bfd330612229e02e6f4
   languageName: node
   linkType: hard
 
@@ -7114,11 +7002,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-snap-client@npm:^8.1.0, @metamask/keyring-snap-client@npm:^8.1.1, @metamask/keyring-snap-client@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "@metamask/keyring-snap-client@npm:8.2.0"
+"@metamask/keyring-snap-client@npm:^8.1.0, @metamask/keyring-snap-client@npm:^8.2.0, @metamask/keyring-snap-client@npm:^8.2.1":
+  version: 8.2.1
+  resolution: "@metamask/keyring-snap-client@npm:8.2.1"
   dependencies:
-    "@metamask/keyring-api": "npm:^21.4.0"
+    "@metamask/keyring-api": "npm:^22.0.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@types/uuid": "npm:^9.0.8"
@@ -7126,7 +7014,7 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/providers": ^19.0.0
-  checksum: 10/a64dafdc718061c55da3522d1598def5d7934b60d6141af64eccc9f8a0fecf72154d6ffc202913c2dd48fff8aa3266557bb914cd09901e00dccc3849dc932868
+  checksum: 10/f69dcb56d3089dfd1bd902ad409c017288e31d3631a2024f42f6b6ee1b4f6e663ad4d7bdfd5d3bcf6c9827190d3bad6983c89f7c821959d305f6ba8f4aae0d7c
   languageName: node
   linkType: hard
 
@@ -7146,6 +7034,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-snap-sdk@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/keyring-snap-sdk@npm:8.0.0"
+  dependencies:
+    "@metamask/keyring-utils": "npm:^3.2.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^11.1.0"
+    webextension-polyfill: "npm:^0.12.0"
+  peerDependencies:
+    "@metamask/keyring-api": ^22.0.0
+    "@metamask/providers": ^19.0.0
+  checksum: 10/271b4f84d214813c0312ffbbe3fb6201b66172210da4d06a155c3ddb359403ed1fa4c7afa424cd34fa9db04e3c876f30f69afb676bb7a905d392552d871ebd57
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-utils@npm:^1.0.0":
   version: 1.3.1
   resolution: "@metamask/keyring-utils@npm:1.3.1"
@@ -7169,15 +7073,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/logging-controller@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@metamask/logging-controller@npm:8.0.0"
+"@metamask/logging-controller@npm:^8.0.0, @metamask/logging-controller@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "@metamask/logging-controller@npm:8.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.0.0"
     uuid: "npm:^8.3.2"
-  checksum: 10/08fc0b7ab2f6f1c1ccfafd2c47c9952ca19a828e11c502868a3fc434193d763c7685748de7454670e15155047d5879a1980e89eba34b0695f1754078f97f29cd
+  checksum: 10/6789bd696613eb4bba648034d8f47fb68a3462d2070d5ef20b58f6a2f017627ffda01cd50511cfde83c4132c811c9f39dfc7d07919cc4b7348dc0ac1d71cfeb9
   languageName: node
   linkType: hard
 
@@ -7191,19 +7095,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^14.0.0, @metamask/message-manager@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "@metamask/message-manager@npm:14.1.0"
+"@metamask/message-manager@npm:^14.0.0, @metamask/message-manager@npm:^14.1.1":
+  version: 14.1.1
+  resolution: "@metamask/message-manager@npm:14.1.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/controller-utils": "npm:^11.16.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/controller-utils": "npm:^11.19.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/utils": "npm:^11.8.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/utils": "npm:^11.9.0"
     "@types/uuid": "npm:^8.3.0"
     jsonschema: "npm:^1.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/0bbea914096b9213fc16283dfe7e79436f2ea21946bcd717440071b7faf36d19a08fef122d5e91f000c586e7e5e909de99d1d2d0e76c1b1b3d42e45ff78474f3
+  checksum: 10/1e1ca365378e7ba762a150805121053d0360ae7230818ed48521702e2d7a32bc8233c3ef470c269fd4cbe16454674e328a5ebda22133ffd7b1190b04897e81d4
   languageName: node
   linkType: hard
 
@@ -7214,10 +7118,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/messenger@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@metamask/messenger@npm:0.3.0"
-  checksum: 10/84e9f4193646d749c7260a4958b13974b3c8738cc2e414116279ed31734e1edba687ff56ddbfdb75033bce30aaa9eeb7c391bccb87a66dbc99a902882271f673
+"@metamask/messenger@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/messenger@npm:1.0.0"
+  checksum: 10/ab1219a922d5acc86f2b1b557d79c75ca0c5f42572f50da8a2337bc5c8feb1ae95c0aaa2d2ee55b677acd4401fb2cc9c2dbacca7513edcddf20d88fb73fa7bea
   languageName: node
   linkType: hard
 
@@ -7228,54 +7132,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/multichain-account-service@npm:7.1.0":
-  version: 7.1.0
-  resolution: "@metamask/multichain-account-service@npm:7.1.0"
-  dependencies:
-    "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/eth-snap-keyring": "npm:^19.0.0"
-    "@metamask/key-tree": "npm:^10.1.1"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-snap-client": "npm:^8.2.0"
-    "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^11.9.0"
-    async-mutex: "npm:^0.5.0"
-    lodash: "npm:^4.17.21"
-  peerDependencies:
-    "@metamask/account-api": ^1.0.0
-    "@metamask/providers": ^22.0.0
-    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/a4264b228be60fe2021a3f6ccfc1eab145c0dd104158a8184278ded2141ca888cf305fd7c4bd1274924a9eb7908b2774852848287bf27d6b972efdd6ba35e11a
-  languageName: node
-  linkType: hard
-
-"@metamask/multichain-account-service@patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch":
-  version: 7.1.0
-  resolution: "@metamask/multichain-account-service@patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch::version=7.1.0&hash=15c77a"
+"@metamask/multichain-account-service@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "@metamask/multichain-account-service@npm:8.0.1"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/eth-snap-keyring": "npm:^19.0.0"
     "@metamask/key-tree": "npm:^10.1.1"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
     "@metamask/keyring-snap-client": "npm:^8.2.0"
     "@metamask/keyring-utils": "npm:^3.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
@@ -7284,7 +7158,7 @@ __metadata:
     "@metamask/account-api": ^1.0.0
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/082dd5e4c8418addc0d50a39ef649a479147216dfed496771563c0253784b2618844e1d96b82543cf39edbcddde71e3f0c8758f1aa8516803e17737ad5395c0f
+  checksum: 10/7ac3c38db8afd47593cd7ed4cc95de99195ccd2b2903281382be83990b2a47fa2f03de77e325c1ea3c7fd96367e3eac20039994d95154d478bebacd61215140a
   languageName: node
   linkType: hard
 
@@ -7295,63 +7169,63 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/multichain-api-middleware@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "@metamask/multichain-api-middleware@npm:1.2.7"
+"@metamask/multichain-api-middleware@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/multichain-api-middleware@npm:2.0.0"
   dependencies:
     "@metamask/api-specs": "npm:^0.14.0"
-    "@metamask/chain-agnostic-permission": "npm:^1.4.0"
+    "@metamask/chain-agnostic-permission": "npm:^1.5.0"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/json-rpc-engine": "npm:^10.2.2"
+    "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/permission-controller": "npm:^12.2.0"
+    "@metamask/permission-controller": "npm:^12.2.1"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.9.0"
     "@open-rpc/meta-schema": "npm:^1.14.6"
     "@open-rpc/schema-utils-js": "npm:^2.0.5"
     jsonschema: "npm:^1.4.1"
-  checksum: 10/8c28d2cbd8517c30742c11813c69cf5708df29a4fdfdcea6d02469f560efadda14df98e3ea2f349c60c69ee3e1d6c6980b40e1b4fb53d087dd5d3084bfa51cae
+  checksum: 10/c887073833ece8daee46727a5991ff15e329557e7453b34e62f7d65add09edeaa64a14cdd4f44bb343cd2c637c1c431e7f544ee7f1db441eb4b2a9959d40a4cb
   languageName: node
   linkType: hard
 
-"@metamask/multichain-network-controller@npm:^3.0.4, @metamask/multichain-network-controller@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "@metamask/multichain-network-controller@npm:3.0.5"
+"@metamask/multichain-network-controller@npm:^3.0.4, @metamask/multichain-network-controller@npm:^3.0.5, @metamask/multichain-network-controller@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@metamask/multichain-network-controller@npm:3.0.6"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
     "@solana/addresses": "npm:^2.0.0"
     lodash: "npm:^4.17.21"
-  checksum: 10/d1648a28ff412900e59bf3bab5e020ff4d67e899d0a91cf4447c8e2a3e658438ebf9f78d4625ee29f8ef7f552ee41b6d57525e4bd57f12aa21687bfcfe654ba5
+  checksum: 10/c7e937851b8c944b30c3eafa7d2cfd8d62df9a0278583933912f3c5e1c971f072c5c7e0882677cfe251efd3885e2a0a547c404bd7c2efcf6757c6601431b42a3
   languageName: node
   linkType: hard
 
-"@metamask/multichain-transactions-controller@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "@metamask/multichain-transactions-controller@npm:7.0.2"
+"@metamask/multichain-transactions-controller@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "@metamask/multichain-transactions-controller@npm:7.0.4"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/keyring-api": "npm:^21.6.0"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
     "@metamask/keyring-snap-client": "npm:^8.2.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/polling-controller": "npm:^16.0.3"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/polling-controller": "npm:^16.0.4"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/utils": "npm:^11.9.0"
     "@types/uuid": "npm:^8.3.0"
     immer: "npm:^9.0.6"
     uuid: "npm:^8.3.2"
-  checksum: 10/6111a63600c74d7db80437fafb42eb71016210a0a5d1d860cee09f35266c07ba111a89523a62688c7cb4a1c28fdcc8033a50bd44fd88232a04b9e81cecda0e74
+  checksum: 10/e0a7ab0ddbe8f06dcf7673947c5251f908f8ba05127d724d8dba66f3456944b982b30714b198300c8dc906a5cdb00a6ecbe3928c6730bb029f61d3b308b4d669
   languageName: node
   linkType: hard
 
@@ -7368,20 +7242,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:^30.0.0":
-  version: 30.0.0
-  resolution: "@metamask/network-controller@npm:30.0.0"
+"@metamask/network-controller@npm:^30.0.0, @metamask/network-controller@npm:^30.0.1":
+  version: 30.0.1
+  resolution: "@metamask/network-controller@npm:30.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/connectivity-controller": "npm:^0.1.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/connectivity-controller": "npm:^0.2.0"
     "@metamask/controller-utils": "npm:^11.19.0"
     "@metamask/eth-block-tracker": "npm:^15.0.1"
     "@metamask/eth-json-rpc-infura": "npm:^10.3.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^23.1.0"
-    "@metamask/eth-json-rpc-provider": "npm:^6.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^23.1.1"
+    "@metamask/eth-json-rpc-provider": "npm:^6.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/json-rpc-engine": "npm:^10.2.2"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/json-rpc-engine": "npm:^10.2.4"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/swappable-obj-proxy": "npm:^2.3.0"
     "@metamask/utils": "npm:^11.9.0"
@@ -7392,11 +7266,11 @@ __metadata:
     reselect: "npm:^5.1.1"
     uri-js: "npm:^4.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/3f16a1be8f35995147580c23d5fa977c7ac5e231662ac43a75ea8bedea6b2039261bcfaac399a1a9f3dc310eed1f1f4896dcb0ff634add2597da519432789710
+  checksum: 10/8679db3ef1c1b39931c0b9133ff26eb55a4385e55e3519253cb51bed38b0ab46ea2e9112f689a7229f5cf0883135aef64d5719cb28870637d6a7c4f1e714d346
   languageName: node
   linkType: hard
 
-"@metamask/network-enablement-controller@npm:^4.1.1, @metamask/network-enablement-controller@npm:^4.2.0":
+"@metamask/network-enablement-controller@npm:^4.1.1":
   version: 4.2.0
   resolution: "@metamask/network-enablement-controller@npm:4.2.0"
   dependencies:
@@ -7414,21 +7288,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-enablement-controller@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@metamask/network-enablement-controller@npm:5.0.0"
+"@metamask/network-enablement-controller@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@metamask/network-enablement-controller@npm:5.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/keyring-api": "npm:^21.5.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/multichain-network-controller": "npm:^3.0.5"
-    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/keyring-api": "npm:^21.6.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/multichain-network-controller": "npm:^3.0.6"
+    "@metamask/network-controller": "npm:^30.0.1"
     "@metamask/slip44": "npm:^4.3.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     reselect: "npm:^5.1.1"
-  checksum: 10/8741db7961c7e4c5a08a46653407b0e147b194b0fc3009fa2959d47b0306c7d1715673211964e34991884f966a61a759d2a3c3d2bf7ca93323661f92d85fb187
+  checksum: 10/bd674ed536ad001fead7414e95736234bfc9d9aa1756882fd1c6cf331604bc4d5906e92cf5505957657aa85c2224d190b04da74fe02d9eb1f433360122652a70
   languageName: node
   linkType: hard
 
@@ -7505,22 +7379,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/permission-controller@npm:^12.2.0, @metamask/permission-controller@npm:^12.2.1":
-  version: 12.2.1
-  resolution: "@metamask/permission-controller@npm:12.2.1"
+"@metamask/permission-controller@npm:^12.2.0, @metamask/permission-controller@npm:^12.2.1, @metamask/permission-controller@npm:^12.3.0":
+  version: 12.3.0
+  resolution: "@metamask/permission-controller@npm:12.3.0"
   dependencies:
-    "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/json-rpc-engine": "npm:^10.2.3"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/json-rpc-engine": "npm:^10.2.4"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.9.0"
     "@types/deep-freeze-strict": "npm:^1.1.0"
     deep-freeze-strict: "npm:^1.1.1"
     immer: "npm:^9.0.6"
     nanoid: "npm:^3.3.8"
-  checksum: 10/610ed3acb63ca256592319c6f775e8888102c06304e46a95faf75abe898f0bf715a6254c6784a3964c0c379082cb7f1d1acfcf7db4af9bae9797f662944c3ebc
+  checksum: 10/a5fe9f2bab8c2d41cd829cd6c1af970e71da97eac42de17071c10f90d975e9135a4e6987ed6b2f3ea2209b1c6c51b822508f800225fda2207cdc598c16ea77dd
   languageName: node
   linkType: hard
 
@@ -7581,20 +7455,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/phishing-controller@npm:^17.0.0":
-  version: 17.0.0
-  resolution: "@metamask/phishing-controller@npm:17.0.0"
+"@metamask/phishing-controller@npm:^17.1.0":
+  version: 17.1.0
+  resolution: "@metamask/phishing-controller@npm:17.1.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@noble/hashes": "npm:^1.8.0"
     "@types/punycode": "npm:^2.1.0"
     ethereum-cryptography: "npm:^2.1.2"
     fastest-levenshtein: "npm:^1.0.16"
     punycode: "npm:^2.1.1"
-  checksum: 10/a1917ad63feb5c6287b7a191f78750d6455239909b0df5d07a965279638ccccb67de73d2f3cbe5596252e14b394565978bb86aa52e0adf388059d031531d0e93
+  checksum: 10/e320a060b482296e4b8820c98e5266fee9080a31666a1320338c22e95b2aeb785574d523afabc6df9aa516a2e2267ea261e42856030a929f197c9edd36bc57c5
   languageName: node
   linkType: hard
 
@@ -7613,18 +7487,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/polling-controller@npm:^16.0.0, @metamask/polling-controller@npm:^16.0.2, @metamask/polling-controller@npm:^16.0.3":
-  version: 16.0.3
-  resolution: "@metamask/polling-controller@npm:16.0.3"
+"@metamask/polling-controller@npm:^16.0.0, @metamask/polling-controller@npm:^16.0.2, @metamask/polling-controller@npm:^16.0.3, @metamask/polling-controller@npm:^16.0.4":
+  version: 16.0.4
+  resolution: "@metamask/polling-controller@npm:16.0.4"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
     "@metamask/utils": "npm:^11.9.0"
     "@types/uuid": "npm:^8.3.0"
     fast-json-stable-stringify: "npm:^2.1.0"
     uuid: "npm:^8.3.2"
-  checksum: 10/31182b6d62fa949bf8bee834a65aba819e52ce77c208faebb33f6e3982834e87877e29d2d93952264988ea309d110b003adf69f358dc5820eeab7ab3c09f924f
+  checksum: 10/c656f78f010103c65ae2018e75ef2c51c3b915bc9dd2624bdd7b06a327704a2428d0d0ec78c2570425cc611e7a7b85bfcaa9f0f0d2d16cfbc686e0e9fe3f29c2
   languageName: node
   linkType: hard
 
@@ -7666,13 +7540,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/preferences-controller@npm:^23.0.0":
-  version: 23.0.0
-  resolution: "@metamask/preferences-controller@npm:23.0.0"
+"@metamask/preferences-controller@npm:^23.0.0, @metamask/preferences-controller@npm:^23.1.0":
+  version: 23.1.0
+  resolution: "@metamask/preferences-controller@npm:23.1.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
-  checksum: 10/3dd5aa99cf781ffdc364d577536f009eaa0cdb57e8ae85ae6d311b51a358986194d8f745280518f86f1bc4b41094a89162ffad8b6c544178c0d892fe430ebf10
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
+  checksum: 10/61fe1115546ea0c1e45143c2227d7907930ae881c3f14fe6bfb260d9d4e6fdfc84e3f46af69454daeef7dcbb7d02fdb204baf0c29bf05e18212479b6e96721a0
   languageName: node
   linkType: hard
 
@@ -7749,17 +7623,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:^28.0.0":
-  version: 28.0.0
-  resolution: "@metamask/profile-sync-controller@npm:28.0.0"
+"@metamask/profile-sync-controller@npm:^28.0.0, @metamask/profile-sync-controller@npm:^28.0.1, @metamask/profile-sync-controller@npm:^28.0.2":
+  version: 28.0.2
+  resolution: "@metamask/profile-sync-controller@npm:28.0.2"
   dependencies:
-    "@metamask/address-book-controller": "npm:^7.0.1"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/snaps-controllers": "npm:^17.2.0"
-    "@metamask/snaps-sdk": "npm:^10.3.0"
-    "@metamask/snaps-utils": "npm:^11.7.0"
+    "@metamask/address-book-controller": "npm:^7.1.1"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-sdk": "npm:^11.0.0"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/utils": "npm:^11.9.0"
     "@noble/ciphers": "npm:^1.3.0"
     "@noble/hashes": "npm:^1.8.0"
@@ -7769,7 +7643,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/008f66cea003cbf4d6d8b827daf7e943ff2b1ef9ec7bcbc749a8a57860c410d44e624149a8400e82034055ffcd2a74a760a633592b558188916dfe360b1287df
+  checksum: 10/37cd8032f673436ff7a7b759287731691e864fb94b8a8b16f819de6956652bb51c4b020c1df5213113899feb5c36f03c98a35d8dce3629370725f94964ba5585
   languageName: node
   linkType: hard
 
@@ -7834,6 +7708,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ramps-controller@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "@metamask/ramps-controller@npm:12.1.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/controller-utils": "npm:^11.19.0"
+    "@metamask/messenger": "npm:^1.0.0"
+  checksum: 10/ae1f3f4cb4dd4493ed4d75220a54ce8e5878b16e3b31dbafdf5ae0256cf3f9b1ef9aad146e61609485c4a682a119fd0fdadc2489862bd6d1c480878f2dc3c409
+  languageName: node
+  linkType: hard
+
 "@metamask/rate-limit-controller@npm:^7.0.0":
   version: 7.0.0
   resolution: "@metamask/rate-limit-controller@npm:7.0.0"
@@ -7846,16 +7731,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/remote-feature-flag-controller@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@metamask/remote-feature-flag-controller@npm:4.1.0"
+"@metamask/react-data-query@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@metamask/react-data-query@npm:0.2.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/base-data-service": "npm:^0.1.0"
+    "@metamask/utils": "npm:^11.9.0"
+    "@tanstack/query-core": "npm:^4.43.0"
+    "@tanstack/react-query": "npm:^4.43.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-native: "*"
+  checksum: 10/c54a9943bb68ad46ad9964864d4ee81604e61216ebed00026a1a4681a1e1091b6e413b9812d25e38d028493f3c75e91c8102b9d1c0232f409cd6f1dd4d22b211
+  languageName: node
+  linkType: hard
+
+"@metamask/remote-feature-flag-controller@npm:^4.1.0, @metamask/remote-feature-flag-controller@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@metamask/remote-feature-flag-controller@npm:4.2.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/utils": "npm:^11.9.0"
     uuid: "npm:^8.3.2"
-  checksum: 10/30122c316e788adc2abb6875eefef189946e2af469c1b217f8617ade17693666cde896e043fcb2a65874b2e62d4499b05456345dd2425dee6f9ea92f1f2d12e3
+  checksum: 10/bb8d4cf6d90cb895d994d471d53429ed816c2b60aef85f62b0731536cc2822cda3795b16ed5bd77cf87a934bcecda7a021024f4c224d5cda866d717db76d3400
   languageName: node
   linkType: hard
 
@@ -7952,25 +7853,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/signature-controller@npm:^39.0.1, @metamask/signature-controller@npm:^39.1.0":
-  version: 39.1.0
-  resolution: "@metamask/signature-controller@npm:39.1.0"
+"@metamask/signature-controller@npm:^39.0.1, @metamask/signature-controller@npm:^39.1.2":
+  version: 39.1.2
+  resolution: "@metamask/signature-controller@npm:39.1.2"
   dependencies:
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/gator-permissions-controller": "npm:^2.1.1"
-    "@metamask/keyring-controller": "npm:^25.1.0"
-    "@metamask/logging-controller": "npm:^8.0.0"
-    "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/gator-permissions-controller": "npm:^3.0.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
+    "@metamask/logging-controller": "npm:^8.0.1"
+    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
     "@metamask/utils": "npm:^11.9.0"
     jsonschema: "npm:^1.4.1"
     lodash: "npm:^4.17.21"
     uuid: "npm:^8.3.2"
-  checksum: 10/4fb9d6492753241ec8a2681ef37ac81365cedf004a289ee9782b47341e1783112f46effdee73e2d917bbf5dc352ba1b303058917817d4139bfa044b0494b67d8
+  checksum: 10/a3f6082e0b12e339a6da3ca842cb4f6b5269e56a200abd63c9675c95c5f0d2bb2f518cebbfebc309abeb2b1b9eab7c5c7a83a487e768348ddfb33c874ff268af
   languageName: node
   linkType: hard
 
@@ -8070,24 +7971,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^18.0.4":
-  version: 18.0.4
-  resolution: "@metamask/snaps-controllers@npm:18.0.4"
+"@metamask/snaps-controllers@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/snaps-controllers@npm:19.0.0"
   dependencies:
-    "@metamask/approval-controller": "npm:^8.0.0"
+    "@metamask/approval-controller": "npm:^9.0.0"
     "@metamask/base-controller": "npm:^9.0.0"
     "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.8"
     "@metamask/key-tree": "npm:^10.1.1"
     "@metamask/messenger": "npm:^0.3.0"
     "@metamask/object-multiplex": "npm:^2.1.0"
-    "@metamask/permission-controller": "npm:^12.2.0"
+    "@metamask/permission-controller": "npm:^12.2.1"
     "@metamask/post-message-stream": "npm:^10.0.0"
     "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/snaps-registry": "npm:^4.0.0"
-    "@metamask/snaps-rpc-methods": "npm:^15.0.0"
+    "@metamask/snaps-rpc-methods": "npm:^15.0.1"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.1"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/storage-service": "npm:^1.0.0"
     "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.10.0"
@@ -8105,17 +8006,17 @@ __metadata:
     semver: "npm:^7.5.4"
     tar-stream: "npm:^3.1.7"
   peerDependencies:
-    "@metamask/snaps-execution-environments": ^11.0.1
+    "@metamask/snaps-execution-environments": ^11.0.2
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 10/0857a66df4c92a2b632a2a7a4376331638a3611adc173f849c9175384c565809bbd9e2ad1eee6a3089bafcaa24460ce8f2c6db56d45b52e9a32222b08ba7a0b4
+  checksum: 10/95d4522877aee8d320ace7de396255a827efab6b63ee81a4dfa34d595d65c3e429d586f6895aa70e170201b907b6bf3c7fb33f5bd683768873f92f58817792d3
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^11.0.1":
-  version: 11.0.1
-  resolution: "@metamask/snaps-execution-environments@npm:11.0.1"
+"@metamask/snaps-execution-environments@npm:^11.0.2":
+  version: 11.0.2
+  resolution: "@metamask/snaps-execution-environments@npm:11.0.2"
   dependencies:
     "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/object-multiplex": "npm:^2.1.0"
@@ -8123,11 +8024,11 @@ __metadata:
     "@metamask/providers": "npm:^22.1.1"
     "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.1"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.10.0"
     readable-stream: "npm:^3.6.2"
-  checksum: 10/ade9cecfe5f2a3ac1a223cb7f974baed276e260aea89948bd2d887427a40fcefa0b0a0a4caca374621e2c92db83f3452d603a852e6ce95ba9a03bafc7a2bf02a
+  checksum: 10/9faa7bba96688fe1430bbe7797df1693e7f3a67c7d993fdba2731fa6ce062910ab48eecb36188e7448d452d5642bafe42a5bf9ab6abeb3b0e31962fe24495993
   languageName: node
   linkType: hard
 
@@ -8143,20 +8044,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@metamask/snaps-rpc-methods@npm:15.0.0"
+"@metamask/snaps-rpc-methods@npm:^15.0.1":
+  version: 15.0.1
+  resolution: "@metamask/snaps-rpc-methods@npm:15.0.1"
   dependencies:
     "@metamask/key-tree": "npm:^10.1.1"
-    "@metamask/permission-controller": "npm:^12.2.0"
+    "@metamask/permission-controller": "npm:^12.2.1"
     "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.1"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.10.0"
     "@noble/hashes": "npm:^1.7.1"
     async-mutex: "npm:^0.5.0"
-  checksum: 10/178db2fa6cc4fced381bc5b034fc2d2ac465d63f143255c53118fb1d3aa98381d88e5c3a87ccfce75bf8689972da3087258734fc83ec9483d4296034fbac21e7
+  checksum: 10/40353ead6a12def2cb301fd4fc35c8dfb6783fc4d8ebc52ad2b9d6453d64f1c0f69a619d1e3c240250542c44cfea7f2fd0461ff73907c3327588fc1c409b942e
   languageName: node
   linkType: hard
 
@@ -8205,15 +8106,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^12.1.1":
-  version: 12.1.1
-  resolution: "@metamask/snaps-utils@npm:12.1.1"
+"@metamask/snaps-utils@npm:^12.1.2":
+  version: 12.1.2
+  resolution: "@metamask/snaps-utils@npm:12.1.2"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
     "@metamask/key-tree": "npm:^10.1.1"
     "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/permission-controller": "npm:^12.2.0"
+    "@metamask/permission-controller": "npm:^12.2.1"
     "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/slip44": "npm:^4.4.0"
     "@metamask/snaps-registry": "npm:^4.0.0"
@@ -8225,14 +8126,14 @@ __metadata:
     cron-parser: "npm:^4.5.0"
     fast-deep-equal: "npm:^3.1.3"
     fast-json-stable-stringify: "npm:^2.1.0"
-    fast-xml-parser: "npm:^5.3.8"
+    fast-xml-parser: "npm:^5.5.6"
     luxon: "npm:^3.5.0"
     marked: "npm:^12.0.1"
     rfdc: "npm:^1.3.0"
     semver: "npm:^7.5.4"
     ses: "npm:^1.15.0"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/acaefe9d78766e7af7c939a7fd6a80ba4f4d7559862b2594d831d00054eb9c05537332c8f2d912ff5170732aceef42a359431f37794e8f2f4fd23151a1b6e271
+  checksum: 10/cf36670f9946e2ab737d7fd1fd5be5c0e915c66b57e76d5f4bfc509061420f79b442b353c52a94c5f953fceba75f910ebd512592956a62e831f4eb43d0b0a40f
   languageName: node
   linkType: hard
 
@@ -8257,13 +8158,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/storage-service@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@metamask/storage-service@npm:1.0.0"
+"@metamask/storage-service@npm:^1.0.0, @metamask/storage-service@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@metamask/storage-service@npm:1.0.1"
   dependencies:
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/utils": "npm:^11.9.0"
-  checksum: 10/506b681f9f678102f8dd700d3c0531a35894d2a810431bdbcaaf1089d6dcfdb869ee3118b0375012498ba20e4fe8d2682d2695082268bb1dab3b774c9044d329
+  checksum: 10/3ec18b85ae80d13c4928be327abb1ee0548a6c44afdb7f709434a6621c876c3de95e145ca2603bdf178772982c76f546ec1cac58f28c0a9c74e020342d171349
   languageName: node
   linkType: hard
 
@@ -8425,9 +8326,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^63.0.0, @metamask/transaction-controller@npm:^63.1.0":
-  version: 63.1.0
-  resolution: "@metamask/transaction-controller@npm:63.1.0"
+"@metamask/transaction-controller@npm:^63.0.0, @metamask/transaction-controller@npm:^63.3.1":
+  version: 63.3.1
+  resolution: "@metamask/transaction-controller@npm:63.3.1"
   dependencies:
     "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -8436,18 +8337,18 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@ethersproject/wallet": "npm:^5.7.0"
-    "@metamask/accounts-controller": "npm:^37.0.0"
-    "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.0"
+    "@metamask/approval-controller": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^9.0.1"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/core-backend": "npm:^6.2.0"
+    "@metamask/core-backend": "npm:^6.2.1"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/gas-fee-controller": "npm:^26.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
     "@metamask/nonce-tracker": "npm:^6.0.0"
-    "@metamask/remote-feature-flag-controller": "npm:^4.1.0"
+    "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
@@ -8460,42 +8361,43 @@ __metadata:
   peerDependencies:
     "@babel/runtime": ^7.0.0
     "@metamask/eth-block-tracker": ">=9"
-  checksum: 10/02aaf926d003c01f6844bc9c0f4cb18f34884e3badc393103beed3755ebcae52e522a52b2a16f40c0965be98c2f4125cf8ae60e3766b0f960ecc65c62f8a161f
+  checksum: 10/0e661e59a00595258d01a3de9dbee7529899234f2f10d315cbfd92cccfdc692af5c3f573b8dcbe7b2fc05a35e060c9f6b5f573cb38d046657b7fb79a4d24d6dc
   languageName: node
   linkType: hard
 
-"@metamask/transaction-pay-controller@npm:^17.1.0":
-  version: 17.1.0
-  resolution: "@metamask/transaction-pay-controller@npm:17.1.0"
+"@metamask/transaction-pay-controller@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/transaction-pay-controller@npm:19.0.0"
   dependencies:
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/assets-controller": "npm:^2.4.0"
-    "@metamask/assets-controllers": "npm:^101.0.0"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bridge-controller": "npm:^69.1.1"
-    "@metamask/bridge-status-controller": "npm:^69.0.0"
+    "@metamask/assets-controller": "npm:^3.2.1"
+    "@metamask/assets-controllers": "npm:^103.0.0"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/bridge-controller": "npm:^69.2.3"
+    "@metamask/bridge-status-controller": "npm:^70.0.3"
     "@metamask/controller-utils": "npm:^11.19.0"
-    "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/gas-fee-controller": "npm:^26.1.1"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^30.0.0"
-    "@metamask/remote-feature-flag-controller": "npm:^4.1.0"
-    "@metamask/transaction-controller": "npm:^63.0.0"
+    "@metamask/network-controller": "npm:^30.0.1"
+    "@metamask/ramps-controller": "npm:^12.1.0"
+    "@metamask/remote-feature-flag-controller": "npm:^4.2.0"
+    "@metamask/transaction-controller": "npm:^63.3.1"
     "@metamask/utils": "npm:^11.9.0"
     bignumber.js: "npm:^9.1.2"
     bn.js: "npm:^5.2.1"
     immer: "npm:^9.0.6"
     lodash: "npm:^4.17.21"
-  checksum: 10/79d8cb54d010551c63cd34f5dd9d4d0b3fab3186ae770133a573c528b16598c2421241219801a4c81bf3dc38805c95b5c8a680bfe5d070dece50cf4dac891799
+  checksum: 10/121bbc55501b4e9e9ab633356637e2098ffa0aa8745b768ef04902067629e143cd495d7a222ae0e51f051b956d34349200424337a5cba4d456c2b417cbb0c355
   languageName: node
   linkType: hard
 
-"@metamask/tron-wallet-snap@npm:1.22.1":
-  version: 1.22.1
-  resolution: "@metamask/tron-wallet-snap@npm:1.22.1"
-  checksum: 10/035e044a023f887377da09e0431749aced5700903bb492191631f7f9f5b2ac1f81240885e795755dd48fb603ec6034063424ef734a8ebe4ded820b31049c4877
+"@metamask/tron-wallet-snap@npm:^1.25.0":
+  version: 1.25.0
+  resolution: "@metamask/tron-wallet-snap@npm:1.25.0"
+  checksum: 10/f87a48d2c21b9ea72dfba368ef2a66c73e692d7dfadde60e2606d7f631defcf9b6481c23e2ce17404028c58906c9245e8a60e22921155dd0f747d8330dd2c118
   languageName: node
   linkType: hard
 
@@ -10296,6 +10198,151 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@peculiar/asn1-cms@npm:^2.6.0, @peculiar/asn1-cms@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-cms@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    "@peculiar/asn1-x509-attr": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/e431f6229b98c63a929538d266488e8c2dddc895936117da8f9ec775558e08c20ded6a4adcca4bb88bfea282e7204d4f6bba7a46da2cced162c174e1e6964f36
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-csr@npm:^2.6.0":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-csr@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/4ac2f1c3a2cb392fcdd5aa602140abe90f849af0a9e8296aab9aaf1712ee2e0c4f5fa86b0fe83975e771b0aba91fc848670f9c2008ea1e850c849fae6e181179
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-ecc@npm:^2.6.0":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-ecc@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/baa646c1c86283d5876230b1cfbd80cf42f97b3bb8d8b23cd5830f6f8d6466e6a06887c6838f3c4c61c87df9ffd2abe905f555472e8e70d722ce964a8074d838
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pfx@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-pfx@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-cms": "npm:^2.6.1"
+    "@peculiar/asn1-pkcs8": "npm:^2.6.1"
+    "@peculiar/asn1-rsa": "npm:^2.6.1"
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/50adc7db96928d98b85a1a2e6765ba1d4ec708f937b8172ea6a22e3b92137ea36d656aded64b3be661db39f924102c5a80da54ee647e2441af3bc19c55a183ef
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pkcs8@npm:^2.5.0, @peculiar/asn1-pkcs8@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-pkcs8@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/99c4326da30e7ef17bb8e92d8a9525b78c101e4d743493000e220f3da6bbc4755371f1dbcc2a36951fb15769c2efead20d90a08918fd268c21bebcac26e71053
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pkcs9@npm:^2.6.0":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-pkcs9@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-cms": "npm:^2.6.1"
+    "@peculiar/asn1-pfx": "npm:^2.6.1"
+    "@peculiar/asn1-pkcs8": "npm:^2.6.1"
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    "@peculiar/asn1-x509-attr": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/61759a50d6adf108a0376735b2e76cdfc9c41db39a7abed23ca332f7699d831aa6324534aa38153018a31e6ee5e8fef85534c92b68067f6afcb90787e953c449
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-rsa@npm:^2.6.0, @peculiar/asn1-rsa@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-rsa@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/e91efe57017feac71c69ee5950e9c323b45aaf10baa32153fe88f237948f9d906ba04c645d085c4293c90440cad95392a91b3760251cd0ebc8e4c1a383fc331a
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-schema@npm:^2.3.15, @peculiar/asn1-schema@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@peculiar/asn1-schema@npm:2.6.0"
+  dependencies:
+    asn1js: "npm:^3.0.6"
+    pvtsutils: "npm:^1.3.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/af9b1094d0e020f0fd828777488578322d62a41f597ead7d80939dafcfe35b672fcb0ec7460ef66b2a155f9614d4340a98896d417a830aff1685cb4c21d5bbe4
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-x509-attr@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-x509-attr@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.1"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/86f7d5495459dee81daadd830ebb7d26ec15a98f6479c88b90a915ac9f28105b0d5003ba0c382b4aa8f7fa42e399f7cc37e4fe73c26cbaacd47e63a50b132e25
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-x509@npm:^2.3.15, @peculiar/asn1-x509@npm:^2.6.0, @peculiar/asn1-x509@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "@peculiar/asn1-x509@npm:2.6.1"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    asn1js: "npm:^3.0.6"
+    pvtsutils: "npm:^1.3.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10/e3187ad04d397cdd6a946895a51202b67f57992dfef55e40acc7e7ea325e2854267ed2581c4b1ea729d7147e9e8e6f34af77f1ffb48e3e8b25b2216b213b4641
+  languageName: node
+  linkType: hard
+
+"@peculiar/x509@npm:^1.12.3, @peculiar/x509@npm:^1.14.2":
+  version: 1.14.3
+  resolution: "@peculiar/x509@npm:1.14.3"
+  dependencies:
+    "@peculiar/asn1-cms": "npm:^2.6.0"
+    "@peculiar/asn1-csr": "npm:^2.6.0"
+    "@peculiar/asn1-ecc": "npm:^2.6.0"
+    "@peculiar/asn1-pkcs9": "npm:^2.6.0"
+    "@peculiar/asn1-rsa": "npm:^2.6.0"
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
+    pvtsutils: "npm:^1.3.6"
+    reflect-metadata: "npm:^0.2.2"
+    tslib: "npm:^2.8.1"
+    tsyringe: "npm:^4.10.0"
+  checksum: 10/d37c56fa5f2c644141948d85010e14f0e4963089e3b0b81edd0bfe85bdfea0eb3f38ab6ff20d322db2bd6977117824cc498a77b2d35af111983b4d58b5e2ccd1
+  languageName: node
+  linkType: hard
+
 "@pinojs/redact@npm:^0.4.0":
   version: 0.4.0
   resolution: "@pinojs/redact@npm:0.4.0"
@@ -14739,7 +14786,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.43.0":
+"@tanstack/query-core@npm:4.43.0, @tanstack/query-core@npm:^4.43.0":
   version: 4.43.0
   resolution: "@tanstack/query-core@npm:4.43.0"
   checksum: 10/c2a5a151c7adaea8311e01a643255f31946ae3164a71567ba80048242821ae14043f13f5516b695baebe5ea7e4b2cf717fd60908a929d18a5c5125fee925ff67
@@ -14753,7 +14800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:^4.36.1":
+"@tanstack/react-query@npm:^4.36.1, @tanstack/react-query@npm:^4.43.0":
   version: 4.43.0
   resolution: "@tanstack/react-query@npm:4.43.0"
   dependencies:
@@ -15898,15 +15945,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:^4.17.21, @types/express@npm:^4.7.0":
-  version: 4.17.21
-  resolution: "@types/express@npm:4.17.21"
+"@types/express@npm:*, @types/express@npm:^4.17.25, @types/express@npm:^4.7.0":
+  version: 4.17.25
+  resolution: "@types/express@npm:4.17.25"
   dependencies:
     "@types/body-parser": "npm:*"
     "@types/express-serve-static-core": "npm:^4.17.33"
     "@types/qs": "npm:*"
-    "@types/serve-static": "npm:*"
-  checksum: 10/7a6d26cf6f43d3151caf4fec66ea11c9d23166e4f3102edfe45a94170654a54ea08cf3103d26b3928d7ebcc24162c90488e33986b7e3a5f8941225edd5eb18c7
+    "@types/serve-static": "npm:^1"
+  checksum: 10/c309fdb79fb8569b5d8d8f11268d0160b271f8b38f0a82c20a0733e526baf033eb7a921cd51d54fe4333c616de9e31caf7d4f3ef73baaf212d61f23f460b0369
   languageName: node
   linkType: hard
 
@@ -16255,13 +16302,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mime@npm:*":
-  version: 3.0.1
-  resolution: "@types/mime@npm:3.0.1"
-  checksum: 10/4040fac73fd0cea2460e29b348c1a6173da747f3a87da0dbce80dd7a9355a3d0e51d6d9a401654f3e5550620e3718b5a899b2ec1debf18424e298a2c605346e7
-  languageName: node
-  linkType: hard
-
 "@types/mime@npm:^1":
   version: 1.3.2
   resolution: "@types/mime@npm:1.3.2"
@@ -16323,15 +16363,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-forge@npm:^1.3.0":
-  version: 1.3.11
-  resolution: "@types/node-forge@npm:1.3.11"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/670c9b377c48189186ec415e3c8ed371f141ecc1a79ab71b213b20816adeffecba44dae4f8406cc0d09e6349a4db14eb8c5893f643d8e00fa19fc035cf49dee0
-  languageName: node
-  linkType: hard
-
 "@types/node-sass@npm:*":
   version: 4.11.3
   resolution: "@types/node-sass@npm:4.11.3"
@@ -16666,13 +16697,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/send@npm:*":
-  version: 0.17.1
-  resolution: "@types/send@npm:0.17.1"
+"@types/send@npm:*, @types/send@npm:<1":
+  version: 0.17.6
+  resolution: "@types/send@npm:0.17.6"
   dependencies:
     "@types/mime": "npm:^1"
     "@types/node": "npm:*"
-  checksum: 10/6420837887858f7aa82f2c0272f73edb42385bd0978f43095e83590a405d86c8cc6d918c30b2d542f1d8bddc9f3d16c2e8fdfca936940de71b97c45f228d1896
+  checksum: 10/4948ab32ab84a81a0073f8243dd48ee766bc80608d5391060360afd1249f83c08a7476f142669ac0b0b8831c89d909a88bcb392d1b39ee48b276a91b50f3d8d1
   languageName: node
   linkType: hard
 
@@ -16694,14 +16725,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/serve-static@npm:*, @types/serve-static@npm:^1.15.5":
-  version: 1.15.5
-  resolution: "@types/serve-static@npm:1.15.5"
+"@types/serve-static@npm:^1, @types/serve-static@npm:^1.15.5":
+  version: 1.15.10
+  resolution: "@types/serve-static@npm:1.15.10"
   dependencies:
     "@types/http-errors": "npm:*"
-    "@types/mime": "npm:*"
     "@types/node": "npm:*"
-  checksum: 10/49aa21c367fffe4588fc8c57ea48af0ea7cbadde7418bc53cde85d8bd57fd2a09a293970d9ea86e79f17a87f8adeb3e20da76aab38e1c4d1567931fa15c8af38
+    "@types/send": "npm:<1"
+  checksum: 10/d9be72487540b9598e7d77260d533f241eb2e5db5181bb885ef2d6bc4592dad1c9e8c0e27f465d59478b2faf90edd2d535e834f20fbd9dd3c0928d43dc486404
   languageName: node
   linkType: hard
 
@@ -16943,6 +16974,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/yazl@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@types/yazl@npm:3.3.0"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/d7795b49d93d8ca42fbe073c19b6f6af130ee665975637974f5ee29cfc9ac493c52321d0aa142edc147d5cf5f2c115b17c7c63c3ee336a04e965859a9828147e
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/eslint-plugin@npm:^8.1.0":
   version: 8.55.0
   resolution: "@typescript-eslint/eslint-plugin@npm:8.55.0"
@@ -18337,7 +18377,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"accepts@npm:^1.3.8, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
+"accepts@npm:^1.3.8, accepts@npm:~1.3.4, accepts@npm:~1.3.8":
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
   dependencies:
@@ -19291,6 +19331,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asn1js@npm:^3.0.6":
+  version: 3.0.7
+  resolution: "asn1js@npm:3.0.7"
+  dependencies:
+    pvtsutils: "npm:^1.3.6"
+    pvutils: "npm:^1.1.3"
+    tslib: "npm:^2.8.1"
+  checksum: 10/1ae92cc6825ff002aed5b2a800e89db1fccd0775b42278431332fe3ee6839711e80e1ca504c72a35a03d94d417c3b315fb03bc6a6f4518c309b1dcb5385a1a93
+  languageName: node
+  linkType: hard
+
 "assert@npm:^1.4.0":
   version: 1.5.0
   resolution: "assert@npm:1.5.0"
@@ -19434,7 +19485,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^2.4.0, async@npm:^2.6.2":
+"async@npm:^2.4.0":
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
@@ -20244,23 +20295,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.3, body-parser@npm:^1.15.2, body-parser@npm:^1.19.0, body-parser@npm:^1.20.0":
-  version: 1.20.3
-  resolution: "body-parser@npm:1.20.3"
+"body-parser@npm:^1.15.2, body-parser@npm:^1.19.0, body-parser@npm:^1.20.0, body-parser@npm:~1.20.3":
+  version: 1.20.4
+  resolution: "body-parser@npm:1.20.4"
   dependencies:
-    bytes: "npm:3.1.2"
+    bytes: "npm:~3.1.2"
     content-type: "npm:~1.0.5"
     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.13.0"
-    raw-body: "npm:2.5.2"
+    destroy: "npm:~1.2.0"
+    http-errors: "npm:~2.0.1"
+    iconv-lite: "npm:~0.4.24"
+    on-finished: "npm:~2.4.1"
+    qs: "npm:~6.14.0"
+    raw-body: "npm:~2.5.3"
     type-is: "npm:~1.6.18"
-    unpipe: "npm:1.0.0"
-  checksum: 10/8723e3d7a672eb50854327453bed85ac48d045f4958e81e7d470c56bf111f835b97e5b73ae9f6393d0011cc9e252771f46fd281bbabc57d33d3986edf1e6aeca
+    unpipe: "npm:~1.0.0"
+  checksum: 10/ff67e28d3f426707be8697a75fdf8d564dc50c341b41f054264d8ab6e2924e519c7ce8acc9d0de05328fdc41e1d9f3f200aec9c1cfb1867d6b676a410d97c689
   languageName: node
   linkType: hard
 
@@ -20455,10 +20506,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brotli-wasm@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "brotli-wasm@npm:1.1.0"
-  checksum: 10/cfae2a531a12b0f20a3e6c4ea7cdb413a9ba3ea22898d76f3293140943ee1d3e39dd95acfb0709c68b15f138e1ab063d9bb40ace0fefaa20e23093f39250a1c6
+"brotli-wasm@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "brotli-wasm@npm:3.0.1"
+  checksum: 10/8d400459eea945cd66008ced3298efb24f65490d9cfd4953bfed088f4212aae0ff52bb3bd53970728b2cb29953ba25de02a2862d76f4fe74ba37befe265c5402
   languageName: node
   linkType: hard
 
@@ -20749,6 +20800,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"buffer-crc32@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "buffer-crc32@npm:1.0.0"
+  checksum: 10/ef3b7c07622435085c04300c9a51e850ec34a27b2445f758eef69b859c7827848c2282f3840ca6c1eef3829145a1580ce540cab03ccf4433827a2b95d3b09ca7
+  languageName: node
+  linkType: hard
+
 "buffer-crc32@npm:~0.2.3":
   version: 0.2.13
   resolution: "buffer-crc32@npm:0.2.13"
@@ -20897,6 +20955,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bytestreamjs@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "bytestreamjs@npm:2.0.1"
+  checksum: 10/523b1024e3f887cdc0b3db7c4fc14b8563aaeb75e6642a41991b3208277fd0ae9cd66003c73473fe706c42797bf0c3f1f498fb9880b431d75b332e5709d56a0c
+  languageName: node
+  linkType: hard
+
 "cacache@npm:^20.0.1":
   version: 20.0.3
   resolution: "cacache@npm:20.0.3"
@@ -22000,7 +22065,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compressible@npm:~2.0.16":
+"compressible@npm:~2.0.18":
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
   dependencies:
@@ -22009,18 +22074,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compression@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "compression@npm:1.7.4"
+"compression@npm:^1.7.4, compression@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "compression@npm:1.8.1"
   dependencies:
-    accepts: "npm:~1.3.5"
-    bytes: "npm:3.0.0"
-    compressible: "npm:~2.0.16"
+    bytes: "npm:3.1.2"
+    compressible: "npm:~2.0.18"
     debug: "npm:2.6.9"
-    on-headers: "npm:~1.0.2"
-    safe-buffer: "npm:5.1.2"
+    negotiator: "npm:~0.6.4"
+    on-headers: "npm:~1.1.0"
+    safe-buffer: "npm:5.2.1"
     vary: "npm:~1.1.2"
-  checksum: 10/469cd097908fe1d3ff146596d4c24216ad25eabb565c5456660bdcb3a14c82ebc45c23ce56e19fc642746cf407093b55ab9aa1ac30b06883b27c6c736e6383c2
+  checksum: 10/e7552bfbd780f2003c6fe8decb44561f5cc6bc82f0c61e81122caff5ec656f37824084f52155b1e8ef31d7656cecbec9a2499b7a68e92e20780ffb39b479abb7
   languageName: node
   linkType: hard
 
@@ -22145,7 +22210,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-disposition@npm:0.5.4, content-disposition@npm:~0.5.4":
+"content-disposition@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "content-disposition@npm:1.0.1"
+  checksum: 10/0718d861dfec56f532fd9acd714f173782ce5257b243344fecab5196621746cf8623bf1c833441612f1ac84559c546b59277cf0e91c3a646b0712a806decb1c8
+  languageName: node
+  linkType: hard
+
+"content-disposition@npm:~0.5.4":
   version: 0.5.4
   resolution: "content-disposition@npm:0.5.4"
   dependencies:
@@ -22154,13 +22226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-disposition@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "content-disposition@npm:1.0.1"
-  checksum: 10/0718d861dfec56f532fd9acd714f173782ce5257b243344fecab5196621746cf8623bf1c833441612f1ac84559c546b59277cf0e91c3a646b0712a806decb1c8
-  languageName: node
-  linkType: hard
-
 "content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
@@ -22203,13 +22268,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie-signature@npm:1.0.6":
-  version: 1.0.6
-  resolution: "cookie-signature@npm:1.0.6"
-  checksum: 10/f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
-  languageName: node
-  linkType: hard
-
 "cookie-signature@npm:^1.2.1":
   version: 1.2.2
   resolution: "cookie-signature@npm:1.2.2"
@@ -22217,14 +22275,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.7.1":
-  version: 0.7.1
-  resolution: "cookie@npm:0.7.1"
-  checksum: 10/aec6a6aa0781761bf55d60447d6be08861d381136a0fe94aa084fddd4f0300faa2b064df490c6798adfa1ebaef9e0af9b08a189c823e0811b8b313b3d9a03380
+"cookie-signature@npm:~1.0.6":
+  version: 1.0.7
+  resolution: "cookie-signature@npm:1.0.7"
+  checksum: 10/1a62808cd30d15fb43b70e19829b64d04b0802d8ef00275b57d152de4ae6a3208ca05c197b6668d104c4d9de389e53ccc2d3bc6bcaaffd9602461417d8c40710
   languageName: node
   linkType: hard
 
-"cookie@npm:^0.7.1":
+"cookie@npm:^0.7.1, cookie@npm:~0.7.1":
   version: 0.7.2
   resolution: "cookie@npm:0.7.2"
   checksum: 10/24b286c556420d4ba4e9bc09120c9d3db7d28ace2bd0f8ccee82422ce42322f73c8312441271e5eefafbead725980e5996cc02766dbb89a90ac7f5636ede608f
@@ -22494,7 +22552,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-fetch@npm:^3.1.4, cross-fetch@npm:^3.1.5":
+"cross-fetch@npm:^3.1.4":
   version: 3.2.0
   resolution: "cross-fetch@npm:3.2.0"
   dependencies:
@@ -22931,7 +22989,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:3.X, debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.7":
+"debug@npm:3.X, debug@npm:^3.1.0, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -23451,19 +23509,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"destroy@npm:1.2.0, destroy@npm:^1.2.0":
+"destroy@npm:1.2.0, destroy@npm:^1.2.0, destroy@npm:~1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
   checksum: 10/0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
   languageName: node
   linkType: hard
 
-"destroyable-server@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "destroyable-server@npm:1.0.0"
+"destroyable-server@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "destroyable-server@npm:1.1.1"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/ccd14f401e38a121d0431115b75e9a1f727e4f756669b8505abe5f8f1f918f7a40e18165e7aeb49a1ed979169d72cc1f83b2f26d903eb3ca10423b47ea6a27fb
+  checksum: 10/483867c0ee3adb6f265e0163ea5f204135a30cd2b14ef07f58054186f63cc12ca7c591431b30cb664216e1bdc3156d50c74b56c3e17f67a5e75b0d32f0fe84f5
   languageName: node
   linkType: hard
 
@@ -26081,42 +26139,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.1, express@npm:^4.21.2":
-  version: 4.21.2
-  resolution: "express@npm:4.21.2"
+"express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.1, express@npm:^4.22.1":
+  version: 4.22.1
+  resolution: "express@npm:4.22.1"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.3"
-    content-disposition: "npm:0.5.4"
+    body-parser: "npm:~1.20.3"
+    content-disposition: "npm:~0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.7.1"
-    cookie-signature: "npm:1.0.6"
+    cookie: "npm:~0.7.1"
+    cookie-signature: "npm:~1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
     encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     etag: "npm:~1.8.1"
-    finalhandler: "npm:1.3.1"
-    fresh: "npm:0.5.2"
-    http-errors: "npm:2.0.0"
+    finalhandler: "npm:~1.3.1"
+    fresh: "npm:~0.5.2"
+    http-errors: "npm:~2.0.0"
     merge-descriptors: "npm:1.0.3"
     methods: "npm:~1.1.2"
-    on-finished: "npm:2.4.1"
+    on-finished: "npm:~2.4.1"
     parseurl: "npm:~1.3.3"
-    path-to-regexp: "npm:0.1.12"
+    path-to-regexp: "npm:~0.1.12"
     proxy-addr: "npm:~2.0.7"
-    qs: "npm:6.13.0"
+    qs: "npm:~6.14.0"
     range-parser: "npm:~1.2.1"
     safe-buffer: "npm:5.2.1"
-    send: "npm:0.19.0"
-    serve-static: "npm:1.16.2"
+    send: "npm:~0.19.0"
+    serve-static: "npm:~1.16.2"
     setprototypeof: "npm:1.2.0"
-    statuses: "npm:2.0.1"
+    statuses: "npm:~2.0.1"
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10/34571c442fc8c9f2c4b442d2faa10ea1175cf8559237fc6a278f5ce6254a8ffdbeb9a15d99f77c1a9f2926ab183e3b7ba560e3261f1ad4149799e3412ab66bd1
+  checksum: 10/f33c1bd0c7d36e2a1f18de9cdc176469d32f68e20258d2941b8d296ab9a4fd9011872c246391bf87714f009fac5114c832ec5ac65cbee39421f1258801eb8470
   languageName: node
   linkType: hard
 
@@ -26581,13 +26639,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fflate@npm:^0.8.2":
-  version: 0.8.2
-  resolution: "fflate@npm:0.8.2"
-  checksum: 10/2bd26ba6d235d428de793c6a0cd1aaa96a06269ebd4e21b46c8fd1bd136abc631acf27e188d47c3936db090bf3e1ede11d15ce9eae9bffdc4bfe1b9dc66ca9cb
-  languageName: node
-  linkType: hard
-
 "file-entry-cache@npm:^5.0.1":
   version: 5.0.1
   resolution: "file-entry-cache@npm:5.0.1"
@@ -26743,21 +26794,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"finalhandler@npm:1.3.1":
-  version: 1.3.1
-  resolution: "finalhandler@npm:1.3.1"
-  dependencies:
-    debug: "npm:2.6.9"
-    encodeurl: "npm:~2.0.0"
-    escape-html: "npm:~1.0.3"
-    on-finished: "npm:2.4.1"
-    parseurl: "npm:~1.3.3"
-    statuses: "npm:2.0.1"
-    unpipe: "npm:~1.0.0"
-  checksum: 10/4babe72969b7373b5842bc9f75c3a641a4d0f8eb53af6b89fa714d4460ce03fb92b28de751d12ba415e96e7e02870c436d67412120555e2b382640535697305b
-  languageName: node
-  linkType: hard
-
 "finalhandler@npm:^2.1.0":
   version: 2.1.1
   resolution: "finalhandler@npm:2.1.1"
@@ -26772,6 +26808,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"finalhandler@npm:~1.3.1":
+  version: 1.3.2
+  resolution: "finalhandler@npm:1.3.2"
+  dependencies:
+    debug: "npm:2.6.9"
+    encodeurl: "npm:~2.0.0"
+    escape-html: "npm:~1.0.3"
+    on-finished: "npm:~2.4.1"
+    parseurl: "npm:~1.3.3"
+    statuses: "npm:~2.0.2"
+    unpipe: "npm:~1.0.0"
+  checksum: 10/6cb4f9f80eaeb5a0fac4fdbd27a65d39271f040a0034df16556d896bfd855fd42f09da886781b3102117ea8fceba97b903c1f8b08df1fb5740576d5e0f481eed
+  languageName: node
+  linkType: hard
+
 "find-cache-dir@npm:^2.0.0":
   version: 2.1.0
   resolution: "find-cache-dir@npm:2.1.0"
@@ -27260,13 +27311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fresh@npm:0.5.2, fresh@npm:~0.5.2":
-  version: 0.5.2
-  resolution: "fresh@npm:0.5.2"
-  checksum: 10/64c88e489b5d08e2f29664eb3c79c705ff9a8eb15d3e597198ef76546d4ade295897a44abb0abd2700e7ef784b2e3cbf1161e4fbf16f59129193fd1030d16da1
-  languageName: node
-  linkType: hard
-
 "fresh@npm:^2.0.0":
   version: 2.0.0
   resolution: "fresh@npm:2.0.0"
@@ -27274,6 +27318,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fresh@npm:~0.5.2":
+  version: 0.5.2
+  resolution: "fresh@npm:0.5.2"
+  checksum: 10/64c88e489b5d08e2f29664eb3c79c705ff9a8eb15d3e597198ef76546d4ade295897a44abb0abd2700e7ef784b2e3cbf1161e4fbf16f59129193fd1030d16da1
+  languageName: node
+  linkType: hard
+
 "from@npm:~0":
   version: 0.1.7
   resolution: "from@npm:0.1.7"
@@ -28144,6 +28195,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"goober@npm:^2.1.16":
+  version: 2.1.18
+  resolution: "goober@npm:2.1.18"
+  peerDependencies:
+    csstype: ^3.0.10
+  checksum: 10/eca3db81a709a03f6ec9bb2624027e157c0b6fab6dccbe53b2ddd25a155a7e6e23a0b864574c33bdb0a05e0d0b865de8cc5151401e5a00d63f51be08fe7ccde6
+  languageName: node
+  linkType: hard
+
 "google-auth-library@npm:^10.3.0":
   version: 10.5.0
   resolution: "google-auth-library@npm:10.5.0"
@@ -29194,31 +29254,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-encoding@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "http-encoding@npm:1.5.1"
+"http-encoding@npm:^2.0.1":
+  version: 2.2.0
+  resolution: "http-encoding@npm:2.2.0"
   dependencies:
-    brotli-wasm: "npm:^1.1.0"
+    brotli-wasm: "npm:^3.0.0"
     pify: "npm:^5.0.0"
-    zstd-codec: "npm:^0.1.4"
-  checksum: 10/7049231b6dc63b0fc0e17ad8e1af4b81df8887930646223bde85f3371d9278e7bf7f63efe4224be7ce44b1152f382cc3c26ed330c6b10f003561ceaf9059b735
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
-  dependencies:
-    depd: "npm:2.0.0"
-    inherits: "npm:2.0.4"
-    setprototypeof: "npm:1.2.0"
-    statuses: "npm:2.0.1"
-    toidentifier: "npm:1.0.1"
-  checksum: 10/0e7f76ee8ff8a33e58a3281a469815b893c41357378f408be8f6d4aa7d1efafb0da064625518e7078381b6a92325949b119dc38fcb30bdbc4e3a35f78c44c439
+    zstd-codec: "npm:^0.1.5"
+  checksum: 10/9f80f2fce9ff8f011232028374d2f3c0934476d527bf374fc93f4b137f986a8c74c313107388b9b13b5131c24afc40dc6fe28aff39d5b306a4a749ac4bdf8f4e
   languageName: node
   linkType: hard
 
-"http-errors@npm:^2.0.0, http-errors@npm:^2.0.1, http-errors@npm:~2.0.1":
+"http-errors@npm:^2.0.0, http-errors@npm:^2.0.1, http-errors@npm:~2.0.0, http-errors@npm:~2.0.1":
   version: 2.0.1
   resolution: "http-errors@npm:2.0.1"
   dependencies:
@@ -29457,7 +29504,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24":
+"iconv-lite@npm:0.4.24, iconv-lite@npm:~0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -33190,10 +33237,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash-es@npm:4.17.23":
-  version: 4.17.23
-  resolution: "lodash-es@npm:4.17.23"
-  checksum: 10/1feae200df22eb0bd93ca86d485e77784b8a9fb1d13e91b66e9baa7a7e5e04be088c12a7e20c2250fc0bd3db1bc0ef0affc7d9e3810b6af2455a3c6bf6dde59e
+"lodash-es@npm:^4.18.1":
+  version: 4.18.1
+  resolution: "lodash-es@npm:4.18.1"
+  checksum: 10/8bfad225ef09ef42b04283cdaf7830efcc2ba29ae41b56501c74422155ee1ccaa1f0f6e8319def3451a1fe54dec501c8e4bee622bae2b2d98ac993731e0a5cce
   languageName: node
   linkType: hard
 
@@ -33316,17 +33363,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.23":
-  version: 4.17.23
-  resolution: "lodash@npm:4.17.23"
-  checksum: 10/82504c88250f58da7a5a4289f57a4f759c44946c005dd232821c7688b5fcfbf4a6268f6a6cdde4b792c91edd2f3b5398c1d2a0998274432cff76def48735e233
+"lodash@npm:4.18.1":
+  version: 4.18.1
+  resolution: "lodash@npm:4.18.1"
+  checksum: 10/306fea53dfd39dad1f03d45ba654a2405aebd35797b673077f401edb7df2543623dc44b9effbb98f69b32152295fff725a4cec99c684098947430600c6af0c3f
   languageName: node
   linkType: hard
 
-"lodash@patch:lodash@npm%3A4.17.23#~/.yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch":
-  version: 4.17.23
-  resolution: "lodash@patch:lodash@npm%3A4.17.23#~/.yarn/patches/lodash-npm-4.17.23-50bdb1c01a.patch::version=4.17.23&hash=a4d321"
-  checksum: 10/ad28307e4f9f861b41cf44698060db233716d62b046f15351e67a7650a0cdba997b79cbf63ebc1dc917c6b369dfae68208604cc70a2dc2318a0ac38a904b78af
+"lodash@patch:lodash@npm%3A4.18.1#~/.yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch":
+  version: 4.18.1
+  resolution: "lodash@patch:lodash@npm%3A4.18.1#~/.yarn/patches/lodash-npm-4.18.1-a64c3070ac.patch::version=4.18.1&hash=fc7b0f"
+  checksum: 10/0df77010e2c22c1077cc632de9b09a4343b69e40a49765db0ee2d0847563372a4037c2f7aee2a129f8a69c74bf560c17c8000a66133ab34ea62b7b2285192aa5
   languageName: node
   linkType: hard
 
@@ -33960,7 +34007,10 @@ __metadata:
     "@babel/core": "patch:@babel/core@npm%3A7.25.9#~/.yarn/patches/@babel-core-npm-7.25.9-4ae3bff7f3.patch"
     "@babel/eslint-parser": "npm:^7.25.9"
     "@babel/eslint-plugin": "npm:^7.25.9"
+    "@babel/plugin-transform-class-properties": "npm:^7.28.6"
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9"
+    "@babel/plugin-transform-private-methods": "npm:^7.28.6"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.27.1"
     "@babel/preset-env": "npm:^7.25.9"
     "@babel/preset-react": "npm:^7.25.9"
     "@babel/preset-typescript": "npm:^7.25.9"
@@ -33996,24 +34046,24 @@ __metadata:
     "@material-ui/pickers": "npm:^3.3.11"
     "@metamask/abi-utils": "npm:^3.0.0"
     "@metamask/account-api": "npm:^1.0.0"
-    "@metamask/account-tree-controller": "npm:^5.0.0"
+    "@metamask/account-tree-controller": "npm:^7.0.0"
     "@metamask/account-watcher": "npm:^4.1.3"
-    "@metamask/accounts-controller": "npm:^37.0.0"
+    "@metamask/accounts-controller": "npm:^37.1.1"
     "@metamask/address-book-controller": "npm:^7.1.0"
     "@metamask/announcement-controller": "npm:^8.0.0"
     "@metamask/api-specs": "npm:^0.13.0"
     "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/assets-controller": "npm:^3.1.1"
-    "@metamask/assets-controllers": "npm:^101.0.1"
+    "@metamask/assets-controller": "npm:^3.2.1"
+    "@metamask/assets-controllers": "npm:^103.0.0"
     "@metamask/auto-changelog": "npm:^5.3.1"
-    "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bitcoin-wallet-snap": "npm:^1.10.0"
-    "@metamask/bridge-controller": "npm:^68.0.0"
-    "@metamask/bridge-status-controller": "patch:@metamask/bridge-status-controller@patch%3A@metamask/bridge-status-controller@npm%253A69.0.0%23~/.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-15106ec5e0.patch%3A%3Aversion=69.0.0&hash=ca26bd#~/.yarn/patches/@metamask-bridge-status-controller-patch-b9566c90d6.patch"
+    "@metamask/base-controller": "npm:^9.0.1"
+    "@metamask/bitcoin-wallet-snap": "npm:^1.10.1"
+    "@metamask/bridge-controller": "npm:^69.2.3"
+    "@metamask/bridge-status-controller": "npm:^70.0.3"
     "@metamask/browser-passworder": "npm:^6.0.0"
     "@metamask/browser-playground": "npm:0.3.0"
     "@metamask/build-utils": "npm:^3.0.0"
-    "@metamask/chain-agnostic-permission": "npm:^1.4.0"
+    "@metamask/chain-agnostic-permission": "npm:^1.5.0"
     "@metamask/claims-controller": "npm:^0.4.2"
     "@metamask/client-controller": "npm:^1.0.0"
     "@metamask/client-mcp-core": "npm:^0.1.1"
@@ -34024,14 +34074,13 @@ __metadata:
     "@metamask/delegation-controller": "npm:^2.0.2"
     "@metamask/delegation-core": "npm:^0.2.0-rc.1"
     "@metamask/delegation-deployments": "npm:^0.15.0"
-    "@metamask/design-system-react": "npm:^0.11.0"
+    "@metamask/design-system-react": "npm:^0.12.0"
     "@metamask/design-system-tailwind-preset": "npm:^0.6.1"
     "@metamask/design-tokens": "npm:^8.2.2"
     "@metamask/eip-5792-middleware": "npm:3.0.0"
     "@metamask/eip-7702-internal-rpc-middleware": "npm:^0.1.0"
     "@metamask/ens-controller": "npm:^19.1.0"
     "@metamask/ens-resolver-snap": "npm:^1.1.0"
-    "@metamask/error-reporting-service": "npm:^3.0.0"
     "@metamask/eslint-config": "npm:^13.0.0"
     "@metamask/eslint-config-jest": "npm:^13.0.0"
     "@metamask/eslint-config-mocha": "npm:^13.0.0"
@@ -34045,37 +34094,37 @@ __metadata:
     "@metamask/eth-ledger-bridge-keyring": "npm:11.3.0"
     "@metamask/eth-qr-keyring": "npm:^1.1.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@metamask/eth-snap-keyring": "npm:^19.0.0"
+    "@metamask/eth-snap-keyring": "npm:^20.0.0"
     "@metamask/eth-token-tracker": "npm:^10.0.2"
     "@metamask/eth-trezor-keyring": "npm:^9.0.0"
     "@metamask/etherscan-link": "npm:^3.0.0"
     "@metamask/forwarder": "npm:^1.1.0"
     "@metamask/foundryup": "npm:^1.0.1"
     "@metamask/gas-fee-controller": "npm:^26.1.0"
-    "@metamask/gator-permissions-controller": "npm:^2.1.0"
+    "@metamask/gator-permissions-controller": "npm:^3.0.0"
     "@metamask/gator-permissions-snap": "npm:^1.3.1"
-    "@metamask/hw-wallet-sdk": "npm:^0.5.0"
+    "@metamask/hw-wallet-sdk": "npm:^0.8.0"
     "@metamask/institutional-wallet-snap": "npm:1.3.4"
     "@metamask/jazzicon": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch"
     "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
     "@metamask/keyring-api": "npm:^21.6.0"
-    "@metamask/keyring-controller": "npm:^25.1.0"
+    "@metamask/keyring-controller": "npm:^25.1.1"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
-    "@metamask/keyring-internal-snap-client": "npm:^8.0.0"
+    "@metamask/keyring-internal-snap-client": "npm:^9.0.1"
     "@metamask/keyring-snap-client": "npm:^8.1.0"
     "@metamask/keyring-utils": "npm:^3.2.0"
     "@metamask/logging-controller": "npm:^8.0.0"
     "@metamask/logo": "npm:^4.0.0"
     "@metamask/message-manager": "npm:^14.0.0"
     "@metamask/message-signing-snap": "npm:1.1.4"
-    "@metamask/messenger": "npm:^0.3.0"
+    "@metamask/messenger": "npm:^1.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-account-service": "patch:@metamask/multichain-account-service@npm%3A7.1.0#~/.yarn/patches/@metamask-multichain-account-service-npm-7.1.0-4b0ce989c3.patch"
+    "@metamask/multichain-account-service": "npm:^8.0.1"
     "@metamask/multichain-api-client": "npm:^0.10.1"
-    "@metamask/multichain-api-middleware": "npm:^1.2.7"
+    "@metamask/multichain-api-middleware": "npm:^2.0.0"
     "@metamask/multichain-network-controller": "npm:^3.0.5"
-    "@metamask/multichain-transactions-controller": "npm:^7.0.2"
+    "@metamask/multichain-transactions-controller": "npm:^7.0.4"
     "@metamask/name-controller": "npm:^9.1.0"
     "@metamask/network-controller": "npm:^30.0.0"
     "@metamask/network-enablement-controller": "npm:^4.1.1"
@@ -34094,9 +34143,10 @@ __metadata:
     "@metamask/preferences-controller": "npm:^23.0.0"
     "@metamask/preinstalled-example-snap": "npm:^0.7.2"
     "@metamask/profile-metrics-controller": "npm:^3.0.3"
-    "@metamask/profile-sync-controller": "npm:^28.0.0"
+    "@metamask/profile-sync-controller": "npm:^28.0.2"
     "@metamask/providers": "npm:^22.1.1"
     "@metamask/rate-limit-controller": "npm:^7.0.0"
+    "@metamask/react-data-query": "npm:^0.2.0"
     "@metamask/remote-feature-flag-controller": "npm:^4.1.0"
     "@metamask/rpc-errors": "npm:^7.0.0"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
@@ -34104,16 +34154,16 @@ __metadata:
     "@metamask/seedless-onboarding-controller": "npm:^9.0.0"
     "@metamask/selected-network-controller": "npm:^26.0.3"
     "@metamask/shield-controller": "npm:^5.0.1"
-    "@metamask/signature-controller": "npm:^39.1.0"
+    "@metamask/signature-controller": "npm:^39.1.2"
     "@metamask/smart-transactions-controller": "npm:^23.0.0"
     "@metamask/snap-account-abstraction-keyring-site": "npm:^1.0.0"
     "@metamask/snap-simple-keyring-site": "npm:^2.0.0"
-    "@metamask/snaps-controllers": "npm:^18.0.4"
-    "@metamask/snaps-execution-environments": "npm:^11.0.1"
+    "@metamask/snaps-controllers": "npm:^19.0.0"
+    "@metamask/snaps-execution-environments": "npm:^11.0.2"
     "@metamask/snaps-registry": "npm:^4.0.0"
-    "@metamask/snaps-rpc-methods": "npm:^15.0.0"
+    "@metamask/snaps-rpc-methods": "npm:^15.0.1"
     "@metamask/snaps-sdk": "npm:^11.0.0"
-    "@metamask/snaps-utils": "npm:^12.1.1"
+    "@metamask/snaps-utils": "npm:^12.1.2"
     "@metamask/solana-wallet-snap": "npm:^2.7.3"
     "@metamask/solana-wallet-standard": "npm:^0.6.0"
     "@metamask/storage-service": "npm:^1.0.0"
@@ -34125,9 +34175,9 @@ __metadata:
     "@metamask/test-dapp-solana": "npm:^0.3.1"
     "@metamask/test-dapp-tron": "npm:^0.3.1"
     "@metamask/test-snaps": "npm:^3.4.1"
-    "@metamask/transaction-controller": "npm:^63.0.0"
-    "@metamask/transaction-pay-controller": "npm:^17.1.0"
-    "@metamask/tron-wallet-snap": "npm:1.22.1"
+    "@metamask/transaction-controller": "npm:^63.3.1"
+    "@metamask/transaction-pay-controller": "npm:^19.0.0"
+    "@metamask/tron-wallet-snap": "npm:^1.25.0"
     "@metamask/user-operation-controller": "npm:^41.1.0"
     "@metamask/utils": "npm:^11.10.0"
     "@ngraveio/bc-ur": "npm:^1.1.13"
@@ -34223,6 +34273,7 @@ __metadata:
     "@types/xml2js": "npm:^0"
     "@types/yargs": "npm:^17.0.32"
     "@types/yargs-parser": "npm:^21.0.3"
+    "@types/yazl": "npm:^3.3.0"
     "@typescript-eslint/eslint-plugin": "npm:^8.1.0"
     "@typescript-eslint/parser": "npm:^8.1.0"
     "@viem/anvil": "npm:^0.0.10"
@@ -34298,7 +34349,6 @@ __metadata:
     fast-glob: "npm:^3.2.2"
     fast-json-patch: "npm:^3.1.1"
     fast-json-stable-stringify: "npm:^2.1.0"
-    fflate: "npm:^0.8.2"
     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"
@@ -34343,7 +34393,7 @@ __metadata:
     lightweight-charts: "npm:^5.1.0"
     localforage: "npm:^1.9.0"
     lockfile-lint: "npm:^4.10.6"
-    lodash: "npm:^4.17.23"
+    lodash: "npm:^4.18.1"
     loglevel: "npm:^1.8.1"
     loose-envify: "npm:^1.4.0"
     lottie-web: "npm:^5.12.2"
@@ -34353,7 +34403,7 @@ __metadata:
     mini-css-extract-plugin: "npm:^2.9.1"
     mocha: "npm:^10.2.0"
     mocha-junit-reporter: "npm:^2.2.1"
-    mockttp: "npm:^3.10.1"
+    mockttp: "npm:^4.2.3"
     nanoid: "npm:^3.3.8"
     navigator.locks: "npm:^0.8.6"
     nock: "patch:nock@npm%3A13.5.4#~/.yarn/patches/nock-npm-13.5.4-2c4f77b249.patch"
@@ -34387,6 +34437,7 @@ __metadata:
     react-devtools-core: "npm:^6.1.5"
     react-dom: "npm:^17.0.2"
     react-focus-lock: "npm:^2.9.4"
+    react-hot-toast: "npm:^2.6.0"
     react-idle-timer: "npm:4.5.6"
     react-markdown: "npm:^6.0.3"
     react-popper: "npm:^2.2.3"
@@ -34448,15 +34499,17 @@ __metadata:
     vinyl-sourcemaps-apply: "npm:^0.2.1"
     wait-on: "npm:^7.0.1"
     watchify: "npm:^4.0.0"
+    web-vitals: "npm:^4.2.4"
     webextension-polyfill: "npm:^0.8.0"
     webpack: "npm:^5.104.1"
     webpack-cli: "npm:^6.0.1"
-    webpack-dev-server: "npm:^5.2.2"
+    webpack-dev-server: "npm:^5.2.3"
     ws: "npm:^8.17.1"
     xml2js: "npm:^0.6.2"
     yaml: "npm:^2.4.1"
     yargs: "npm:^17.7.2"
     yargs-parser: "npm:^21.1.1"
+    yazl: "npm:^3.3.1"
   languageName: unknown
   linkType: soft
 
@@ -34884,7 +34937,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5":
+"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
@@ -34960,17 +35013,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mockttp@npm:^3.10.1":
-  version: 3.10.1
-  resolution: "mockttp@npm:3.10.1"
+"mockttp@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "mockttp@npm:4.2.3"
   dependencies:
     "@graphql-tools/schema": "npm:^8.5.0"
     "@graphql-tools/utils": "npm:^8.8.0"
-    "@httptoolkit/httpolyglot": "npm:^2.2.1"
+    "@httptoolkit/httpolyglot": "npm:^3.0.1"
     "@httptoolkit/subscriptions-transport-ws": "npm:^0.11.2"
+    "@httptoolkit/util": "npm:^0.1.7"
     "@httptoolkit/websocket-stream": "npm:^6.0.1"
+    "@peculiar/asn1-pkcs8": "npm:^2.5.0"
+    "@peculiar/asn1-schema": "npm:^2.3.15"
+    "@peculiar/asn1-x509": "npm:^2.3.15"
+    "@peculiar/x509": "npm:^1.12.3"
     "@types/cors": "npm:^2.8.6"
     "@types/node": "npm:*"
+    async-mutex: "npm:^0.5.0"
     base64-arraybuffer: "npm:^0.1.5"
     body-parser: "npm:^1.15.2"
     cacheable-lookup: "npm:^6.0.0"
@@ -34978,34 +35037,33 @@ __metadata:
     connect: "npm:^3.7.0"
     cors: "npm:^2.8.4"
     cors-gate: "npm:^1.1.3"
-    cross-fetch: "npm:^3.1.5"
-    destroyable-server: "npm:^1.0.0"
+    destroyable-server: "npm:^1.1.1"
     express: "npm:^4.14.0"
+    fast-json-patch: "npm:^3.1.1"
     graphql: "npm:^14.0.2 || ^15.5"
     graphql-http: "npm:^1.22.0"
     graphql-subscriptions: "npm:^1.1.0"
     graphql-tag: "npm:^2.12.6"
-    http-encoding: "npm:^1.5.1"
+    http-encoding: "npm:^2.0.1"
     http2-wrapper: "npm:^2.2.1"
     https-proxy-agent: "npm:^5.0.1"
     isomorphic-ws: "npm:^4.0.1"
     lodash: "npm:^4.16.4"
     lru-cache: "npm:^7.14.0"
     native-duplexpair: "npm:^1.0.0"
-    node-forge: "npm:^1.2.1"
     pac-proxy-agent: "npm:^7.0.0"
     parse-multipart-data: "npm:^1.4.0"
     performance-now: "npm:^2.1.0"
-    portfinder: "npm:1.0.28"
-    read-tls-client-hello: "npm:^1.0.0"
+    portfinder: "npm:^1.0.32"
+    read-tls-client-hello: "npm:^1.1.0"
     semver: "npm:^7.5.3"
     socks-proxy-agent: "npm:^7.0.0"
     typed-error: "npm:^3.0.2"
-    uuid: "npm:^8.3.2"
+    urlpattern-polyfill: "npm:^8.0.0"
     ws: "npm:^8.8.0"
   bin:
     mockttp: dist/admin/admin-bin.js
-  checksum: 10/7aeeda8ed0ae6b192ed8e2ed30888c8977dccb969de38e92dd680477e3db2ead346a1aade2624f6a487029e20a1d2461bf1446c5cd1d25c62402e18f82bc62bc
+  checksum: 10/dc9f396c66c0923cc6a7fbdee96b6334d76edbea0efffb0866b7d5ec56cbfa7ad9c9220afb79c45e3a31bf554f9b7e794d183da1095ee5d297c503c60ca1eb0b
   languageName: node
   linkType: hard
 
@@ -35339,6 +35397,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"negotiator@npm:~0.6.4":
+  version: 0.6.4
+  resolution: "negotiator@npm:0.6.4"
+  checksum: 10/d98c04a136583afd055746168f1067d58ce4bfe6e4c73ca1d339567f81ea1f7e665b5bd1e81f4771c67b6c2ea89b21cb2adaea2b16058c7dc31317778f931dab
+  languageName: node
+  linkType: hard
+
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
@@ -35497,13 +35562,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-forge@npm:^1, node-forge@npm:^1.2.1":
-  version: 1.3.2
-  resolution: "node-forge@npm:1.3.2"
-  checksum: 10/dcc54aaffe0cf52367214a20c0032aa9b209d9095dd14526504f1972d1900a07e96046b3684cb0c8d0cc3d48744dd18e02b7b447ab28fac615ffb850beeabf18
-  languageName: node
-  linkType: hard
-
 "node-gyp-build@npm:4.4.0":
   version: 4.4.0
   resolution: "node-gyp-build@npm:4.4.0"
@@ -36095,7 +36153,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"on-finished@npm:2.4.1, on-finished@npm:^2.4.1":
+"on-finished@npm:^2.4.1, on-finished@npm:~2.4.1":
   version: 2.4.1
   resolution: "on-finished@npm:2.4.1"
   dependencies:
@@ -36113,10 +36171,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"on-headers@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "on-headers@npm:1.0.2"
-  checksum: 10/870766c16345855e2012e9422ba1ab110c7e44ad5891a67790f84610bd70a72b67fdd71baf497295f1d1bf38dd4c92248f825d48729c53c0eae5262fb69fa171
+"on-headers@npm:~1.1.0":
+  version: 1.1.0
+  resolution: "on-headers@npm:1.1.0"
+  checksum: 10/98aa64629f986fb8cc4517dd8bede73c980e31208cba97f4442c330959f60ced3dc6214b83420491f5111fc7c4f4343abe2ea62c85f505cf041d67850f238776
   languageName: node
   linkType: hard
 
@@ -37239,6 +37297,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkijs@npm:^3.3.3":
+  version: 3.4.0
+  resolution: "pkijs@npm:3.4.0"
+  dependencies:
+    "@noble/hashes": "npm:1.4.0"
+    asn1js: "npm:^3.0.6"
+    bytestreamjs: "npm:^2.0.1"
+    pvtsutils: "npm:^1.3.6"
+    pvutils: "npm:^1.1.3"
+    tslib: "npm:^2.8.1"
+  checksum: 10/a937347584b27012919f69e4b3865b2fd09dced85a344f9a22bbf1376dd9e1534ccbe0bbdb997807b4990b07865c1ea028447d78b2c8a64436d4d393193a0777
+  languageName: node
+  linkType: hard
+
 "playwright-core@npm:1.55.0, playwright-core@npm:>=1.2.0":
   version: 1.55.0
   resolution: "playwright-core@npm:1.55.0"
@@ -37340,24 +37412,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"portfinder@npm:1.0.28":
-  version: 1.0.28
-  resolution: "portfinder@npm:1.0.28"
-  dependencies:
-    async: "npm:^2.6.2"
-    debug: "npm:^3.1.1"
-    mkdirp: "npm:^0.5.5"
-  checksum: 10/085572663228207f91513e6f9cbf40ac71d92087f36efebb4c7434db9af5e273d20838ed197e05d6f79b0048ee21f6ed9474f8aa8badf4112405096cf39ace47
-  languageName: node
-  linkType: hard
-
-"portfinder@npm:^1.0.28":
-  version: 1.0.37
-  resolution: "portfinder@npm:1.0.37"
+"portfinder@npm:^1.0.28, portfinder@npm:^1.0.32":
+  version: 1.0.38
+  resolution: "portfinder@npm:1.0.38"
   dependencies:
     async: "npm:^3.2.6"
     debug: "npm:^4.3.6"
-  checksum: 10/0d9addb4b28451319bc95feb7af6c060188e176199eebd1b66ef7ea460102e546aedcd6dc7039c5942812c9696218403106e2a45b66a8c551888fc18830b0014
+  checksum: 10/369155c3e7efa10ad348cd6686eb9efe57f334a4638f9107fd6ad6705dc532841f9bd8346182591280b2c7837600d8fb0cf0d1ced69a78caa8544fc3bb43653a
   languageName: node
   linkType: hard
 
@@ -38224,6 +38285,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pvtsutils@npm:^1.3.6":
+  version: 1.3.6
+  resolution: "pvtsutils@npm:1.3.6"
+  dependencies:
+    tslib: "npm:^2.8.1"
+  checksum: 10/d45b12f8526e13ecf15fe09b30cde65501f3300fd2a07c11b28a966d434d1f767c8a61597ecba2e19c7eb19ca0c740341a6babc67a4f741e08b1ef1095c71663
+  languageName: node
+  linkType: hard
+
+"pvutils@npm:^1.1.3":
+  version: 1.1.5
+  resolution: "pvutils@npm:1.1.5"
+  checksum: 10/9a5a71603c72bf9ea3a4501e8251e3f7a56026ed059bf63a18bd9a30cac6c35cc8250b39eb6291c1cb204cdeb6660663ab9bb2c74e85a512919bb2d614e340ea
+  languageName: node
+  linkType: hard
+
 "qr.js@npm:0.0.0":
   version: 0.0.0
   resolution: "qr.js@npm:0.0.0"
@@ -38287,12 +38364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:^6.10.0, qs@npm:^6.12.3, qs@npm:^6.14.0, qs@npm:^6.14.1, qs@npm:^6.4.0":
-  version: 6.14.1
-  resolution: "qs@npm:6.14.1"
+"qs@npm:^6.10.0, qs@npm:^6.12.3, qs@npm:^6.14.0, qs@npm:^6.14.1, qs@npm:^6.4.0, qs@npm:~6.14.0":
+  version: 6.14.2
+  resolution: "qs@npm:6.14.2"
   dependencies:
     side-channel: "npm:^1.1.0"
-  checksum: 10/34b5ab00a910df432d55180ef39c1d1375e550f098b5ec153b41787f1a6a6d7e5f9495593c3b112b77dbc6709d0ae18e55b82847a4c2bbbb0de1e8ccbb1794c5
+  checksum: 10/682933a85bb4b7bd0d66e13c0a40d9e612b5e4bcc2cb9238f711a9368cd22d91654097a74fff93551e58146db282c56ac094957dfdc60ce64ea72c3c9d7779ac
   languageName: node
   linkType: hard
 
@@ -38475,18 +38552,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.2":
-  version: 2.5.2
-  resolution: "raw-body@npm:2.5.2"
-  dependencies:
-    bytes: "npm:3.1.2"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    unpipe: "npm:1.0.0"
-  checksum: 10/863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95
-  languageName: node
-  linkType: hard
-
 "raw-body@npm:^3.0.0, raw-body@npm:^3.0.1":
   version: 3.0.2
   resolution: "raw-body@npm:3.0.2"
@@ -38509,6 +38574,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"raw-body@npm:~2.5.3":
+  version: 2.5.3
+  resolution: "raw-body@npm:2.5.3"
+  dependencies:
+    bytes: "npm:~3.1.2"
+    http-errors: "npm:~2.0.1"
+    iconv-lite: "npm:~0.4.24"
+    unpipe: "npm:~1.0.0"
+  checksum: 10/f35759fe5a6548e7c529121ead1de4dd163f899749a5896c42e278479df2d9d7f98b5bb17312737c03617765e5a1433e586f717616e5cfbebc13b4738b820601
+  languageName: node
+  linkType: hard
+
 "rc@npm:1.2.8, rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8":
   version: 1.2.8
   resolution: "rc@npm:1.2.8"
@@ -38738,6 +38815,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-hot-toast@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "react-hot-toast@npm:2.6.0"
+  dependencies:
+    csstype: "npm:^3.1.3"
+    goober: "npm:^2.1.16"
+  peerDependencies:
+    react: ">=16"
+    react-dom: ">=16"
+  checksum: 10/825ebbaa03c63dc2f22795ac8d535b40f1066c3ace5b792d0de740070693f195b910c98f46a00f7f6195f804ecf41b03201f6ff6950a540098dd2b7a0069df5b
+  languageName: node
+  linkType: hard
+
 "react-icons@npm:^4.8.0":
   version: 4.12.0
   resolution: "react-icons@npm:4.12.0"
@@ -39225,12 +39315,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-tls-client-hello@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "read-tls-client-hello@npm:1.0.1"
+"read-tls-client-hello@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "read-tls-client-hello@npm:1.1.0"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/fefa63605eebb197b6046cb26d7efde16eb24c026edbbca789c30b7b5be7c0dd8e45fb4d32707513dfc4dd468b787b2a46ed8be846f29eac844d6d80710688c6
+  checksum: 10/c3a15164065e33509b3dee05e70865e68b7b061804e70f864d6afdc55b30663ce6fed2730d9508a44672757622a454c2a38b696c262bdd0ebcbb39f28acee621
   languageName: node
   linkType: hard
 
@@ -39432,6 +39522,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect-metadata@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "reflect-metadata@npm:0.2.2"
+  checksum: 10/1c93f9ac790fea1c852fde80c91b2760420069f4862f28e6fae0c00c6937a56508716b0ed2419ab02869dd488d123c4ab92d062ae84e8739ea7417fae10c4745
+  languageName: node
+  linkType: hard
+
 "reflect.getprototypeof@npm:^1.0.6, reflect.getprototypeof@npm:^1.0.9":
   version: 1.0.10
   resolution: "reflect.getprototypeof@npm:1.0.10"
@@ -40988,13 +41085,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"selfsigned@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "selfsigned@npm:2.4.1"
+"selfsigned@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "selfsigned@npm:5.5.0"
   dependencies:
-    "@types/node-forge": "npm:^1.3.0"
-    node-forge: "npm:^1"
-  checksum: 10/52536623f1cfdeb2f8b9198377f2ce7931c677ea69421238d1dc1ea2983bbe258e56c19e7d1af87035cad7270f19b7e996eaab1212e724d887722502f68e17f2
+    "@peculiar/x509": "npm:^1.14.2"
+    pkijs: "npm:^3.3.3"
+  checksum: 10/fe9be2647507c3ee21dcaf5cab20e1ae4b8b84eac83d2fe4d82f9a3b6c70636f9aaeeba0089e3343dcb13fbb31ef70c2e72c41f2e2dcf38368040b49830c670e
   languageName: node
   linkType: hard
 
@@ -41068,27 +41165,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"send@npm:0.19.0":
-  version: 0.19.0
-  resolution: "send@npm:0.19.0"
-  dependencies:
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    encodeurl: "npm:~1.0.2"
-    escape-html: "npm:~1.0.3"
-    etag: "npm:~1.8.1"
-    fresh: "npm:0.5.2"
-    http-errors: "npm:2.0.0"
-    mime: "npm:1.6.0"
-    ms: "npm:2.1.3"
-    on-finished: "npm:2.4.1"
-    range-parser: "npm:~1.2.1"
-    statuses: "npm:2.0.1"
-  checksum: 10/1f6064dea0ae4cbe4878437aedc9270c33f2a6650a77b56a16b62d057527f2766d96ee282997dd53ec0339082f2aad935bc7d989b46b48c82fc610800dc3a1d0
-  languageName: node
-  linkType: hard
-
 "send@npm:^1.1.0, send@npm:^1.2.0":
   version: 1.2.1
   resolution: "send@npm:1.2.1"
@@ -41108,6 +41184,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"send@npm:~0.19.0, send@npm:~0.19.1":
+  version: 0.19.2
+  resolution: "send@npm:0.19.2"
+  dependencies:
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    destroy: "npm:1.2.0"
+    encodeurl: "npm:~2.0.0"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    fresh: "npm:~0.5.2"
+    http-errors: "npm:~2.0.1"
+    mime: "npm:1.6.0"
+    ms: "npm:2.1.3"
+    on-finished: "npm:~2.4.1"
+    range-parser: "npm:~1.2.1"
+    statuses: "npm:~2.0.2"
+  checksum: 10/e932a592f62c58560b608a402d52333a8ae98a5ada076feb5db1d03adaa77c3ca32a7befa1c4fd6dedc186e88f342725b0cb4b3d86835eaf834688b259bef18d
+  languageName: node
+  linkType: hard
+
 "serialize-error@npm:^7.0.1":
   version: 7.0.1
   resolution: "serialize-error@npm:7.0.1"
@@ -41117,10 +41214,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:7.0.3":
-  version: 7.0.3
-  resolution: "serialize-javascript@npm:7.0.3"
-  checksum: 10/ce45e28663ee1fa6f32c408c0a563c4a96e872cdc83dc3064c73126f2412048c6c984bfc1160c40188fcfa06cf5e075f5cc2e3261b0384dc8fdef34675c5adef
+"serialize-javascript@npm:7.0.5":
+  version: 7.0.5
+  resolution: "serialize-javascript@npm:7.0.5"
+  checksum: 10/6237c76ef6df3d1ad61dd4a393b71ca758c7654f4d1cf77529e513134c0f0660302e03b7ec88a8f3a3daa79e1f93d6de8218ecbc45e073d7cc6b66284a1d3e83
   languageName: node
   linkType: hard
 
@@ -41155,18 +41252,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-static@npm:1.16.2":
-  version: 1.16.2
-  resolution: "serve-static@npm:1.16.2"
-  dependencies:
-    encodeurl: "npm:~2.0.0"
-    escape-html: "npm:~1.0.3"
-    parseurl: "npm:~1.3.3"
-    send: "npm:0.19.0"
-  checksum: 10/7fa9d9c68090f6289976b34fc13c50ac8cd7f16ae6bce08d16459300f7fc61fbc2d7ebfa02884c073ec9d6ab9e7e704c89561882bbe338e99fcacb2912fde737
-  languageName: node
-  linkType: hard
-
 "serve-static@npm:^2.2.0":
   version: 2.2.1
   resolution: "serve-static@npm:2.2.1"
@@ -41179,6 +41264,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"serve-static@npm:~1.16.2":
+  version: 1.16.3
+  resolution: "serve-static@npm:1.16.3"
+  dependencies:
+    encodeurl: "npm:~2.0.0"
+    escape-html: "npm:~1.0.3"
+    parseurl: "npm:~1.3.3"
+    send: "npm:~0.19.1"
+  checksum: 10/149d6718dd9e53166784d0a65535e21a7c01249d9c51f57224b786a7306354c6807e7811a9f6c143b45c863b1524721fca2f52b5c81a8b5194e3dde034a03b9c
+  languageName: node
+  linkType: hard
+
 "ses@npm:1.14.0":
   version: 1.14.0
   resolution: "ses@npm:1.14.0"
@@ -42123,13 +42220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:2.0.1":
-  version: 2.0.1
-  resolution: "statuses@npm:2.0.1"
-  checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
-  languageName: node
-  linkType: hard
-
 "statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
@@ -42137,7 +42227,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:^2.0.1, statuses@npm:^2.0.2, statuses@npm:~2.0.2":
+"statuses@npm:^2.0.1, statuses@npm:^2.0.2, statuses@npm:~2.0.1, statuses@npm:~2.0.2":
   version: 2.0.2
   resolution: "statuses@npm:2.0.2"
   checksum: 10/6927feb50c2a75b2a4caab2c565491f7a93ad3d8dbad7b1398d52359e9243a20e2ebe35e33726dee945125ef7a515e9097d8a1b910ba2bbd818265a2f6c39879
@@ -43867,7 +43957,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:1.14.1, tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
+"tslib@npm:1.14.1, tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
@@ -43929,6 +44019,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsyringe@npm:^4.10.0":
+  version: 4.10.0
+  resolution: "tsyringe@npm:4.10.0"
+  dependencies:
+    tslib: "npm:^1.9.3"
+  checksum: 10/b42660dc112cee2db02b3d69f2ef6a6a9d185afd96b18d8f88e47c1e62be94b69a9f5a58fcfdb2a3fbb7c6c175b8162ea00f7db6499bf333ce945e570e31615c
+  languageName: node
+  linkType: hard
+
 "tty-browserify@npm:0.0.1":
   version: 0.0.1
   resolution: "tty-browserify@npm:0.0.1"
@@ -44646,7 +44745,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
+"unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
   checksum: 10/4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
@@ -44970,6 +45069,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urlpattern-polyfill@npm:^8.0.0":
+  version: 8.0.2
+  resolution: "urlpattern-polyfill@npm:8.0.2"
+  checksum: 10/fd86b5c55473f3abbf9ed317b953c9cbb4fa6b3f75f681a1d982fe9c17bbc8d9bcf988f4cf3bda35e2e5875984086c97e177f97f076bb80dfa2beb85d1dd7b23
+  languageName: node
+  linkType: hard
+
 "usb@npm:^2.15.0":
   version: 2.15.0
   resolution: "usb@npm:2.15.0"
@@ -45785,6 +45891,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"web-vitals@npm:^4.2.4":
+  version: 4.2.4
+  resolution: "web-vitals@npm:4.2.4"
+  checksum: 10/68cd1c2625a04b26e7eab67110623396afc6c9ef8c3a76f4e780aefe5b7d4ca1691737a0b99119e1d1ca9a463c4d468c0f0090b1875b6d784589d3a4a8503313
+  languageName: node
+  linkType: hard
+
 "webextension-polyfill@npm:>=0.10.0 <1.0, webextension-polyfill@npm:^0.12.0":
   version: 0.12.0
   resolution: "webextension-polyfill@npm:0.12.0"
@@ -45901,13 +46014,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-dev-server@npm:^5.2.2":
-  version: 5.2.2
-  resolution: "webpack-dev-server@npm:5.2.2"
+"webpack-dev-server@npm:^5.2.3":
+  version: 5.2.3
+  resolution: "webpack-dev-server@npm:5.2.3"
   dependencies:
     "@types/bonjour": "npm:^3.5.13"
     "@types/connect-history-api-fallback": "npm:^1.5.4"
-    "@types/express": "npm:^4.17.21"
+    "@types/express": "npm:^4.17.25"
     "@types/express-serve-static-core": "npm:^4.17.21"
     "@types/serve-index": "npm:^1.9.4"
     "@types/serve-static": "npm:^1.15.5"
@@ -45917,9 +46030,9 @@ __metadata:
     bonjour-service: "npm:^1.2.1"
     chokidar: "npm:^3.6.0"
     colorette: "npm:^2.0.10"
-    compression: "npm:^1.7.4"
+    compression: "npm:^1.8.1"
     connect-history-api-fallback: "npm:^2.0.0"
-    express: "npm:^4.21.2"
+    express: "npm:^4.22.1"
     graceful-fs: "npm:^4.2.6"
     http-proxy-middleware: "npm:^2.0.9"
     ipaddr.js: "npm:^2.1.0"
@@ -45927,7 +46040,7 @@ __metadata:
     open: "npm:^10.0.3"
     p-retry: "npm:^6.2.0"
     schema-utils: "npm:^4.2.0"
-    selfsigned: "npm:^2.4.1"
+    selfsigned: "npm:^5.5.0"
     serve-index: "npm:^1.9.1"
     sockjs: "npm:^0.3.24"
     spdy: "npm:^4.0.2"
@@ -45942,7 +46055,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: 10/59517409cd38c01a875a03b9658f3d20d492b5b8bead9ded4a0f3d33e6857daf2d352fe89f0181dcaea6d0fbe84b0494cb4750a87120fe81cdbb3c32b499451c
+  checksum: 10/6a3d55c5d84d10b5e23a0638e0031ef85b262947fdacc86d96b7392538ad5894ac14aebef1e2b877f8d27302c71247215b7aa6713e01b1c37d31342415b1a150
   languageName: node
   linkType: hard
 
@@ -46793,6 +46906,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yazl@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "yazl@npm:3.3.1"
+  dependencies:
+    buffer-crc32: "npm:^1.0.0"
+  checksum: 10/021e6c553ea826b90bd20a109ec293f2c2a02ac7c3c361f637e49c4c746b554a0c8e9380b984e12dfee66ca40894836dd8389bec83de2224eafa2eee8cf7be42
+  languageName: node
+  linkType: hard
+
 "yn@npm:3.1.1":
   version: 3.1.1
   resolution: "yn@npm:3.1.1"
@@ -46846,9 +46968,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zstd-codec@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "zstd-codec@npm:0.1.4"
-  checksum: 10/95890a73736722db6d300547b12103f5ad61e340901264163653b63360ba31b290eac247c860e7d189a4b92bfbed98669a5dd9d145c0b683971ae0c0269bb006
+"zstd-codec@npm:^0.1.5":
+  version: 0.1.5
+  resolution: "zstd-codec@npm:0.1.5"
+  checksum: 10/deee384c29129e3ed86b4f2ac4dc415fd8dad8b62b12ad07cc092c89481bee362477478c6179f2beb252bec67b57120fad8fd84f0a7f7b5914a77e24b3608094
   languageName: node
   linkType: hard